Commit Graph

5179 Commits

Author SHA1 Message Date
Benoit Marty c6a493848e Fix a race condition: Push can be received before the Gateway API returns 2021-04-16 16:13:16 +02:00
Benoit Marty 19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
Benoit Marty 9fc00fe6ff App crashes on "troubleshoot notifications" button (#3187) 2021-04-16 14:33:00 +02:00
Benoit Marty c08868bc3c Protect call to suspend fun 2021-04-16 13:22:16 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty e4375522ff Fix crash when playing video (#3179) 2021-04-14 22:35:30 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration
Waiting for https://github.com/realm/realm-java/issues/7402
2021-04-14 21:54:07 +02:00
Benoit Marty 3034d1d831
Merge pull request #3176 from vector-im/feature/bma/login_fixes
Small fixes on the current sign in sign up flow
2021-04-14 20:13:12 +02:00
Benoit Marty 057295c155 Cleanup 2021-04-14 20:12:57 +02:00
Benoit Marty 877e0ca5c6 compact code 2021-04-14 12:48:33 +02:00
Benoit Marty 89c2662e09 Fix social login button rendering on old OS 2021-04-14 12:44:48 +02:00
Benoit Marty 699b1429b7 Simplify `LoginFlowResult` model 2021-04-14 12:42:47 +02:00
Onuray Sahin ce7e00a499 Fix send state image color on dark theme. 2021-04-13 11:48:12 +03:00
Benoit Marty 288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources
Store description update
2021-04-12 10:47:18 +02:00
Dominic Fischer 35667db29c
Lint 2021-04-11 11:35:28 +01:00
Dominic Fischer 759528f19a Missed another spot
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-04-11 10:54:17 +01:00
Dominic Fischer 7ee87a0d4b Merge branch 'develop' into suspend_functions_1
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-04-10 16:50:30 +01: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
Benoit Marty bec6cfc46d Version++ 2021-04-09 12:42:59 +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
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
Benoit Marty f1e280827d Ensure there is no dup and cleanup 2021-04-08 19:39:49 +02:00
Matthew Hodgson 1233fde261
Update forbidden_terms.txt 2021-04-08 18:26:55 +01: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 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
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 eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration
Empty room name small iteration
2021-04-07 18:41:08 +02:00
Benoit Marty e61a9e75e8
Merge pull request #3055 from vector-im/feature/bma/get_event
Get event
2021-04-07 18:38:17 +02:00
Benoit Marty 47aeadef7c Add configuration for new Irish language 2021-04-07 18:34:54 +02:00
Benoit Marty fc202437e8 Fix lint issues 2021-04-07 18:31:46 +02:00
Weblate eff560f8f0 Merge branch 'origin/develop' into Weblate. 2021-04-07 15:37:02 +00:00
ozzii 3efd35e27a Translated using Weblate (Serbian)
Currently translated at 28.1% (666 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
2021-04-07 15:36:54 +00:00
Nikita Epifanov e9838f6db1 Translated using Weblate (Russian)
Currently translated at 99.4% (2350 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2021-04-07 15:36:51 +00:00
Daniel Løvbrøtte Olsen cc1d52171c Translated using Weblate (Norwegian Bokmål)
Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2021-04-07 15:36:47 +00:00
Magnus 3250f3bc0e Translated using Weblate (Norwegian Bokmål)
Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2021-04-07 15:36:47 +00:00
Samu Voutilainen 39c0c5401f Translated using Weblate (Finnish)
Currently translated at 79.2% (1873 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2021-04-07 15:36:47 +00:00