Commit graph

363 commits

Author SHA1 Message Date
SpiritCroc
f97549073e Increment version
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
2021-09-18 20:38:14 +02: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
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
SpiritCroc
f9f06364fc Update Fastfile
Change-Id: I8c3ff096bdee642dd8cd20dca47fef98694930ff
2021-08-28 10:33:02 +02:00
SpiritCroc
5f18fce771 Increment version
Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c
2021-08-20 10:45:57 +02:00
SpiritCroc
6a29821273 fastlane: build app bundle
Change-Id: I6b75272f450dde708dd15b205d9bc2d456340b78
2021-08-15 14:13:08 +02:00
SpiritCroc
8fe2a0021f Increment version
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
2021-08-14 14:38:23 +02:00
SpiritCroc
6aba012772 Automatic upstream merge postprocessing
Change-Id: If4b404091e76ab298085a1151de222f423ce89f7
2021-08-12 09:04:00 +02:00
SpiritCroc
58f5310e83 Merge tag 'v1.2.0' into sc
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-12 09:03:42 +02:00
SpiritCroc
6443ae4c7d [TMP] Automatic upstream merge preparation
Change-Id: I042bcc5e6ed6a00473f32d1270b5b620c69a5691
2021-08-12 09:02:53 +02:00
Onuray Sahin
dfc2460189 Changelog added. 2021-08-12 02:32:54 +03:00
Weblate
f1ff0a78fc Merge branch 'origin/develop' into Weblate. 2021-08-11 13:46:06 +00:00
Linerly
fdf983a2c8 Translated using Weblate (Indonesian)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2021-08-11 13:45:40 +00:00
Danial Behzadi
a8c8906934 Translated using Weblate (Persian)
Currently translated at 48.1% (13 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2021-08-11 13:45:40 +00:00
waclaw66
d2fc32117c Translated using Weblate (Czech)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-08-10 12:25:34 +00:00
Jeff Huang
c13f30a5c1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-08-10 12:25:33 +00:00
random
871925e340 Translated using Weblate (Italian)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-08-10 12:25:32 +00:00
Priit Jõerüüt
bcd1271671 Translated using Weblate (Estonian)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-08-10 12:25:32 +00:00
LinAGKar
788503bb4d Translated using Weblate (Swedish)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-08-10 12:25:31 +00:00
Glandos
3373b7c265 Translated using Weblate (French)
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-08-10 12:25:30 +00:00
SpiritCroc
2c0dbb90e6 Automatic upstream merge postprocessing
Change-Id: I1cfb33b45f910fe560dc7aa694531d23b2f539c6
2021-08-10 09:55:09 +02:00
SpiritCroc
677330921d Merge tag 'v1.1.16' into sc
v1.1.16

Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
2021-08-10 09:54:58 +02:00
SpiritCroc
0060cf3612 [TMP] Automatic upstream merge preparation
Change-Id: Ib294306a0c663db0738e39ec27994e65c8026f5c
2021-08-10 09:34:33 +02:00
Onuray Sahin
5f6541fbb5 Changelog added. 2021-08-09 00:33:18 +03:00
lvre
a5cc0f98ab Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-08-08 20:51:53 +00:00
Weblate
c0007dbf24 Merge branch 'origin/develop' into Weblate. 2021-08-08 18:56:25 +00:00
artevaeckt
75553da059 Translated using Weblate (German)
Currently translated at 92.3% (24 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-08-08 18:55:59 +00:00
Nikita Epifanov
170404fb6e Translated using Weblate (Russian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-08-07 09:25:14 +00:00
Nikita Epifanov
a860c273d1 Translated using Weblate (Russian)
Currently translated at 96.1% (25 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-08-06 07:25:23 +00:00
Linerly
c1e734f7b6 Translated using Weblate (Indonesian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2021-08-06 07:25:15 +00:00
zeritti
660b2b283a Translated using Weblate (Czech)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-08-03 09:25:20 +00:00
Jeff Huang
6bd2ee5f4c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-08-03 09:25:19 +00:00
random
f8aa820aad Translated using Weblate (Italian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-08-03 09:25:18 +00:00
Priit Jõerüüt
192edc54e9 Translated using Weblate (Estonian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-08-03 09:25:18 +00:00
Ihor Hordiichuk
09ffa34039 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-08-03 09:25:17 +00:00
lvre
059846a80b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-08-03 09:25:16 +00:00
Szimszon
b052cbf998 Translated using Weblate (Hungarian)
Currently translated at 100.0% (26 of 26 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2021-08-03 09:25:16 +00:00
SpiritCroc
9b9964e506 Automatic upstream merge postprocessing
Change-Id: I5e4bd152529574c753fb2dd8b39ceafb8638ed02
2021-08-01 09:37:46 +02:00
SpiritCroc
25ba52115b Merge tag 'v1.1.15' into sc
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
SpiritCroc
c3f3e13d26 [TMP] Automatic upstream merge preparation
Change-Id: I980573f83c23136057e6cf47093567d89a023458
2021-07-30 18:33:30 +02:00
Onuray Sahin
3900a3ef33 fastlane changelog added. 2021-07-30 17:44:09 +03:00
Weblate
7e79473df5 Merge branch 'origin/develop' into Weblate. 2021-07-30 12:37:18 +00:00
Jeff Huang
ec87faa24b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-07-28 21:25:13 +00:00
random
fd0a6746bd Translated using Weblate (Italian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-07-28 21:25:12 +00:00
Szimszon
6cb10b0e9f Translated using Weblate (Hungarian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2021-07-28 21:25:12 +00:00
SpiritCroc
782141998d Increment version
Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db
2021-07-27 14:53:48 +02:00
SpiritCroc
a8f1391c47 Fix fastlane
Change-Id: If9f02ea28f6377c6fa218e9ac024469ceab5ad61
2021-07-27 14:47:05 +02:00