SpiritCroc
|
cd2021d5ec
|
[TMP] Automatic upstream merge preparation
Change-Id: Id9ef970ed0d0c41e8b78677352c43cb25e0fe0da
|
2021-12-05 13:23:05 +01:00 |
|
SpiritCroc
|
6c99527ab8
|
Fix fastlane
I messed up with an unclean 1.3.3 merge
Change-Id: I2e1b140e165a8c8ca03728bfb1497db4f523e3a2
|
2021-11-01 10:43:45 +01:00 |
|
SpiritCroc
|
e4f36f17a2
|
Automatic upstream merge postprocessing
Change-Id: I54c9b9df50bd6fb4b8cde241701c4f3e3ecb92cb
|
2021-10-27 15:25:08 +02:00 |
|
SpiritCroc
|
28e1c6d272
|
[TMP] Automatic upstream merge preparation
Change-Id: I1d67b75cd2ada1deba3008ccc75cac72881a7e1a
|
2021-10-27 15:24:57 +02:00 |
|
SpiritCroc
|
af489701a8
|
Automatic upstream merge postprocessing
Change-Id: I0fa90d77fe47074d677355b0025e1611e598d565
|
2021-10-25 19:30:04 +02:00 |
|
SpiritCroc
|
d1468a50d2
|
[TMP] Automatic upstream merge preparation
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
|
2021-10-25 19:29:51 +02:00 |
|
SpiritCroc
|
5d83211995
|
Automatic upstream merge postprocessing
Change-Id: Iae698de2ab9d37e10f4ad845d3e28f047bc69df3
|
2021-10-21 17:42:29 +02:00 |
|
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 |
|
Priit Jõerüüt
|
4a1f1a9fa5
|
Translated using Weblate (Estonian)
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/et/
|
2021-10-18 01:25:51 +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 |
|
Priit Jõerüüt
|
0f1e5fcc5c
|
Translated using Weblate (Estonian)
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/et/
|
2021-10-10 13:25:55 +00:00 |
|
Priit Jõerüüt
|
1bd575f6db
|
Translated using Weblate (Estonian)
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/et/
|
2021-10-02 12:26:37 +00:00 |
|
Priit Jõerüüt
|
aad6f76f87
|
Translated using Weblate (Estonian)
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/et/
|
2021-09-29 10:01:52 +00:00 |
|
Priit Jõerüüt
|
e655fd498c
|
Translated using Weblate (Estonian)
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/et/
|
2021-09-01 16:26:14 +00:00 |
|
Priit Jõerüüt
|
294ea9046f
|
Translated using Weblate (Estonian)
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/et/
|
2021-08-13 21:25:48 +00:00 |
|
Priit Jõerüüt
|
bcd1271671
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (27 of 27 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-08-10 12:25:32 +00:00 |
|
Priit Jõerüüt
|
192edc54e9
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (26 of 26 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-08-03 09:25:18 +00:00 |
|
Priit Jõerüüt
|
07ad907db4
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (24 of 24 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-07-26 20:25:10 +00:00 |
|
Priit Jõerüüt
|
f35050d4b4
|
Translated using Weblate (Estonian)
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/et/
|
2021-07-05 13:34:53 +00:00 |
|
Priit Jõerüüt
|
a45b1daf75
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (21 of 21 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-06-11 21:55:36 +00:00 |
|
Priit Jõerüüt
|
a26fc40744
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (19 of 19 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-05-27 10:34:55 +00:00 |
|
Priit Jõerüüt
|
01d0201852
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (18 of 18 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-05-03 08:03:40 +00:00 |
|
Priit Jõerüüt
|
e0a79af93a
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (15 of 15 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-04-10 08:02:10 +00:00 |
|
Priit Jõerüüt
|
7651df1228
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (13 of 13 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-03-12 23:34:23 +00:00 |
|
Priit Jõerüüt
|
427a3d1be3
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (12 of 12 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-03-06 21:34:15 +00:00 |
|
Priit Jõerüüt
|
1d0eb1e926
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (11 of 11 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-02-15 12:07:59 +00:00 |
|
Priit Jõerüüt
|
8b4fd7fdc0
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (10 of 10 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-02-06 10:33:37 +00:00 |
|
Priit Jõerüüt
|
17e2aa91b5
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (7 of 7 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2021-01-19 18:35:55 +00:00 |
|
Ngô Ngọc Đức Huy
|
83584fab44
|
Added translation using Weblate (Vietnamese)
|
2020-12-25 10:30:07 +00:00 |
|
Priit Jõerüüt
|
e246c58424
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (3 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2020-10-22 21:49:58 +00:00 |
|
aethralis
|
f26f169973
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (3 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2020-10-21 21:37:05 +00:00 |
|
Priit Jõerüüt
|
284babfeaa
|
Translated using Weblate (Estonian)
Currently translated at 66.6% (2 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
|
2020-10-16 09:04:38 +00:00 |
|