mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 22:18:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
17805 commits 6 branches 120 tags 229 MiB
Commit graph

17805 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
399332311e Automatic SchildiChat string correction 
Change-Id: I4062e81180d979445c7a55bb59ec8626073e1337
 2022-06-14 10:14:06 +02:00
SpiritCroc
5bce0e1300 Automatic upstream merge postprocessing 
Change-Id: Id7304f3ef6101969915853b88b0a06a596548295
 2022-06-14 10:14:05 +02:00
SpiritCroc
ff65f2d704 Merge tag 'v1.4.20' into sc 
Change-Id: I8d93dd3caa86ff7c68aacbd037dca60591ec254c
 2022-06-14 10:06:37 +02:00
SpiritCroc
4778d7cb5b [TMP] Automatic upstream merge preparation 
Change-Id: Icf897adc9be76c7d19e4ee8bd1369c6532d0852d
 2022-06-14 10:05:26 +02:00
SpiritCroc
e76c6f4290 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I38d65505ad01d3e725e1a534c6444cae29ca5d21
 2022-06-14 10:05:25 +02:00
Benoit Marty
31bc66717f Merge branch 'hotfix/1.4.20' into main 2022-06-13 14:08:50 +02:00
Benoit Marty
4fa8e70276 Prepare hotfix 1.4.20 2022-06-13 12:37:39 +02:00
ganfra
2a9ac539e4 Change after PR review 2022-06-13 12:35:39 +02:00
ganfra
c384a3de8d Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead 2022-06-13 12:35:20 +02:00
Valere
65bb1a7ddc Fix space orphan filtering 2022-06-13 12:33:14 +02:00
SpiritCroc
98140b16af Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ic1369bd35cb53615da5ebfe8f5e9220b21054153
 2022-06-11 16:18:17 +02:00
SpiritCroc
6fd70c6164 Make spaces back navigation a setting, disabled by default 
Adds back support for those also in viewPager navigation mode, but still
don't build the stack when swiping.

Change-Id: Ib800eab558875e74b590967e7c5432a909bac60a
 2022-06-11 10:31:18 +02:00
