filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,594 Commits 7 Branches 121 Tags 228 MiB
Commit Graph

237 Commits

Author SHA1 Message Date
SpiritCroc 8b6e8ad3c5 [TMP] Automatic upstream merge preparation 
Change-Id: I12f25c8c45e1f120f1e05041fd281f02a3f6392d
 2021-06-02 17:04:48 +02:00
SpiritCroc bddc574766 Increment version 
Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716
 2021-06-02 16:51:11 +02:00
SpiritCroc 6693b398bb Automatic upstream merge postprocessing 
Change-Id: Iff3f2521a41455cfc94afc1b4e0ad961c0d64ce8
 2021-05-26 10:44:23 +02:00
SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
SpiritCroc 6e60fd7328 [TMP] Automatic upstream merge preparation 
Change-Id: Ic0b3e2a1ac115db029101589e77e16cf4b38d314
 2021-05-26 08:48:20 +02:00
Benoit Marty 504507a6cc Prepare release 1.1.8 2021-05-25 18:11:26 +02:00
Weblate 1cc2e8b000 Merge branch 'origin/develop' into Weblate. 2021-05-25 11:06:53 +00:00
Quang Trung bd3aa4024a Translated using Weblate (Vietnamese) 
Currently translated at 22.2% (4 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/vi/
 2021-05-25 11:06:37 +00:00
Tuomas Hietala a21867e380 Translated using Weblate (Finnish) 
Currently translated at 72.2% (13 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-05-25 11:06:37 +00:00
Viorel-Cătălin Răpițeanu a14c00e669 Translated using Weblate (Romanian) 
Currently translated at 11.1% (2 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ro/
 2021-05-22 21:34:33 +00:00
SpiritCroc 4f46f470d6 Increment version 
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
 2021-05-22 10:12:03 +02:00
sr093906 2b396707f9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 66.6% (12 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2021-05-21 12:34:35 +00:00
Julian Heinzel 0a6adad680 Translated using Weblate (German) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-05-20 01:34:44 +00:00
Ihor Hordiichuk ade2f0c065 Translated using Weblate (Ukrainian) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-05-20 01:34:40 +00:00
lvre e80ca634ca Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2021-05-20 01:34:33 +00:00
Ville Ranki 07b84bbff1 Translated using Weblate (Finnish) 
Currently translated at 66.6% (12 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-05-20 01:34:32 +00:00
SpiritCroc e40bf1704b Increment version 
Change-Id: If1b871b3ab76544d87e965986a8c53b782692f8e
 2021-05-15 10:03:28 +02:00
Thibault Martin e09230b3cf Translated using Weblate (French) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-05-13 13:34:43 +00:00
SpiritCroc 19605b0cdc Automatic upstream merge postprocessing 
Change-Id: Iad909d733876af3c770cd5bad26a971bd5b74dc2
 2021-05-12 16:01:49 +02:00
SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.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/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
SpiritCroc 38b4da547e [TMP] Automatic upstream merge preparation 
Change-Id: I1f5c1f52159efe0485c11056da07d3e8b1aeacba
 2021-05-12 15:45:50 +02:00
Benoit Marty 2f37c703a4 Prepare release 1.1.7 2021-05-12 15:13:51 +02:00
Ange des ténèbres 610c25b67c Translated using Weblate (French) 
Currently translated at 88.8% (16 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-05-06 11:34:29 +00:00
Vancha b05f53453a Translated using Weblate (Frisian) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
 2021-05-05 08:34:51 +00:00
zeritti ad1832efbc Translated using Weblate (Czech) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-05-05 08:34:51 +00:00
Sven Grewe 72dcf5c65e Translated using Weblate (German) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-05-03 08:04:35 +00:00
LinAGKar ee8ef585ce Translated using Weblate (Swedish) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-05-03 08:04:30 +00:00
random ebfb4b4b9a Translated using Weblate (Italian) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-05-03 08:04:01 +00:00
Jeff Huang 278738a9d4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-05-03 08:03:46 +00:00
Priit Jõerüüt 01d0201852 Translated using Weblate (Estonian) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-05-03 08:03:40 +00:00
SpiritCroc ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
Weblate 79f125cccd Merge branch 'origin/develop' into Weblate. 2021-04-29 13:38:14 +00:00
Deleted User 63f1efd320 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb_NO/
 2021-04-24 19:34:24 +00:00
SpiritCroc 3b94ea72d3 Automatic upstream merge postprocessing 
Change-Id: I18bd4c7615bc18926f0a5aafc0011d1b8d0f47eb
 2021-04-16 15:32:21 +02:00
SpiritCroc 2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
SpiritCroc 7a7cad9bb6 [TMP] Automatic upstream merge preparation 
Change-Id: I74d0a4cf0fdddf3339958b21f0ceefceaec0fd47
 2021-04-16 15:29:14 +02:00
Benoit Marty 19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
LinAGKar 14e80855b4 Translated using Weblate (Swedish) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-04-15 17:34:23 +00:00
oksya8and8 80e67281c6 Translated using Weblate (Japanese) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ja/
 2021-04-15 17:34:22 +00:00
Sven Grewe b683c45bd8 Translated using Weblate (German) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-04-15 17:34:21 +00:00
SpiritCroc 5757d1894c Automatic upstream merge postprocessing 
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
 2021-04-15 12:30:02 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
SpiritCroc ad8e9380b6 [TMP] Automatic upstream merge preparation 
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
 2021-04-15 12:29:55 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
SpiritCroc 5749e31508 Automatic upstream merge postprocessing 
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
 2021-04-14 14:02:43 +02:00
Moo 2116ff91cc Added translation using Weblate (Lithuanian) 2021-04-13 19:52:50 +00:00
Salamandar f23eb425a1 Translated using Weblate (French) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-04-13 08:34:24 +00: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