Commit Graph

425 Commits

Author SHA1 Message Date
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
SpiritCroc fc2775d86a Fix Fastfile
Change-Id: Id98dd7c3f1e56775a88a4401407e518265250d95
2021-09-09 10:16:11 +02:00
SpiritCroc 832f0e0e5b Increment version
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
2021-09-09 09:39:24 +02:00
Benoit Marty 13d379badf Create changelog for fastlane 2021-09-08 17:56:01 +02:00
Benoit Marty e72bc699e9 Fix issue in link 2021-09-08 17:53:13 +02:00
Benoit Marty 2239d710db Handle missing descriptions for SQ 2021-09-08 17:30:02 +02:00
Besnik Bleta 478802d60e Translated using Weblate (Albanian)
Currently translated at 3.4% (1 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
2021-09-08 13:44:35 +00:00
Ihor Hordiichuk b8f896d914 Translated using Weblate (Ukrainian)
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/uk/
2021-09-08 13:44:19 +00:00
Fjoerfoks d3bdf99972 Translated using Weblate (Frisian)
Currently translated at 58.6% (17 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
2021-09-01 16:26:18 +00:00
waclaw66 429cd8a526 Translated using Weblate (Czech)
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/cs/
2021-09-01 16:26:17 +00:00
Jeff Huang 4523f986f7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-09-01 16:26:17 +00:00
Danial Behzadi aa30c1f97e Translated using Weblate (Persian)
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/fa/
2021-09-01 16:26:16 +00:00
random b4d6773f46 Translated using Weblate (Italian)
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/it/
2021-09-01 16:26:15 +00:00
Priit Jõerüüt e655fd498c Translated using Weblate (Estonian)
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-09-01 16:26:14 +00:00
sr093906 69eb59888f Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
2021-09-01 16:26:13 +00:00
Ihor Hordiichuk b102f5e333 Translated using Weblate (Ukrainian)
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/uk/
2021-09-01 16:26:12 +00:00
LinAGKar 3fd906fcb8 Translated using Weblate (Swedish)
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/sv/
2021-09-01 16:26:11 +00:00
lvre e1c095d479 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2021-09-01 16:26:10 +00:00
Szimszon 3ddfc3e1cc Translated using Weblate (Hungarian)
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/hu/
2021-09-01 16:26:09 +00:00
Weblate ed9e9336e0 Merge branch 'origin/develop' into Weblate. 2021-08-30 09:00:46 +00:00