mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 01:48:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
11720 commits 7 branches 124 tags 230 MiB
Commit graph

444 commits

Author SHA1 Message Date
SpiritCroc
e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
zeritti
084e497463 Translated using Weblate (Czech) 
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/cs/
 2021-07-05 13:34:54 +00:00
Jeff Huang
46320ef71b Translated using Weblate (Chinese (Traditional)) 
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_Hant/
 2021-07-05 13:34:54 +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
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
Szimszon
80d415b242 Translated using Weblate (Hungarian) 
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/hu/
 2021-07-05 13:34:52 +00:00
SpiritCroc
f8084dc2e2 [TMP] Automatic upstream merge preparation 
Change-Id: If4581aa8e4f43b4963a3ed44313f7dd1d00d7581
 2021-07-05 10:32:08 +02:00
Benoit Marty
9673b3b15b Release: fastlane 2021-07-05 09:56:27 +02:00
SpiritCroc
1eee4f3dca Delete empty video.txt fastlane files 
These show up as untranslated on weblate

Change-Id: I13860a93b5b2d2dc8bae1b9b7322a517809ae99d
 2021-07-04 12:42:03 +02:00
SpiritCroc
eb051f1b29 Small update to the store description 
Upstream now can follow system dark/light theme as well, but we have
more settings!

Change-Id: If4a18e48302ddfeeabbb4e96795a611809c3dba0
 2021-07-04 12:15:04 +02:00
SpiritCroc
1ba30d4bdb Increment version 
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
 2021-07-04 11:52:31 +02:00
lvre
886ce7ce3b Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-07-03 20:00:06 +00:00
Weblate
64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Thibault Martin
473259f150 Translated using Weblate (French) 
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/fr/
 2021-06-25 09:34:50 +00:00
SpiritCroc
d1f51abbcd Automatic upstream merge postprocessing 
Change-Id: I8d5fd7af5b04c9e19e925fe37114ec72e152d559
 2021-06-24 10:19:45 +02:00
SpiritCroc
d11c1fcc62 Merge tag 'v1.1.11' into sc 
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
 2021-06-24 10:19:24 +02:00
SpiritCroc
72aa4bb999 Merge tag 'v1.1.10' into sc 
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab

Conflicts:
	library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	library/ui-styles/src/main/res/drawable/splash.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
	vector/src/main/AndroidManifest.xml
	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/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/drawable/ic_keyboard.xml
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_user_list.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_space_beta_header.xml
	vector/src/main/res/layout/item_suggested_room.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values/styles_riot.xml
 2021-06-23 13:38:41 +02:00
Benoit Marty
b76fd5dd4e Prepare release 1.1.11 2021-06-22 12:27:36 +02:00
zeritti
f7be5996e5 Translated using Weblate (Czech) 
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/cs/
 2021-06-21 00:34:49 +00:00
SpiritCroc
fb2551fc90 [TMP] Automatic upstream merge preparation 
Change-Id: Ia98cb8dfb432d851e1e2c6bc63449b2341c7e5ac
 2021-06-20 09:04:09 +02:00
Benoit Marty
d737d81458 Release 1.1.10: fastlane 2021-06-18 21:38:38 +02:00
Benoit Marty
0274faa197 Make it live! 2021-06-17 18:35:37 +02:00
Benoit Marty
ad0b1f02f6 Add the script to upload metadata to GooglePlay 
fix script
 2021-06-17 18:30:24 +02:00
Benoit Marty
11554cebae Remove untranslated string 2021-06-17 18:30:24 +02: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
Benoit Marty
fd73f819a5 Add Fastlane files 2021-06-17 17:58:13 +02:00
LinAGKar
1a8cb97de6 Translated using Weblate (Swedish) 
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/sv/
 2021-06-17 14:26:23 +00:00
random
7283a380ae Translated using Weblate (Italian) 
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/it/
 2021-06-16 10:34:46 +00:00
