Commit graph

17791 commits

Author SHA1 Message Date
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
Maxime NATUREL
de185b94f3
Merge pull request #6199 from vector-im/feature/mna/6198-remove-background-location-permission
Remove background location permission
2022-05-31 15:58:57 +02:00
Benoit Marty
df23fd10bc
Remove unused import 2022-05-31 14:42:09 +02:00
Maxime NATUREL
2ca96a770d Declaring tools namespace prefix to fix strange build error 2022-05-31 14:24:09 +02:00
Benoit Marty
9cf9e10e5c
Merge pull request #6202 from vector-im/feature/bma/cleanup_string
Remove unused strings.
2022-05-31 14:19:13 +02:00
Adam Brown
b88ddbc854
Merge pull request #6201 from vector-im/feature/adm/build-health-false-positives
Build health false positives
2022-05-31 13:15:25 +01:00
Maxime NATUREL
4f3b4a71ce Ignore unused strings to be deleted 2022-05-31 13:46:14 +02:00
Johannes Marbach
4fc6cb1de3 Use fatalError instead of NPE
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-05-31 13:42:31 +02:00
Adam Brown
3f670045b3 ordering alphabetically and leaving a trailing comma 2022-05-31 11:20:14 +01:00
Benoit Marty
9d60aff8a2 Remove unused strings. 2022-05-31 12:11:16 +02:00
Adam Brown
2ce64b8f87 excluding the emoji dependencies from the unused check, their resources are used 2022-05-31 10:46:50 +01:00
Benoit Marty
3cc1951587
Merge pull request #6196 from vector-im/feature/bma/lao
Make Lao language available in the in app setting.
2022-05-31 11:42:07 +02:00
Benoit Marty
d6b68a33c9
Merge pull request #6194 from vector-im/bma/translators_note
Add note to translators.
2022-05-31 11:40:52 +02:00
Benoit Marty
aa753e4845
Merge pull request #6197 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-05-31 11:38:41 +02:00
Maxime NATUREL
233fe21f26 Remove runtime permission request 2022-05-31 11:04:48 +02:00