Commit graph

73 commits

Author SHA1 Message Date
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