filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,136 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

9136 Commits

Author SHA1 Message Date
Benoit Marty a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Benoit Marty 38b49916e2 Small cleanup 2021-04-09 17:05:09 +02:00
Benoit Marty 37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty 6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00
Benoit Marty d40f2ef463
Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 
Bump recyclerview from 1.2.0-rc01 to 1.2.0
 2021-04-09 16:38:53 +02:00
Benoit Marty 8d1b56d526
Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 
Bump media from 1.2.1 to 1.3.0
 2021-04-09 16:38:39 +02:00
Benoit Marty 388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
SpiritCroc 6a8cd9a329 Fix sometimes overlapping URL preview text with timestamp 
Change-Id: Ib441c2d0a447051b4dde2990111f748f1f3f2d66
 2021-04-09 12:54:40 +02:00
Benoit Marty bec6cfc46d Version++ 2021-04-09 12:42:59 +02:00
Benoit Marty 0a326015ef Merge branch 'release/1.1.4' 2021-04-09 12:41:04 +02:00
Benoit Marty 08477cf581 Merge branch 'release/1.1.4' into develop 2021-04-09 12:41:02 +02:00
Benoit Marty 5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
Marcus Hoffmann 1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
 2021-04-09 12:25:47 +02:00
SpiritCroc 16c06f5f62 Automatic SchildiChat string correction 
Change-Id: If21ffd3164e94d6d668f4057ecd4afbeb36dd83d
 2021-04-09 11:57:24 +02:00
SpiritCroc 235cfa48ee Automatic upstream merge postprocessing 
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
 2021-04-09 11:57:22 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
SpiritCroc 5bfc106a33 [TMP] Automatic upstream merge preparation 
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
 2021-04-09 11:55:41 +02:00
SpiritCroc 2407c905fe Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
 2021-04-09 11:55:41 +02:00
SpiritCroc 61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
Benoit Marty 93bc5abcb5 Update the Emoji source file 2021-04-09 10:32:11 +02:00
Benoit Marty 5311bacfff ktlint 2021-04-09 10:26:28 +02:00
Benoit Marty da7c2e38f6
Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web 
Fix EW-EA compatibility for verification
 2021-04-09 10:24:01 +02:00
Benoit Marty 0d9990b2e3
Merge pull request #3147 from oogm/develop 
Update import_emojis.py to retain keyword order
 2021-04-09 10:00:47 +02:00
dependabot[bot] b5b651244b
Bump firebase-messaging from 21.0.1 to 21.1.0 
Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-09 07:25:53 +00:00
Benoit Marty 2d6fca9214
Merge pull request #3143 from vector-im/feature/bma/discovery_filtering 
Filter some other words when navigating into the room directory
 2021-04-09 08:52:32 +02:00
oogm 327e75e8e5 Update CHANGES.md 2021-04-08 22:26:31 +02:00
oogm a4a3777722 Update import_emojis.py to retain keyword order 2021-04-08 22:14:41 +02:00
Benoit Marty f1e280827d Ensure there is no dup and cleanup 2021-04-08 19:39:49 +02:00
Benoit Marty 7e605eb4d4
Merge pull request #3145 from vector-im/bma/merge_avail 
Small cleanup for #3084
 2021-04-08 19:36:35 +02:00
Matthew Hodgson 1233fde261
Update forbidden_terms.txt 2021-04-08 18:26:55 +01:00
Benoit Marty ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty 2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks 9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks 4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks 9ce9d1e549 CHANGES.md updated 2021-04-08 18:50:28 +02:00
Aleks 2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Benoit Marty 65b4b2915f
Merge pull request #3142 from vector-im/feature/bma/global_retry 
Generic hanlding of rate limit eror by the SDK
 2021-04-08 18:23:52 +02:00
Benoit Marty 153d393bf1 Prevent searching for forbidden terms 2021-04-08 17:28:47 +02:00
Benoit Marty 1715143b85 Filter some other words 
Cannot filter canonical alias anymore, as we now use word boundaries
 2021-04-08 16:54:41 +02:00
Benoit Marty 7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Benoit Marty c6bd378104 Test is passing 2021-04-08 12:44:28 +02:00
Valere 760e14531f Fix EW-EA compatibility for verification 2021-04-08 12:09:35 +02:00
Benoit Marty 8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty 9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
dependabot[bot] 68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0 
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:33 +00:00
dependabot[bot] 3ca00969c5
Bump media from 1.2.1 to 1.3.0 
Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:02 +00:00
dependabot[bot] 505b01ad97
Bump daggerVersion from 2.33 to 2.34 
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:19:20 +00:00
Benoit Marty 3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes 
Weblate fixes
 2021-04-07 19:11:16 +02:00
Benoit Marty b423d5da4c typo 2021-04-07 19:00:02 +02:00
Benoit Marty e7608469ca Import SAS strings 2021-04-07 18:42:52 +02:00