jelv
295c165e41 Translated using Weblate (Dutch) 
Currently translated at 4.7% (1 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nl/
 2021-06-14 01:34:45 +00:00
lvre
934b7e0fe0 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-06-14 01:34:45 +00:00
Szimszon
5eba5e6633 Translated using Weblate (Hungarian) 
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/hu/
 2021-06-14 01:34:45 +00:00
SpiritCroc
99832243a6 Increment version 
Change-Id: Ia33c739201d13d466f302fce991488d8d850bbfd
 2021-06-12 10:29:05 +02:00
Jeff Huang
c52c00d653 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-06-11 21:55:38 +00:00
1kiarash
16719a6709 Translated using Weblate (Persian) 
Currently translated at 52.3% (11 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-06-11 21:55:37 +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
Percy
c68ae9ab5e Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-06-11 21:55:36 +00:00
Ihor Hordiichuk
c124ec9219 Translated using Weblate (Ukrainian) 
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/uk/
 2021-06-11 21:55:35 +00:00
lvre
a2f724b559 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-06-11 21:55:34 +00:00
Krombel
5758f10f00 Translated using Weblate (German) 
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/de/
 2021-06-11 21:55:34 +00:00
Weblate
d13c0901f0 Merge branch 'origin/develop' into Weblate. 2021-06-10 10:18:38 +00:00
waclaw66
d21d68ec9d Translated using Weblate (Czech) 
Currently translated at 94.7% (18 of 19 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-06-10 10:17:26 +00:00
Szimszon
78d02210dd Translated using Weblate (Hungarian) 
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/hu/
 2021-06-04 20:34:38 +00:00
Ihor Hordiichuk
98cdc8e05c Translated using Weblate (Ukrainian) 
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/uk/
 2021-06-02 23:35:05 +00:00
SpiritCroc
c01142b813 Automatic upstream merge postprocessing 
Change-Id: I1c0d40ef25bef54205bb21ef0a9f03a12b427b83
 2021-06-02 17:49:37 +02:00
SpiritCroc
c00600666e Merge tag 'v1.1.9' into sc 
Change-Id: I75baba645677d13f9937643a29630070f1470f9c

Conflicts:
	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/RoomSyncHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-06-02 17:49:34 +02:00
SpiritCroc
8b6e8ad3c5 [TMP] Automatic upstream merge preparation 
Change-Id: I12f25c8c45e1f120f1e05041fd281f02a3f6392d
 2021-06-02 17:04:48 +02:00
SpiritCroc
bddc574766 Increment version 
Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716
 2021-06-02 16:51:11 +02:00
Benoit Marty
a1ebf1a3bc Prepare release 1.1.9 - fastlane 2021-06-02 11:45:03 +02:00
random
62d94a4d4f Translated using Weblate (Italian) 
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/it/
 2021-05-30 12:35:07 +00:00
Percy
252eec5c2f Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-05-30 12:35:06 +00:00
LinAGKar
852bd21e9a Translated using Weblate (Swedish) 
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/sv/
 2021-05-30 12:35:06 +00:00
Szimszon
ba3ae35b62 Translated using Weblate (Hungarian) 
Currently translated at 26.3% (5 of 19 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2021-05-30 12:35:05 +00:00
Julian Heinzel
767c1a9dee Translated using Weblate (German) 
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/de/
 2021-05-30 12:35:05 +00:00
libexus
5efcb93fb0 Translated using Weblate (German) 
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/de/
 2021-05-29 12:18:38 +00:00
waclaw66
a636265104 Translated using Weblate (Czech) 
Currently translated at 94.7% (18 of 19 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-05-27 10:34:56 +00:00
Jeff Huang
54f26b4375 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-05-27 10:34:55 +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
Ihor Hordiichuk
13198d09ed Translated using Weblate (Ukrainian) 
Currently translated at 94.7% (18 of 19 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-05-27 10:34:54 +00:00
SpiritCroc
6693b398bb Automatic upstream merge postprocessing 
Change-Id: Iff3f2521a41455cfc94afc1b4e0ad961c0d64ce8
 2021-05-26 10:44:23 +02:00
SpiritCroc
6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
SpiritCroc
6e60fd7328 [TMP] Automatic upstream merge preparation 
Change-Id: Ic0b3e2a1ac115db029101589e77e16cf4b38d314
 2021-05-26 08:48:20 +02:00
Benoit Marty
504507a6cc Prepare release 1.1.8 2021-05-25 18:11:26 +02:00
Weblate
1cc2e8b000 Merge branch 'origin/develop' into Weblate. 2021-05-25 11:06:53 +00:00
Quang Trung
bd3aa4024a Translated using Weblate (Vietnamese) 
Currently translated at 22.2% (4 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/vi/
 2021-05-25 11:06:37 +00:00
Tuomas Hietala
a21867e380 Translated using Weblate (Finnish) 
Currently translated at 72.2% (13 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-05-25 11:06:37 +00:00
Viorel-Cătălin Răpițeanu
a14c00e669 Translated using Weblate (Romanian) 
Currently translated at 11.1% (2 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ro/
 2021-05-22 21:34:33 +00:00
SpiritCroc
4f46f470d6 Increment version 
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
 2021-05-22 10:12:03 +02:00
sr093906
2b396707f9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 66.6% (12 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2021-05-21 12:34:35 +00:00
Julian Heinzel
0a6adad680 Translated using Weblate (German) 
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/de/
 2021-05-20 01:34:44 +00:00
Ihor Hordiichuk
ade2f0c065 Translated using Weblate (Ukrainian) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-05-20 01:34:40 +00:00
lvre
e80ca634ca Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-05-20 01:34:33 +00:00
Ville Ranki
07b84bbff1 Translated using Weblate (Finnish) 
Currently translated at 66.6% (12 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-05-20 01:34:32 +00:00
SpiritCroc
e40bf1704b Increment version 
Change-Id: If1b871b3ab76544d87e965986a8c53b782692f8e
 2021-05-15 10:03:28 +02:00
Thibault Martin
e09230b3cf Translated using Weblate (French) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-05-13 13:34:43 +00:00
SpiritCroc
19605b0cdc Automatic upstream merge postprocessing 
Change-Id: Iad909d733876af3c770cd5bad26a971bd5b74dc2
 2021-05-12 16:01:49 +02:00
SpiritCroc
db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.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/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
SpiritCroc
38b4da547e [TMP] Automatic upstream merge preparation 
Change-Id: I1f5c1f52159efe0485c11056da07d3e8b1aeacba
 2021-05-12 15:45:50 +02:00
Benoit Marty
2f37c703a4 Prepare release 1.1.7 2021-05-12 15:13:51 +02:00
Ange des ténèbres
610c25b67c Translated using Weblate (French) 
Currently translated at 88.8% (16 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-05-06 11:34:29 +00:00
Vancha
b05f53453a Translated using Weblate (Frisian) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
 2021-05-05 08:34:51 +00:00
zeritti
ad1832efbc Translated using Weblate (Czech) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-05-05 08:34:51 +00:00
Sven Grewe
72dcf5c65e Translated using Weblate (German) 
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/de/
 2021-05-03 08:04:35 +00:00
LinAGKar
ee8ef585ce Translated using Weblate (Swedish) 
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/sv/
 2021-05-03 08:04:30 +00:00
random
ebfb4b4b9a Translated using Weblate (Italian) 
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/it/
 2021-05-03 08:04:01 +00:00
Jeff Huang
278738a9d4 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-05-03 08:03:46 +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
SpiritCroc
ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
Weblate
79f125cccd Merge branch 'origin/develop' into Weblate. 2021-04-29 13:38:14 +00:00
Deleted User
63f1efd320 Translated using Weblate (Norwegian Bokmål) 
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/nb_NO/
 2021-04-24 19:34:24 +00:00
SpiritCroc
3b94ea72d3 Automatic upstream merge postprocessing 
Change-Id: I18bd4c7615bc18926f0a5aafc0011d1b8d0f47eb
 2021-04-16 15:32:21 +02:00
SpiritCroc
2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
SpiritCroc
7a7cad9bb6 [TMP] Automatic upstream merge preparation 
Change-Id: I74d0a4cf0fdddf3339958b21f0ceefceaec0fd47
 2021-04-16 15:29:14 +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
LinAGKar
14e80855b4 Translated using Weblate (Swedish) 
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/sv/
 2021-04-15 17:34:23 +00:00
oksya8and8
80e67281c6 Translated using Weblate (Japanese) 
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/ja/
 2021-04-15 17:34:22 +00:00
Sven Grewe
b683c45bd8 Translated using Weblate (German) 
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/de/
 2021-04-15 17:34:21 +00:00
SpiritCroc
5757d1894c Automatic upstream merge postprocessing 
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
 2021-04-15 12:30:02 +02:00
SpiritCroc
28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
SpiritCroc
ad8e9380b6 [TMP] Automatic upstream merge preparation 
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
 2021-04-15 12:29:55 +02:00
Benoit Marty
9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty
ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
SpiritCroc
5749e31508 Automatic upstream merge postprocessing 
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
 2021-04-14 14:02:43 +02:00
Moo
2116ff91cc Added translation using Weblate (Lithuanian) 2021-04-13 19:52:50 +00:00
Salamandar
f23eb425a1 Translated using Weblate (French) 
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/fr/
 2021-04-13 08:34:24 +00:00
SpiritCroc
0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
SpiritCroc
79daede4f5 [TMP] Automatic upstream merge preparation 
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
 2021-04-12 15:58:23 +02:00
SpiritCroc
d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
Thibault Martin
4fcbf718ca Translated using Weblate (French) 
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/fr/
 2021-04-11 17:34:20 +00:00
Thibault Martin
fad3a60bc4 Translated using Weblate (French) 
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/fr/
 2021-04-10 08:02:18 +00:00
Jeff Huang
a7be6a61ef Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-04-10 08:02:17 +00:00
Nikita Epifanov
ceca81f0ab Translated using Weblate (Russian) 
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/ru/
 2021-04-10 08:02:13 +00:00
Auri B. P
931bd1042b Translated using Weblate (Catalan) 
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/ca/
 2021-04-10 08:02:11 +00:00
Ihor Hordiichuk
f4959ba553 Translated using Weblate (Ukrainian) 
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/uk/
 2021-04-10 08:02:10 +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
random
166817411c Translated using Weblate (Italian) 
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/it/
 2021-04-10 08:02:09 +00:00
Benoit Marty
a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Benoit Marty
5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +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
Weblate
eff560f8f0 Merge branch 'origin/develop' into Weblate. 2021-04-07 15:37:02 +00:00
Danial Behzadi
5971edee14 Translated using Weblate (Persian) 
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/fa/
 2021-04-07 15:36:56 +00:00
Nikita Epifanov
57d94c5494 Translated using Weblate (Russian) 
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/ru/
 2021-04-07 15:36:55 +00:00
Samu Voutilainen
5a988d6f4a Translated using Weblate (Finnish) 
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/fi/
 2021-04-07 15:36:55 +00:00
Safa Alfulaij
77fb8de71f Translated using Weblate (Arabic) 
Currently translated at 92.3% (12 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ar/
 2021-04-02 19:34:39 +00:00
RainSlide
fa3ccda3f4 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-03-26 06:34:32 +00:00
Benoit Marty
1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Graeme Power
64bdd894d6 Translated using Weblate (Irish) 
Currently translated at 7.6% (1 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ga/
 2021-03-18 07:34:32 +00:00
GokdenizK
3ceee8302a Translated using Weblate (Turkish) 
Currently translated at 76.9% (10 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/tr/
 2021-03-18 07:34:23 +00:00
KAHINA
ab12c641a8 Translated using Weblate (Kabyle) 
Currently translated at 23.0% (3 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/kab/
 2021-03-18 07:34:22 +00:00
Thibault Martin
33306bf218 Translated using Weblate (French) 
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/fr/
 2021-03-18 07:34:22 +00:00
Sven Grewe
a5b2083f1b Translated using Weblate (German) 
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/de/
 2021-03-18 07:34:22 +00:00
Benoit Marty
2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
Auri B. P
256ddc1831 Translated using Weblate (Catalan) 
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/ca/
 2021-03-14 10:34:15 +00:00
SpiritCroc
bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
SpiritCroc
1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
zeritti
8f0319a138 Translated using Weblate (Czech) 
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/cs/
 2021-03-12 23:34:25 +00:00
Jeff Huang
7edb45d9b7 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-03-12 23:34:24 +00:00
random
3ad6c7a18b Translated using Weblate (Italian) 
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/it/
 2021-03-12 23:34:24 +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
Ihor Hordiichuk
6148b2647f Translated using Weblate (Ukrainian) 
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/uk/
 2021-03-12 23:34:23 +00:00
LinAGKar
e7d7886397 Translated using Weblate (Swedish) 
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/sv/
 2021-03-12 23:34:22 +00:00
Marcelo Filho
6e757f88b6 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-03-12 23:34:22 +00:00
Benoit Marty
ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty
2536452220
Merge pull request #2964 from vector-im/matthew/zh 
rename zh-Hans and zh-Hant - TO BE MERGED DURING WEBLATE SYNC
 2021-03-10 18:32:22 +01:00
Ihor Hordiichuk
f7abda5d1f Translated using Weblate (Ukrainian) 
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/uk/
 2021-03-10 11:29:18 +00:00
@a2sc:matrix.org
b373957b6b Translated using Weblate (German) 
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/de/
 2021-03-10 11:29:18 +00:00
zeritti
cd9718b7ef Translated using Weblate (Czech) 
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/cs/
 2021-03-06 21:34:16 +00:00
Auri B. P
fda8ac1f51 Translated using Weblate (Catalan) 
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/ca/
 2021-03-06 21:34:16 +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
Matthew Hodgson
42ef81cf40 apparently the others shouldn't have underscores either 2021-03-05 14:07:39 +00:00
Matthew Hodgson
aaeb9a0fd7 rename zh as per https://github.com/vector-im/element-android/issues/2752 2021-03-05 13:56:43 +00:00
Jeff Huang
8bd62dddc8 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-03-04 12:23:23 +00:00
LinAGKar
f24159504d Translated using Weblate (Swedish) 
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/sv/
 2021-03-04 12:23:23 +00:00
Weblate
3b9adbf5c8 Merge branch 'origin/develop' into Weblate. 2021-03-03 09:29:37 +00:00
HelaBasa
755fad7808 Translated using Weblate (Sinhala) 
Currently translated at 9.0% (1 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/si/
 2021-03-03 09:28:50 +00:00
Marcelo Filho
ba74faa562 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-02-27 17:34:21 +00:00
SpiritCroc
ff08370cd7 Increment version 
Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b
 2021-02-26 12:59:31 +01:00
Argetlami
20c692fddf Translated using Weblate (Finnish) 
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/fi/
 2021-02-24 19:34:13 +00:00
zeritti
ab52395d1a Translated using Weblate (Czech) 
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/cs/
 2021-02-23 07:34:32 +00:00
waclaw66
b37505112b Translated using Weblate (Czech) 
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-02-21 07:34:06 +00:00
Nikita Epifanov
60dad59025 Translated using Weblate (Russian) 
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/ru/
 2021-02-21 07:34:05 +00:00
SpiritCroc
1e1a974678 Automatic upstream merge postprocessing 
Change-Id: Ia57cedc2fce20341f97c4612adf9e46df93f7cf3
 2021-02-20 15:41:40 +01:00
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
SpiritCroc
7eb3b7e9cd [TMP] Automatic upstream merge preparation 
Change-Id: I813dbf150890acbef690dca516b2e8369aa860da
 2021-02-20 15:03:24 +01:00
Benoit Marty
809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
SpiritCroc
4418821058 Increment version 
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
 2021-02-19 14:39:57 +01:00
waclaw66
4267e33d19 Translated using Weblate (Czech) 
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-02-18 03:34:09 +00:00
Jeff Huang
85a053838e Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-02-18 03:34:08 +00:00
LinAGKar
be1febef41 Translated using Weblate (Swedish) 
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/sv/
 2021-02-18 03:34:08 +00:00
zer0-x
e01899ce8f Translated using Weblate (Arabic) 
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/ar/
 2021-02-15 12:08:01 +00:00
Slobodan Simić
68ef369adc Translated using Weblate (Serbian) 
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/sr/
 2021-02-15 12:08:00 +00:00
Auri B. P
11e5df1007 Translated using Weblate (Catalan) 
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/ca/
 2021-02-15 12:08:00 +00:00
random
a86405fb01 Translated using Weblate (Italian) 
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/it/
 2021-02-15 12:07:59 +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
Ihor Hordiichuk
f3cbc18b50 Translated using Weblate (Ukrainian) 
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/uk/
 2021-02-15 12:07:59 +00:00
Miroslav Šedivý
30e5e15245 Translated using Weblate (Slovak) 
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/sk/
 2021-02-15 12:07:59 +00:00
@a2sc:matrix.org
6fdbb91ccb Translated using Weblate (German) 
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/de/
 2021-02-15 12:07:58 +00:00
Weblate
2ac1287924 Merge branch 'origin/develop' into Weblate. 2021-02-12 10:30:37 +00:00
Nikita Epifanov
3b93b28a37 Translated using Weblate (Russian) 
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/ru/
 2021-02-12 10:30:26 +00:00
Marcelo Filho
1b04f5f540 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-02-11 15:33:33 +00:00
SpiritCroc
02371a9604 Automatic upstream merge postprocessing 
Change-Id: I0a6c3834776a655427847e52bbe6b71928d3c2dc
 2021-02-10 11:25:32 +01:00
SpiritCroc
04f4e13230 Merge tag 'v1.0.17' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
 2021-02-10 11:05:22 +01:00
SpiritCroc
b0a6e4cd28 [TMP] Automatic upstream merge preparation 
Change-Id: I978bc20a50c282cba36660444d754cd4a4a3f1fa
 2021-02-10 10:07:21 +01:00
LinAGKar
5386271398 Translated using Weblate (Swedish) 
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/sv/
 2021-02-09 20:33:55 +00:00
Benoit Marty
a8086ceb43 Prepare release 1.0.17 2021-02-09 21:07:25 +01:00
Auri B. P
c46ab4ff29 Translated using Weblate (Catalan) 
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/ca/
 2021-02-08 07:33:39 +00:00
Slobodan Simić
9cf0e1bde7 Translated using Weblate (Serbian) 
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/sr/
 2021-02-06 10:33:37 +00:00
Jeff Huang
32b42b46e4 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-02-06 10:33:37 +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
Ihor Hordiichuk
a17c662465 Translated using Weblate (Ukrainian) 
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/uk/
 2021-02-06 10:33:36 +00:00
@a2sc:matrix.org
e1fdbaee40 Translated using Weblate (German) 
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/de/
 2021-02-06 10:33:36 +00:00
Benoit Marty
c4a89a5da1
Merge pull request #2769 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-02-04 17:55:18 +01:00
SpiritCroc
8e32c041db Automatic upstream merge postprocessing 
Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c
 2021-02-04 17:10:24 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
SpiritCroc
ad4ba631b9 [TMP] Automatic upstream merge preparation 
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
 2021-02-04 17:00:40 +01:00
Benoit Marty
e51f2b8bc1 Prepare release 1.0.16 2021-02-04 13:25:12 +01:00