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

492 commits

Author SHA1 Message Date
SpiritCroc
e4f36f17a2 Automatic upstream merge postprocessing 
Change-Id: I54c9b9df50bd6fb4b8cde241701c4f3e3ecb92cb
 2021-10-27 15:25:08 +02:00
SpiritCroc
72a7e0677e Merge tag 'v1.3.6' into sc 
Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02
 2021-10-27 15:25:05 +02:00
SpiritCroc
28e1c6d272 [TMP] Automatic upstream merge preparation 
Change-Id: I1d67b75cd2ada1deba3008ccc75cac72881a7e1a
 2021-10-27 15:24:57 +02:00
Benoit Marty
edd29ec4ef fastlane change 2021-10-26 16:51:59 +02:00
SpiritCroc
af489701a8 Automatic upstream merge postprocessing 
Change-Id: I0fa90d77fe47074d677355b0025e1611e598d565
 2021-10-25 19:30:04 +02:00
SpiritCroc
65bc997acc Merge tag 'v1.3.5' into sc 
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
 2021-10-25 19:29:59 +02:00
SpiritCroc
d1468a50d2 [TMP] Automatic upstream merge preparation 
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
 2021-10-25 19:29:51 +02:00
Benoit Marty
f877965550 Fastlane files 2021-10-25 12:38:53 +02:00
SpiritCroc
8171a85657 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
 2021-10-22 11:16:40 +02:00
Weblate
f75de0b2b7 Merge branch 'origin/develop' into Weblate. 2021-10-22 08:00:00 +00:00
Glandos
7aa860b1fa Translated using Weblate (French) 
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/fr/
 2021-10-22 07:59:55 +00: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
Benoit Marty
d5f2a6179d Fastlane change 2021-10-20 10:44:20 +02:00
waclaw66
c056dc27ca Translated using Weblate (Czech) 
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/cs/
 2021-10-19 15:25:42 +00:00
Jeff Huang
1d831b3a1b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-10-19 15:25:41 +00:00
random
16a8cf6d51 Translated using Weblate (Italian) 
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/it/
 2021-10-19 15:25:40 +00:00
Besnik Bleta
1c119c2c5d Translated using Weblate (Albanian) 
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/sq/
 2021-10-18 01:25:54 +00: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
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
Priit Jõerüüt
4a1f1a9fa5 Translated using Weblate (Estonian) 
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/et/
 2021-10-18 01:25:51 +00:00
sr093906
022452cd45 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-10-18 01:25:50 +00:00
Ihor Hordiichuk
f8850f5eb8 Translated using Weblate (Ukrainian) 
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/uk/
 2021-10-18 01:25:49 +00:00
LinAGKar
5a82981944 Translated using Weblate (Swedish) 
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/sv/
 2021-10-18 01:25:48 +00:00
Nikita Epifanov
28ccfbdc0d Translated using Weblate (Russian) 
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/ru/
 2021-10-18 01:25:47 +00:00
lvre
99bb0f994f Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-10-18 01:25:46 +00:00
Szimszon
964937db98 Translated using Weblate (Hungarian) 
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/hu/
 2021-10-18 01:25:45 +00:00
Weblate
d23bd411b3 Merge branch 'origin/develop' into Weblate. 2021-10-15 15:01:09 +00:00
Glandos
4ccdf65308 Translated using Weblate (French) 
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/fr/
 2021-10-15 15:00:59 +00:00
Jeff Huang
4d9e348aba Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-10-13 21:26:18 +00:00
Leonidas Shear
ebf8c51207 Translated using Weblate (Russian) 
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/ru/
 2021-10-13 21:26:17 +00:00
random
d75e523935 Translated using Weblate (Italian) 
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/it/
 2021-10-13 21:25:45 +00:00
LinAGKar
a9abec8d0a Translated using Weblate (Swedish) 
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/sv/
 2021-10-13 21:25:39 +00:00
waclaw66
53b2f0c5e7 Translated using Weblate (Czech) 
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/cs/
 2021-10-13 21:25:38 +00:00
Benoit Marty
d4f62902a6 Add a paragraph about Open source 2021-10-12 21:15:45 +02:00
SpiritCroc
57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
Benoit Marty
9acec43a48 fastlane 2021-10-11 12:04:24 +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
discapacidad5
d366fb1c0f Translated using Weblate (Spanish) 
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/es/
 2021-10-11 08:39:02 +00:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	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/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.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/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
 2021-10-11 09:55:26 +02:00
Besnik Bleta
a8c8e1d6ff Translated using Weblate (Albanian) 
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/sq/
 2021-10-10 13:25:57 +00: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
Priit Jõerüüt
0f1e5fcc5c Translated using Weblate (Estonian) 
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/et/
 2021-10-10 13:25:55 +00:00
sr093906
eefff680b7 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-10-10 13:25:54 +00:00
Ihor Hordiichuk
c9d15c1708 Translated using Weblate (Ukrainian) 
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/uk/
 2021-10-10 13:25:53 +00:00
lvre
25250cb508 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-10-10 13:25:53 +00:00
Szimszon
aa1e4a9f44 Translated using Weblate (Hungarian) 
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/hu/
 2021-10-10 13:25:52 +00:00
SpiritCroc
44797fc2dc [TMP] Automatic upstream merge preparation 
Change-Id: I47dbe78febc16601fcd4e43ca4187d7735f709a8
 2021-10-08 18:50:23 +02:00