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

641 Commits

Author SHA1 Message Date
SpiritCroc 086d9c08ff Increment version 
Change-Id: If221cd37b10e6510ce1bc9f65de9b44c27951e70
 2022-05-27 09:17:20 +02:00
SpiritCroc e7ffd128dc Automatic upstream merge postprocessing 
Change-Id: Id00a9dd26823196ffca4fbd64513875011bd2969
 2022-05-18 10:00:20 +02:00
SpiritCroc 4f60963741 Merge tag 'v1.4.16' into sc 
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
	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/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-05-18 09:59:01 +02:00
SpiritCroc 360f469c4c [TMP] Automatic upstream merge preparation 
Change-Id: Idb8470d85e1279feb5fdf4f891aaf91c47b78dbc
 2022-05-17 22:06:28 +02:00
Benoit Marty 1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty 86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Weblate 52a1fcb397 Merge branch 'origin/develop' into Weblate. 2022-05-17 12:51:46 +00:00
Piotr Strebski f60bba28aa Translated using Weblate (Polish) 
Currently translated at 45.7% (27 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-05-14 13:59:46 +00:00
SpiritCroc 9d6749f8cb Increment version 
Change-Id: Ieb63a5f1f3f14f11ef0f874b45f74d95e14240b6
 2022-05-09 12:41:04 +02:00
LinAGKar 4ffd495811 Translated using Weblate (Swedish) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-05-08 12:59:43 +00:00
Linerly bb63638075 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-05-06 23:00:04 +00:00
random 257492d94e Translated using Weblate (Italian) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2022-05-06 23:00:03 +00:00
waclaw66 4570676042 Translated using Weblate (Czech) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2022-05-06 23:00:01 +00:00
Jozef Gaal 7d16b557d4 Translated using Weblate (Slovak) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-05-06 22:59:59 +00:00
Ihor Hordiichuk 06cfdb6076 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2022-05-06 22:59:56 +00:00
Jeff Huang 186c507e9d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-05-06 22:59:55 +00:00
Danial Behzadi 725f2c97a1 Translated using Weblate (Persian) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2022-05-06 22:59:50 +00:00
anoloth ec0e6691af Translated using Weblate (Lao) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/lo/
 2022-05-06 22:59:49 +00:00
lvre f1c9e63002 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2022-05-06 22:59:47 +00:00
libexus 0080ae494f Translated using Weblate (German) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2022-05-06 22:59:45 +00:00
Priit Jõerüüt 83f8c31448 Translated using Weblate (Estonian) 
Currently translated at 100.0% (59 of 59 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-05-06 22:59:42 +00:00
SpiritCroc cf3036de22 Automatic upstream merge postprocessing 
Change-Id: Ia795352ccd15a5c17d71090d221cbedb51a96874
 2022-05-05 17:41:28 +02:00
SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc 
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	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/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2022-05-05 17:41:26 +02:00
SpiritCroc 11194546a7 [TMP] Automatic upstream merge preparation 
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
 2022-05-05 14:26:49 +02:00
ganfra 9420d309a5 Add changes 2022-05-05 10:38:49 +02:00
Weblate 5cdea33418 Merge branch 'origin/develop' into Weblate. 2022-05-04 14:39:20 +00:00
anoloth 00cc8decdb Translated using Weblate (Lao) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/lo/
 2022-05-03 23:00:31 +00:00
John Doe 3e9636e0d3 Translated using Weblate (Spanish) 
Currently translated at 64.9% (37 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
 2022-05-03 22:59:46 +00:00
SpiritCroc 9a8efb0ef8 Increment version 
Change-Id: I3a73a0e2d2956d2e7bdc8efa5a308e89f6411bb7
 2022-04-29 09:50:04 +02:00
SpiritCroc 9dba0689e3 Automatic upstream merge postprocessing 
Change-Id: I59eaeaadcbec25a8e3e97ac0df4989731e1eefa0
 2022-04-26 17:51:35 +02:00
SpiritCroc e450d4e9ce Merge tag 'v1.4.13' into sc 
Change-Id: I308735bb5d47ae39a73437926180f563cc1a7391
 2022-04-26 17:46:15 +02:00
SpiritCroc fec5193ec6 [TMP] Automatic upstream merge preparation 
Change-Id: I19f122ebca5575b42c24e3b6757b44bfdb6526d6
 2022-04-26 15:31:18 +02:00
Benoit Marty 6b5822e3d5 fastlane (same content than for 1.4.12) 2022-04-26 11:35:43 +02:00
Besnik Bleta ec0b5a8593 Translated using Weblate (Albanian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2022-04-24 17:00:56 +00:00
Danial Behzadi 47df16f7b9 Translated using Weblate (Persian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2022-04-24 17:00:55 +00:00
LinAGKar 8e96e8c2a3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-04-24 17:00:53 +00:00
lvre ac3f5b5ff8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2022-04-24 17:00:52 +00:00
SpiritCroc a4890457e7 Automatic upstream merge postprocessing 
Change-Id: I90adddf6afb6bd838c7c9b8b70dda654e0247b6d
 2022-04-24 11:15:56 +02:00
SpiritCroc d44cb85dc7 Merge tag 'v1.4.12' into sc 
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.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/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/layout/item_space_beta_header.xml
 2022-04-24 11:15:52 +02:00
SpiritCroc 589ce215de [TMP] Automatic upstream merge preparation 
Change-Id: I889085ec4626c8bad3c6eeb4aba0b9d57799d6f2
 2022-04-24 10:47:15 +02:00
Jeff Huang 3699a8e97d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-04-22 09:59:47 +00:00
Priit Jõerüüt 42d942d501 Translated using Weblate (Estonian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-04-22 09:59:46 +00:00
Linerly b658d6afc7 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-04-21 00:21:45 +00:00
waclaw66 4ade5c1e18 Translated using Weblate (Czech) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2022-04-21 00:21:44 +00:00
Andreas Lindhé 42a90f6775 Translated using Weblate (Swedish) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-04-21 00:21:43 +00:00
Jozef Gaal 91d37ad093 Translated using Weblate (Slovak) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-04-21 00:21:42 +00:00
Adam Brown 903c402cf5 generating changelog 2022-04-20 14:08:58 +01:00
random 7c1aca8703 Translated using Weblate (Italian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2022-04-20 10:32:21 +00:00
Ihor Hordiichuk 3ac99fd4e4 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2022-04-20 10:32:20 +00:00
Adam Brown 73754993a5 Translated using Weblate (Polish) 
Currently translated at 38.5% (22 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-04-20 08:37:20 +00:00