mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
12033 commits 7 branches 124 tags 230 MiB
Commit graph

24 commits

Author SHA1 Message Date
SpiritCroc
28e1c6d272 [TMP] Automatic upstream merge preparation 
Change-Id: I1d67b75cd2ada1deba3008ccc75cac72881a7e1a
 2021-10-27 15:24:57 +02:00
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
Danial Behzadi
87bd145e8e Translated using Weblate (Persian) 
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/fa/
 2021-10-18 01:25:52 +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
Danial Behzadi
1c20c096d8 Translated using Weblate (Persian) 
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/fa/
 2021-10-10 13:25:56 +00:00
Danial Behzadi
720154572f Translated using Weblate (Persian) 
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/fa/
 2021-10-02 12:26:39 +00:00
Danial Behzadi
64f845c372 Translated using Weblate (Persian) 
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-09-29 10:01:54 +00:00
Danial Behzadi
aa30c1f97e Translated using Weblate (Persian) 
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/fa/
 2021-09-01 16:26:16 +00:00
Danial Behzadi
30c89a851f Translated using Weblate (Persian) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-23 06:25:19 +00:00
Danial Behzadi
7ab7f12b4c Translated using Weblate (Persian) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-17 13:25:35 +00:00
Danial Behzadi
2f76030af2 Translated using Weblate (Persian) 
Currently translated at 50.0% (14 of 28 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-13 21:25:48 +00:00
Danial Behzadi
a8c8906934 Translated using Weblate (Persian) 
Currently translated at 48.1% (13 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-11 13:45:40 +00:00
1kiarash
16719a6709 Translated using Weblate (Persian) 
Currently translated at 52.3% (11 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-06-11 21:55:37 +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
Danial Behzadi
2e68c48752 Translated using Weblate (Persian) 
Currently translated at 71.4% (5 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-02-02 11:21:09 +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
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
Daniel Løvbrøtte Olsen
62b703ca88 Added translation using Weblate (Norwegian Bokmål) 2020-11-24 07:08:01 +00:00
Danial Behzadi
b826e318a5 Translated using Weblate (Persian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2020-10-21 10:05:01 +00:00