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

180 commits

Author SHA1 Message Date
SpiritCroc
5749e31508 Automatic upstream merge postprocessing 
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
 2021-04-14 14:02:43 +02:00
SpiritCroc
0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
SpiritCroc
79daede4f5 [TMP] Automatic upstream merge preparation 
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
 2021-04-12 15:58:23 +02:00
SpiritCroc
d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
Benoit Marty
5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
SpiritCroc
235cfa48ee Automatic upstream merge postprocessing 
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
 2021-04-09 11:57:22 +02:00
SpiritCroc
6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
SpiritCroc
5bfc106a33 [TMP] Automatic upstream merge preparation 
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
 2021-04-09 11:55:41 +02:00
Weblate
eff560f8f0 Merge branch 'origin/develop' into Weblate. 2021-04-07 15:37:02 +00:00
Danial Behzadi
5971edee14 Translated using Weblate (Persian) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-04-07 15:36:56 +00:00
Nikita Epifanov
57d94c5494 Translated using Weblate (Russian) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
 2021-04-07 15:36:55 +00:00
Samu Voutilainen
5a988d6f4a Translated using Weblate (Finnish) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-04-07 15:36:55 +00:00
Safa Alfulaij
77fb8de71f Translated using Weblate (Arabic) 
Currently translated at 92.3% (12 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ar/
 2021-04-02 19:34:39 +00:00
RainSlide
fa3ccda3f4 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2021-03-26 06:34:32 +00:00
Benoit Marty
1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Graeme Power
64bdd894d6 Translated using Weblate (Irish) 
Currently translated at 7.6% (1 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ga/
 2021-03-18 07:34:32 +00:00
GokdenizK
3ceee8302a Translated using Weblate (Turkish) 
Currently translated at 76.9% (10 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/tr/
 2021-03-18 07:34:23 +00:00
KAHINA
ab12c641a8 Translated using Weblate (Kabyle) 
Currently translated at 23.0% (3 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/kab/
 2021-03-18 07:34:22 +00:00
Thibault Martin
33306bf218 Translated using Weblate (French) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-03-18 07:34:22 +00:00
Sven Grewe
a5b2083f1b Translated using Weblate (German) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-03-18 07:34:22 +00:00
Benoit Marty
2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
Auri B. P
256ddc1831 Translated using Weblate (Catalan) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
 2021-03-14 10:34:15 +00:00
SpiritCroc
bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	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/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
SpiritCroc
1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
zeritti
8f0319a138 Translated using Weblate (Czech) 
Currently translated at 100.0% (13 of 13 strings)

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

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-03-12 23:34:24 +00:00
random
3ad6c7a18b Translated using Weblate (Italian) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-03-12 23:34:24 +00:00
Priit Jõerüüt
7651df1228 Translated using Weblate (Estonian) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-03-12 23:34:23 +00:00
Ihor Hordiichuk
6148b2647f Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-03-12 23:34:23 +00:00
LinAGKar
e7d7886397 Translated using Weblate (Swedish) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-03-12 23:34:22 +00:00
Marcelo Filho
6e757f88b6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2021-03-12 23:34:22 +00:00
Benoit Marty
ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty
2536452220
Merge pull request #2964 from vector-im/matthew/zh 
rename zh-Hans and zh-Hant - TO BE MERGED DURING WEBLATE SYNC
 2021-03-10 18:32:22 +01:00
Ihor Hordiichuk
f7abda5d1f Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-03-10 11:29:18 +00:00
@a2sc:matrix.org
b373957b6b Translated using Weblate (German) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-03-10 11:29:18 +00:00
zeritti
cd9718b7ef Translated using Weblate (Czech) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-03-06 21:34:16 +00:00
Auri B. P
fda8ac1f51 Translated using Weblate (Catalan) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
 2021-03-06 21:34:16 +00:00
Priit Jõerüüt
427a3d1be3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-03-06 21:34:15 +00:00
Matthew Hodgson
42ef81cf40 apparently the others shouldn't have underscores either 2021-03-05 14:07:39 +00:00
Matthew Hodgson
aaeb9a0fd7 rename zh as per https://github.com/vector-im/element-android/issues/2752 2021-03-05 13:56:43 +00:00
Jeff Huang
8bd62dddc8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-03-04 12:23:23 +00:00
LinAGKar
f24159504d Translated using Weblate (Swedish) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-03-04 12:23:23 +00:00
Weblate
3b9adbf5c8 Merge branch 'origin/develop' into Weblate. 2021-03-03 09:29:37 +00:00
HelaBasa
755fad7808 Translated using Weblate (Sinhala) 
Currently translated at 9.0% (1 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/si/
 2021-03-03 09:28:50 +00:00
Marcelo Filho
ba74faa562 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2021-02-27 17:34:21 +00:00
SpiritCroc
ff08370cd7 Increment version 
Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b
 2021-02-26 12:59:31 +01:00
Argetlami
20c692fddf Translated using Weblate (Finnish) 
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-02-24 19:34:13 +00:00
zeritti
ab52395d1a Translated using Weblate (Czech) 
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-02-23 07:34:32 +00:00
waclaw66
b37505112b Translated using Weblate (Czech) 
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-02-21 07:34:06 +00:00