Commit graph

22635 commits

Author SHA1 Message Date
SpiritCroc
57c03de1c8 [TMP] Automatic upstream merge preparation
Change-Id: Ic28194df6bace036123bd1c0263e24fc7397b360
2022-12-30 14:49:39 +01:00
SpiritCroc
1af57047af Automatic revert to unchanged upstream strings, pt.1
Change-Id: I6c8aabaef5954f30bbcaab55379490e7cad5ed8a
2022-12-30 14:49:39 +01:00
MohammadSaleh Kamyab
f27047e237 Translated using Weblate (Persian)
Currently translated at 88.4% (145 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/fa/
2022-12-29 08:54:39 +00:00
SpiritCroc
1e0824f877 Translated using Weblate (German)
Currently translated at 93.2% (153 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
2022-12-27 13:23:07 +00:00
mskf1383
27d1e3bbfc Translated using Weblate (Persian)
Currently translated at 69.5% (114 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fa/
2022-12-27 08:40:26 +01:00
mskf1383
e22fbff628 Translated using Weblate (Persian)
Currently translated at 68.2% (112 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fa/
2022-12-27 08:40:26 +01:00
Farooq Karimi Zadeh
a12efb2bd0 Translated using Weblate (Persian)
Currently translated at 68.2% (112 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fa/
2022-12-27 08:40:26 +01:00
Linerly
409e7d3c62 Translated using Weblate (Indonesian)
Currently translated at 100.0% (164 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-12-27 08:40:26 +01:00
waclaw66
64b6d39d5a Translated using Weblate (Czech)
Currently translated at 100.0% (164 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-12-27 08:40:25 +01:00
waclaw66
0355ef4b92 Translated using Weblate (Czech)
Currently translated at 100.0% (164 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-12-27 08:40:25 +01:00
Linerly
11eb8b6bfe Translated using Weblate (Indonesian)
Currently translated at 100.0% (164 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-12-27 08:40:25 +01:00
waclaw66
48814325bd Translated using Weblate (Czech)
Currently translated at 100.0% (161 of 161 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-12-27 08:40:25 +01:00
joshua
e0930ef800 Translated using Weblate (Swedish)
Currently translated at 100.0% (159 of 159 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
2022-12-27 08:40:25 +01:00
SpiritCroc
50a4983449 FEATURES.md: Add missed emote sending
Change-Id: I59891a20fc5d25b3cb11409bc1b06027c372f549
2022-12-27 08:39:36 +01:00
SpiritCroc
1a438756f4 Add stale automation github action
Change-Id: Ifcc3ca64e10e9e8d4b5f1bc91e1500d0bd9eb4c7
2022-12-23 10:11:54 +01:00
SpiritCroc
82eabe0fb6 Tweak init sync / clear cache settings entry
Change-Id: I51d9f701169b67e3e09bbd7d028b5fd8037653a7
2022-12-21 10:00:29 +01:00
SpiritCroc
ab4baa90eb Automatic SchildiChat string correction
Change-Id: I9e804666651039cdc2409941a3cfb4add82a469f
2022-12-21 09:57:45 +01:00
SpiritCroc
313f58b4d9 Automatic upstream merge postprocessing
Change-Id: I139ba61a42d03104c3f6336d8f7d7f15fdfa5c6f
2022-12-21 09:57:44 +01:00
SpiritCroc
e054828370 Merge tag 'v1.5.14' into sc
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
SpiritCroc
d7aaa427b3 [TMP] Automatic upstream merge preparation
Change-Id: I6ac304e6140c97719e89cf9a735fe35471893be8
2022-12-21 09:57:29 +01:00
SpiritCroc
6b5605ed9d Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ib698bd421876c16dac9ad34991c3d5f62b053301
2022-12-21 09:57:28 +01:00
Benoit Marty
4a46289fda Merge branch 'hotfix/1.5.14' into main 2022-12-20 16:44:25 +01:00
Benoit Marty
576ea2df55 Prepare hotfix 1.5.14 2022-12-20 16:44:11 +01:00
Benoit Marty
95a29b83fe ActiveSessionHolder is not supposed to start syncing. Instead, the MainActivity does it, if necessary.
Fixes a race condition when clearing cache.
2022-12-20 13:12:54 +01:00
SpiritCroc
9388e59e77 Automatic SchildiChat string correction
Change-Id: Id12588065a7aeb0f2815526e0be6b9fb18b6d4f1
2022-12-19 18:04:48 +01:00
SpiritCroc
7561d641f8 Automatic upstream merge postprocessing
Change-Id: Icc931c6d5d6fdd12d582251a3da0db56058aa405
2022-12-19 18:04:47 +01:00
SpiritCroc
f5dcf25a6d Merge tag 'v1.5.13' into sc
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
2022-12-19 18:04:43 +01:00
SpiritCroc
a7b1d97f6c [TMP] Automatic upstream merge preparation
Change-Id: Ib26fc0ac04d219544ce5a729e86f708818291a33
2022-12-19 18:04:33 +01:00
SpiritCroc
4772ff1f1c Automatic revert to unchanged upstream strings, pt.1
Change-Id: Iaaa78b61475b63cd57454c054d8b58bacbee5851
2022-12-19 18:04:33 +01:00
Benoit Marty
789746c276 Merge branch 'hotfix/1.5.13' into main 2022-12-19 16:58:28 +01:00
Benoit Marty
241d011d30 Changelog (same than 1.5.13) 2022-12-19 16:56:29 +01:00
Benoit Marty
ed01f32393 Add largeHeap=true in the manifest since we are seeing more crashes (OOM) when handling sync response. 2022-12-19 16:54:15 +01:00
Benoit Marty
ffa49870a9 Version 1.5.13 2022-12-19 16:52:32 +01:00
SpiritCroc
dd83c16e46 Disable useless thread fallback to reply fallback calculation
Don't ask me why Element did that much effort for those, instead of just
doing rich replies...

Change-Id: I90146a34b7a29896f550fcde50f821af629d7edb
2022-12-17 15:18:03 +01:00
SpiritCroc
1c335194cf Still show threads as replies when threads are disabled
Change-Id: Id08fd8be12bb7bfc589d21989ae96f9457961d15
2022-12-17 15:17:43 +01:00
SpiritCroc
7a83a44077 Fix threaded message rendering rich reply when they shouldn't
Change-Id: I5a1c1d177d896d203f2420bdd1536dfcbbd460d6
2022-12-17 11:34:52 +01:00
SpiritCroc
aa9e0bc627 Add read receipt debugging
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
2022-12-17 11:34:39 +01:00
SpiritCroc
ed3049f04e Update Schildi help link
Change-Id: I56c195734c453b08bbec018b8bbbb8e14af08f75
2022-12-16 22:31:14 +01:00
SpiritCroc
1eacd0cca3 Make it harder to not find "initial sync" option in settings
Change-Id: Iff49485ebe036a14bf03e274791275d5ff27d864
2022-12-16 13:00:13 +01:00
SpiritCroc
987ca6dec4 Revert "stop listening timeline collection changes when app is not resumed (#7734)"
This makes the chat view get destroyed onPause, leading to
jump-to-bottom when clicking links, opening threads etc.

This reverts commit cf59c80100.

Change-Id: I56ae7027d0488013251bc88edd0e47a19dead315
2022-12-16 12:59:47 +01:00
SpiritCroc
05fc840b3b [merge] Fix gplay build
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
2022-12-15 11:45:48 +01:00
SpiritCroc
f6801a5be0 Revert "[TMP] merge_helpers.sh: Hardcode develop branch"
This reverts commit d13494aa67.
2022-12-15 11:02:24 +01:00
SpiritCroc
6fc5f6d378 Automatic SchildiChat string correction
Change-Id: I81f8f9f911bc69dad440d782c3afc3349995704d
2022-12-15 11:02:21 +01:00
SpiritCroc
b9d18a94fc Automatic upstream merge postprocessing
Change-Id: I2512edeb09524f862eff2c0f287556d99e85aae8
2022-12-15 11:02:20 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	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/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
SpiritCroc
5d30146a4b [TMP] Automatic upstream merge preparation
Change-Id: If24c33d54a205bcd5721ad620725e9c2bf7ca7b3
2022-12-15 10:39:04 +01:00
SpiritCroc
243af7358f Automatic revert to unchanged upstream strings, pt.1
Change-Id: I03f5d0d1693253d23b9cd25b57228a288ca83a99
2022-12-15 10:39:04 +01:00
SpiritCroc
d13494aa67 [TMP] merge_helpers.sh: Hardcode develop branch
Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
2022-12-15 10:38:32 +01:00
Benoit Marty
7341e5c47b Merge branch 'release/1.5.12' into main 2022-12-15 10:18:25 +01:00
Benoit Marty
cf1a115c67 Merge branch 'release/1.5.12' into main 2022-12-15 10:16:25 +01:00