Commit Graph

360 Commits

Author SHA1 Message Date
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
Weblate 63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty 061f3c6919 Prepare release 1.0.15 2021-02-03 17:07:49 +01:00
Weblate cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Danial Behzadi 2e68c48752 Translated using Weblate (Persian)
Currently translated at 71.4% (5 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2021-02-02 11:21:09 +00:00
Auri B. P 15aeccac24 Translated using Weblate (Catalan)
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/ca/
2021-01-24 19:36:39 +00:00
random fea86d5885 Translated using Weblate (Italian)
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/it/
2021-01-24 19:36:39 +00:00
Ihor Hordiichuk 2df26ee931 Translated using Weblate (Ukrainian)
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/uk/
2021-01-24 19:36:39 +00:00
Marcelo Filho 8f7c4283ad Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2021-01-24 19:36:39 +00:00
Mitja Sorsa 221bdc112d Translated using Weblate (Finnish)
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/fi/
2021-01-24 19:36:39 +00:00
@a2sc:matrix.org d2544fdd20 Translated using Weblate (German)
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/de/
2021-01-24 19:36:39 +00:00
SpiritCroc 417bf48dd1 Increment version
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
2021-01-23 11:58:10 +01:00
Flat Earth Israel Association 226a547f09 Translated using Weblate (Hebrew)
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/he/
2021-01-19 18:35:56 +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
Nikita Epifanov 81da03d168 Translated using Weblate (Russian)
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/ru/
2021-01-19 18:35:55 +00:00
Slobodan Simić 72b9ba4a27 Translated using Weblate (Serbian)
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/sr/
2021-01-17 15:36:06 +00:00
zeritti e7e6893920 Translated using Weblate (Czech)
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/cs/
2021-01-17 15:36:06 +00:00
GokdenizK 5c4f713463 Translated using Weblate (Turkish)
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/tr/
2021-01-17 15:36:04 +00:00
LinAGKar f1961b710c Translated using Weblate (Swedish)
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/sv/
2021-01-17 15:36:04 +00:00
notramo 16a7b0bbdb Translated using Weblate (Hungarian)
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/hu/
2021-01-17 15:36:04 +00:00
Daniel Le Berre db95e7b0cd Translated using Weblate (French)
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/fr/
2021-01-17 15:36:04 +00:00
SpiritCroc c87627bb5e Automatic upstream merge postprocessing
Change-Id: I0da2864255e9d91599bc42ffccf7c9d345f5edc1
2021-01-16 11:21:50 +01:00
SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.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/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	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/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.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
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
zeritti d7e4fd555c Added translation using Weblate (Czech) 2021-01-15 16:50:42 +00:00
SpiritCroc f0e83813e9 [TMP] Automatic upstream merge preparation
Change-Id: Iaa07f187ded58fa745830596edd27e324ca8339e
2021-01-15 17:33:22 +01:00
Benoit Marty f0f0aafa1b Prepare release 1.0.14 2021-01-15 11:13:36 +01:00
Jeff Huang e91dbfbf2c Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2021-01-14 09:57:14 +00:00
Weblate de73539d2b Merge branch 'origin/develop' into Weblate. 2021-01-13 15:00:03 +00:00
SpiritCroc dbda95afd7 fastlane: Fix source code link
Change-Id: I356e7fd2eb0293a73400bc4609f83af15ca77b5e
2020-12-29 10:57:15 +01:00
SpiritCroc 7ecf8073ef Increment version
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
2020-12-27 11:29:47 +01:00
Ngô Ngọc Đức Huy 855e7e02ce Translated using Weblate (Vietnamese)
Currently translated at 60.0% (3 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/vi/
2020-12-26 11:35:38 +00:00
Ngô Ngọc Đức Huy 83584fab44 Added translation using Weblate (Vietnamese) 2020-12-25 10:30:07 +00:00
Thomas Jensen 4645a8c633 Translated using Weblate (Norwegian Bokmål)
Currently translated at 80.0% (4 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb_NO/
2020-12-24 19:35:58 +00:00
LinAGKar cfb54f7608 Translated using Weblate (Swedish)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2020-12-24 19:35:58 +00:00
reg4xp 94aa0a02fe Translated using Weblate (Persian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2020-12-22 10:36:04 +00:00
SpiritCroc c775fa73ea Automatic upstream merge postprocessing
Change-Id: I3093ec9e4f74fe91ef1894b130b3cd188e5670d5
2020-12-22 09:24:46 +01:00
SpiritCroc 8da4044de6 Merge tag 'v1.0.13' into sc
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
SpiritCroc d0936d2b25 [TMP] Automatic upstream merge preparation
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
2020-12-22 09:18:49 +01:00
reg4xp 8c68126ed9 Translated using Weblate (Persian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2020-12-20 19:35:43 +00:00
notramo 3c37d4c1b0 Translated using Weblate (Hungarian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2020-12-20 19:35:42 +00:00
The one with the braid a9316b2f7e Translated using Weblate (German)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2020-12-20 19:35:42 +00:00
Benoit Marty d53650c8ae Prepare release 1.0.13 2020-12-18 10:59:43 +01:00
Jeff Huang 9a69bb9656 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-12-17 06:35:49 +00:00
random 28aef1067b Translated using Weblate (Italian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2020-12-17 06:35:49 +00:00
Ihor Hordiichuk 690a9eaa21 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2020-12-17 06:35:48 +00:00
Marcelo Filho 24d76b1d32 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2020-12-17 06:35:48 +00:00
Tuomas Hietala 173458ed6c Translated using Weblate (Finnish)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2020-12-17 06:35:48 +00:00
SpiritCroc b0d09313e7 Automatic upstream merge postprocessing
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
2020-12-15 15:55:57 +01:00
SpiritCroc 38b82fb823 Merge tag 'v1.0.12' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/roomprofile/settings/RoomSettingsController.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/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
SpiritCroc 299902feed [TMP] Automatic upstream merge preparation
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
2020-12-15 15:00:31 +01:00
Benoit Marty e230cd8ee3 Prepare release 1.0.12 2020-12-15 14:16:08 +01:00
Weblate 3813f6d659 Merge branch 'origin/develop' into Weblate. 2020-12-14 15:45:20 +00:00
Mitja Sorsa 5186ee6e43 Translated using Weblate (Finnish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2020-12-09 16:15:50 +00:00
random 555bf1f0ae Translated using Weblate (Italian)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2020-12-06 14:50:09 +00:00
SpiritCroc 3defe44eff Increment version
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
2020-12-05 11:02:41 +01:00
LinAGKar bd926fa74b Translated using Weblate (Swedish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2020-12-03 14:50:05 +00:00
Jeff Huang 04914be442 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-12-01 12:50:16 +00:00
strix aluco 3133935063 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2020-12-01 12:50:15 +00:00
SpiritCroc 0469beab1c Automatic upstream merge postprocessing
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
2020-11-29 12:52:25 +01:00
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
SpiritCroc b283ba3b0a [TMP] Automatic upstream merge preparation
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
2020-11-29 12:32:30 +01:00
Marcelo Filho f14b390849 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2020-11-28 17:50:18 +00:00
Benoit Marty 9a8f45fc6f Prepare version 1.0.11 2020-11-27 13:59:23 +01:00
Weblate d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
SpiritCroc ac89fb97f8 Increment version
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
2020-11-24 16:13:49 +01:00
Daniel Løvbrøtte Olsen 62b703ca88 Added translation using Weblate (Norwegian Bokmål) 2020-11-24 07:08:01 +00:00
Victor Cuadrado Juan c81c5c4801 Translated using Weblate (Spanish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
2020-11-16 23:50:03 +00:00
Thomas sivertsen 8e9e4215ce Translated using Weblate (Norwegian Bokmål)
Currently translated at 50.0% (2 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb/
2020-11-11 18:19:15 +00:00
Thomas sivertsen 4dd83c29fe Added translation using Weblate (Norwegian Bokmål) 2020-11-11 18:03:06 +00:00
SpiritCroc 164848e0aa Increment version
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
2020-11-07 11:37:55 +01:00
Jeff Huang ffd3b9a7a7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-11-06 02:50:00 +00:00
Auri B. P 428062e1e4 Translated using Weblate (Catalan)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2020-11-06 02:50:00 +00:00
SpiritCroc c3f62cf80d Automatic upstream merge postprocessing
Change-Id: Ib14a077c026657aff23ffbc42ade1e4524b0b8c2
2020-11-05 13:16:02 +01:00
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
2020-11-05 13:15:55 +01:00
SpiritCroc fc33d50c61 [TMP] Automatic upstream merge preparation
Change-Id: Idd7894614eec671dcce0eecda95e2b7cf31ee7a6
2020-11-05 13:14:16 +01:00
Benoit Marty 619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Weblate f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
SpiritCroc 07e6cf2a8d Increment version
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
2020-11-02 13:20:05 +01:00
SpiritCroc ce77b5f827 Update direct chat screenshots
Change-Id: I4dfe7452d8195d81938887872ef903eb2c5862da
2020-11-02 12:25:10 +01:00
notramo 812181c435 Translated using Weblate (Hungarian)
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/hu/
2020-10-31 12:50:08 +00:00
ynerant 9f3d59711f Translated using Weblate (French)
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/fr/
2020-10-31 12:50:08 +00:00
Benoit Marty 588c2cad15 Add graphic resources for F-Droid (#812, #2220) 2020-10-30 12:25:08 +01:00
Benoit Marty 4b2fbd4344 Prepare changelog for F-Droid (#2296) 2020-10-30 12:16:52 +01:00
Nikolai Zahariev 6e801d5f4d Translated using Weblate (Bulgarian)
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/bg/
2020-10-30 08:22:24 +00:00
Tirifto ec3c386028 Translated using Weblate (Esperanto)
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/eo/
2020-10-27 19:50:14 +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
Danial Behzadi b826e318a5 Translated using Weblate (Persian)
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/fa/
2020-10-21 10:05:01 +00:00
LinAGKar e5320688ba Translated using Weblate (Swedish)
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/sv/
2020-10-21 10:05:00 +00:00
Corentin Noël 8b4721cc3e Translated using Weblate (French)
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/fr/
2020-10-21 10:05:00 +00:00
SpiritCroc 5853709c97 Increment version
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
2020-10-17 17:05:03 +02:00
SpiritCroc cb2050b026 Automatic upstream merge postprocessing
Change-Id: I2085547f6bc20a86dae82dfd4d9db047b110d80f
2020-10-17 15:28:33 +02: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
random f83a0d027a Translated using Weblate (Italian)
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/it/
2020-10-16 09:04:33 +00:00
Benoit Marty 17e7aedcba Move store data to `/fastlane/metadata/android` (#812) 2020-10-12 19:09:04 +02:00