SpiritCroc
|
978056e01f
|
Merge tag 'v1.3.4' into sc
Conflicts:
dependencies.gradle
gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
Author: S1m <git@sgougeon.fr>
Date: Fri Oct 15 09:36:46 2021 +0200
Merge remote-tracking branch 'upstream/develop' into unifiedpush
Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
|
2021-10-21 17:31:11 +02:00 |
|
SpiritCroc
|
969fa9fb26
|
[TMP] Automatic upstream merge preparation
Change-Id: I40d5b4920f7f5f8e75167ae3382d585b8a5d38aa
|
2021-10-21 16:27:34 +02:00 |
|
sr093906
|
022452cd45
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (34 of 34 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-10-18 01:25:50 +00:00 |
|
SpiritCroc
|
57a9ea4617
|
Merge tag 'v1.3.3' into sc
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
|
2021-10-11 12:42:06 +02:00 |
|
SpiritCroc
|
bba7a691e0
|
Automatic upstream merge postprocessing
Change-Id: I28aa960c79bf4807aab871ff8128d2339309342c
|
2021-10-11 10:39:16 +02:00 |
|
sr093906
|
eefff680b7
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (33 of 33 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-10-10 13:25:54 +00:00 |
|
sr093906
|
495bdae9df
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (31 of 31 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-10-02 12:26:36 +00:00 |
|
sr093906
|
3cb0cc9d37
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (30 of 30 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-09-29 10:01:51 +00:00 |
|
sr093906
|
69eb59888f
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (29 of 29 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-09-01 16:26:13 +00:00 |
|
Julianne420
|
fe677c19a3
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (28 of 28 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-08-20 05:25:20 +00:00 |
|
sr093906
|
10e38d3319
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (23 of 23 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
|
2021-07-05 13:34:52 +00:00 |
|
Benoit Marty
|
a66a1cb4ec
|
Move changelog after Weblate merge and rebase
|
2021-06-17 18:30:24 +02:00 |
|
Benoit Marty
|
bd0a203e2b
|
Rename folders for PlayStore compat
|
2021-06-17 18:30:24 +02:00 |
|