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

14 Commits

Author SHA1 Message Date
SpiritCroc af489701a8 Automatic upstream merge postprocessing 
Change-Id: I0fa90d77fe47074d677355b0025e1611e598d565
 2021-10-25 19:30:04 +02:00
SpiritCroc d1468a50d2 [TMP] Automatic upstream merge preparation 
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
 2021-10-25 19:29:51 +02:00
SpiritCroc 5d83211995 Automatic upstream merge postprocessing 
Change-Id: Iae698de2ab9d37e10f4ad845d3e28f047bc69df3
 2021-10-21 17:42:29 +02:00
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.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/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.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/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
 2021-10-21 17:31:11 +02:00
SpiritCroc 969fa9fb26 [TMP] Automatic upstream merge preparation 
Change-Id: I40d5b4920f7f5f8e75167ae3382d585b8a5d38aa
 2021-10-21 16:27:34 +02:00
Linerly 6cb254e743 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-10-18 01:25:53 +00:00
SpiritCroc 57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
SpiritCroc bba7a691e0 Automatic upstream merge postprocessing 
Change-Id: I28aa960c79bf4807aab871ff8128d2339309342c
 2021-10-11 10:39:16 +02:00
Linerly 3c7e05b86e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-10-11 08:39:04 +00:00
Linerly 32a39ad461 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (31 of 31 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-10-03 17:25:33 +00:00
Linerly d8bbd17eca Translated using Weblate (Indonesian) 
Currently translated at 100.0% (31 of 31 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-10-02 12:26:42 +00:00
Linerly 86ce92ddf6 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-09-16 15:25:54 +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
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