Hiajen
6a4848924c Translated using Weblate (German) 
Currently translated at 94.8% (146 of 154 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-06-08 22:04:17 +02:00
SpiritCroc
d093b17da0 More hidden events developer quick settings 
Change-Id: Ic5f716ec7bac1e292284a3706ac7b252b367b03f
 2022-06-08 15:14:55 +02:00
SpiritCroc
d3c6356a3f Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Iee089b2368a86f485472fb79b96f871cec297c37
 2022-06-08 14:36:34 +02:00
SpiritCroc
6344a3982d Merge remote-tracking branch 'origin/merge-v1.4.19' into sc 
Change-Id: Idbdbece462fff520912ab0f356a74585989d6d14
 2022-06-08 14:35:25 +02:00
SpiritCroc
89f129c657 Material red for warnings and errors in SC themes 
Change-Id: Ic7f8550f4a15b8128b4c6c83fb9f8aa3498c915e
 2022-06-07 18:28:03 +02:00
SpiritCroc
f79edd64a6 Disable space stack for viewpager navigation 
Change-Id: I7b895cc8cd945f2038bf0be07cdc140496394428
 2022-06-07 16:03:40 +02:00
SpiritCroc
977ef3cd08 Automatic SchildiChat string correction 
Change-Id: I2df543e0b4e2aac6f44a59f10a250a1fee7eaffa
 2022-06-07 15:33:59 +02:00
SpiritCroc
49121000c5 Automatic upstream merge postprocessing 
Change-Id: I8e5240c6060b2585a5e6be7f95fca5a48346dd75
 2022-06-07 15:33:58 +02:00
SpiritCroc
de179f1d29 Merge tag 'v1.4.19' into merge-v1.4.19 
Change-Id: Id486dab5c9b6c545e7035355fe921240c34409a6
 2022-06-07 15:33:53 +02:00
SpiritCroc
753da88597 [TMP] Automatic upstream merge preparation 
Change-Id: I83744c522088410f134452fd7e33b16996c6b01c
 2022-06-07 15:33:50 +02:00
SpiritCroc
f53a2fa6cb Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iaa543dafc06b45922fa6c02754b5400f08580d66
 2022-06-07 15:33:50 +02:00
Benoit Marty
4ea2b19351 Merge branch 'hotfix/v1.4.19' into main 2022-06-07 15:14:48 +02:00
Benoit Marty
b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
ericdecanini
6513210904 Changes space subtitle in explore rooms from joined string to direct space parent 2022-06-07 15:02:15 +02:00
Valere
a6113526d0 code review 2022-06-07 15:01:57 +02:00
Valere
2fa25f8b5e Fix param name 2022-06-07 15:01:29 +02:00
Valere
d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02:00
SpiritCroc
6ca55d41d8 Translated using Weblate (German) 
Currently translated at 94.1% (145 of 154 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-06-05 13:17:24 +02:00
Linerly
52f993a2d3 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (154 of 154 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2022-06-05 13:17:23 +02:00
joshua
3bf50f3711 Translated using Weblate (Swedish) 
Currently translated at 100.0% (154 of 154 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
 2022-06-05 13:17:23 +02:00
waclaw66
fb981e03e2 Translated using Weblate (Czech) 
Currently translated at 100.0% (154 of 154 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-06-05 13:17:23 +02:00
pixelcode
ffcae2e069 Translated using Weblate (German) 
Currently translated at 95.3% (145 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-06-05 13:17:23 +02:00
SpiritCroc
a1e6e50ad4 Raise sync timing log level 
Change-Id: I6b7d98675c2a5d03510d357ea147d46d35f5a903
 2022-06-05 12:46:35 +02:00
SpiritCroc
c54e623675 Fix loading threads with "open at unread" enabled 
Open at unread isn't supported for threads (we do not have separate
read markers for threads as far as I'm aware), so if we try to open at
the recent read, it won't work.

Change-Id: I39eef8d7ce11558f5db190b02a5f601556d24d2f
 2022-06-05 12:41:53 +02:00
SpiritCroc
fe581fbb14 Automatic SchildiChat string correction 
Change-Id: I5614e302cf4ecff378e90423e09ece6b3aea4115
 2022-06-01 15:28:27 +02:00
SpiritCroc
7d11e65d5c Automatic upstream merge postprocessing 
Change-Id: I4c4223cf78f61cc610afc2f0d2e0b8f2b15108cf
 2022-06-01 15:28:26 +02:00
SpiritCroc
ce4f200d83 Automatic color correction 
Change-Id: I37004d734f0c25e0e6eb6b417d7d687352dfe73f
 2022-06-01 15:28:26 +02:00
SpiritCroc
49663a1154 Merge tag 'v1.4.18' into sc 
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	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/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.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/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-06-01 13:54:34 +02:00
SpiritCroc
fab9a100a1 [TMP] Automatic upstream merge preparation 
Change-Id: I00f10005575cf818d47ea47798ff8af4f4891c06
 2022-06-01 12:20:10 +02:00
SpiritCroc
9446afe0ef Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I6b50d340b0cf82f8d6f85e032b404a79a7e8c236
 2022-06-01 12:20:10 +02:00
Benoit Marty
ba5828711b Merge branch 'release/1.4.18' into main 2022-05-31 17:56:43 +02:00
Benoit Marty
bd970505f1 Fastlane 2022-05-31 17:56:19 +02:00
Benoit Marty
6f7f61f33f Towncrier 2022-05-31 17:55:26 +02:00
Benoit Marty
19fa2f273d Rename folder to please the PlayStore. 2022-05-31 16:47:59 +02:00
Benoit Marty
8e5c96adf5
Merge pull request #6205 from vector-im/johannes/fatal 
Use fatalError instead of NPE
 2022-05-31 16:37:49 +02:00
Benoit Marty
fd5c30c8a9 Fix formatting issue. 2022-05-31 16:36:59 +02:00
Benoit Marty
5b985dc032
Merge pull request #5827 from mikonse/fix-notification-space-switch 
do not switch away from home space on notification
 2022-05-31 16:34:47 +02:00
Johannes Marbach
637b3bb5ba Fix tests 2022-05-31 16:16:54 +02:00