SpiritCroc
|
dffc0c1d65
|
Merge tag 'v1.3.2' into sc
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5
Conflicts:
.gitignore
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
|
2021-10-11 09:55:26 +02:00 |
|
SpiritCroc
|
44797fc2dc
|
[TMP] Automatic upstream merge preparation
Change-Id: I47dbe78febc16601fcd4e43ca4187d7735f709a8
|
2021-10-08 18:50:23 +02:00 |
|
Benoit Marty
|
bcf6342312
|
Fastlane changelog
|
2021-10-08 15:49:58 +02:00 |
|
Weblate
|
5c5fc767a4
|
Merge branch 'origin/develop' into Weblate.
|
2021-10-08 12:27:26 +00:00 |
|
SpiritCroc
|
2eec10a0c9
|
Increment version
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
|
2021-10-08 08:49:37 +02:00 |
|
LinAGKar
|
f0cc56d95e
|
Translated using Weblate (Swedish)
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/sv/
|
2021-10-07 09:25:40 +00:00 |
|
Glandos
|
fe2bf80b84
|
Translated using Weblate (French)
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/fr/
|
2021-10-05 20:25:42 +00:00 |
|
Linerly
|
32a39ad461
|
Translated using Weblate (Indonesian)
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/id/
|
2021-10-03 17:25:33 +00:00 |
|
Besnik Bleta
|
c5bbda24c4
|
Translated using Weblate (Albanian)
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/sq/
|
2021-10-02 12:26:42 +00:00 |
|
Linerly
|
d8bbd17eca
|
Translated using Weblate (Indonesian)
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/id/
|
2021-10-02 12:26:42 +00:00 |
|
waclaw66
|
9b8837f426
|
Translated using Weblate (Czech)
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/cs/
|
2021-10-02 12:26:41 +00:00 |
|
Jeff Huang
|
f0cba97bd8
|
Translated using Weblate (Chinese (Traditional))
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_Hant/
|
2021-10-02 12:26:40 +00:00 |
|
Danial Behzadi
|
720154572f
|
Translated using Weblate (Persian)
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/fa/
|
2021-10-02 12:26:39 +00:00 |
|
random
|
af4be85c34
|
Translated using Weblate (Italian)
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/it/
|
2021-10-02 12:26:38 +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 |
|
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 |
|
Ihor Hordiichuk
|
72ef6bffbd
|
Translated using Weblate (Ukrainian)
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/uk/
|
2021-10-02 12:26:35 +00:00 |
|
lvre
|
b117d313a6
|
Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
|
2021-10-02 12:26:34 +00:00 |
|
Szimszon
|
8376a946a8
|
Translated using Weblate (Hungarian)
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/hu/
|
2021-10-02 12:26:33 +00:00 |
|
SpiritCroc
|
6464142a91
|
Automatic upstream merge postprocessing
Change-Id: I1e1f12676768cf300e99e10e0c4d2a7c70ee859a
|
2021-09-30 09:30:52 +02:00 |
|
SpiritCroc
|
38ae03893f
|
Merge tag 'v1.3.1' into sc
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/res/drawable/ic_jump_to_unread.xml
vector/src/main/res/drawable/ic_radio_on.xml
vector/src/main/res/drawable/ic_voice_message_locked.xml
vector/src/main/res/drawable/ic_voice_mic_recording.xml
|
2021-09-30 09:27:15 +02:00 |
|
SpiritCroc
|
e9e6275335
|
[TMP] Automatic upstream merge preparation
Change-Id: If69bf7097f303eeac3d7a5878ade87e2bae28315
|
2021-09-30 09:19:30 +02:00 |
|
Benoit Marty
|
6e72287464
|
Fastlane changelog
|
2021-09-29 14:28:08 +02:00 |
|
Weblate
|
e3e18b4ce8
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-29 10:05:06 +00:00 |
|
Besnik Bleta
|
3f73dfcac6
|
Translated using Weblate (Albanian)
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/sq/
|
2021-09-29 10:01:58 +00:00 |
|
waclaw66
|
7ff29ebfc5
|
Translated using Weblate (Czech)
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/cs/
|
2021-09-29 10:01:56 +00:00 |
|
Jeff Huang
|
26689ac111
|
Translated using Weblate (Chinese (Traditional))
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_Hant/
|
2021-09-29 10:01:55 +00:00 |
|
Danial Behzadi
|
64f845c372
|
Translated using Weblate (Persian)
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/fa/
|
2021-09-29 10:01:54 +00:00 |
|
random
|
aa98861fcd
|
Translated using Weblate (Italian)
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/it/
|
2021-09-29 10:01:53 +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 |
|
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 |
|
Ihor Hordiichuk
|
5b12dfd4c2
|
Translated using Weblate (Ukrainian)
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/uk/
|
2021-09-29 10:01:50 +00:00 |
|
Nikita Epifanov
|
41b43f648f
|
Translated using Weblate (Russian)
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/ru/
|
2021-09-29 10:01:49 +00:00 |
|
lvre
|
b17af9a250
|
Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
|
2021-09-29 10:01:48 +00:00 |
|
Szimszon
|
44c3a0eb91
|
Translated using Weblate (Hungarian)
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/hu/
|
2021-09-29 10:01:46 +00:00 |
|
libexus
|
e58f358d64
|
Translated using Weblate (German)
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/de/
|
2021-09-29 10:01:45 +00:00 |
|
SpiritCroc
|
b4439db163
|
Automatic upstream merge postprocessing
Change-Id: Ifbee07c8f513672d861096f700749c4f41fb19ff
|
2021-09-29 09:55:06 +02:00 |
|
SpiritCroc
|
4f93eb041c
|
Merge tag 'v1.3.0' into sc
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.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/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
|
2021-09-29 09:55:02 +02:00 |
|
SpiritCroc
|
19f081ae45
|
[TMP] Automatic upstream merge preparation
Change-Id: I7d0c4a91961a4f61bb1fc222384a3903f0abe223
|
2021-09-29 09:14:19 +02:00 |
|
Benoit Marty
|
0cd3bcaf15
|
Fastlane changelog
|
2021-09-27 13:06:52 +02:00 |
|
Weblate
|
28e84d06c4
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-27 08:05:09 +00:00 |
|
SpiritCroc
|
f97549073e
|
Increment version
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
|
2021-09-18 20:38:14 +02:00 |
|
Linerly
|
2cc9d27902
|
Translated using Weblate (Indonesian)
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/id/
|
2021-09-18 14:26:02 +00:00 |
|
Linerly
|
86ce92ddf6
|
Translated using Weblate (Indonesian)
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/id/
|
2021-09-16 15:25:54 +00:00 |
|
Nikita Epifanov
|
b48dbd1a52
|
Translated using Weblate (Russian)
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/ru/
|
2021-09-14 08:25:31 +00:00 |
|
SpiritCroc
|
c38ece586e
|
Increment version
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
|
2021-09-13 16:20:06 +02:00 |
|
SpiritCroc
|
99549b0827
|
Automatic upstream merge postprocessing
Change-Id: Ie0be3b5c124ab589b52fa585e9e330f8c906bd6a
|
2021-09-13 15:37:57 +02:00 |
|
SpiritCroc
|
b084febf96
|
[TMP] Automatic upstream merge preparation
Change-Id: I49e0bface447e2900d1133a5b14895591a99887c
|
2021-09-13 14:18:47 +02:00 |
|
libexus
|
e07e2c11a4
|
Translated using Weblate (German)
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/de/
|
2021-09-12 08:25:29 +00:00 |
|
Glandos
|
6a0cc66f43
|
Translated using Weblate (French)
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/fr/
|
2021-09-10 21:25:30 +00:00 |
|