mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 10:55:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
7527 commits 6 branches 120 tags 229 MiB
Commit graph

75 commits

Author SHA1 Message Date
SpiritCroc
ad4ba631b9 [TMP] Automatic upstream merge preparation 
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
 2021-02-04 17:00:40 +01:00
SpiritCroc
417bf48dd1 Increment version 
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
 2021-01-23 11:58:10 +01: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
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