Commit graph

21448 commits

Author SHA1 Message Date
SpiritCroc
d6f5aabc46 [TMP] Automatic upstream merge preparation
Change-Id: Id09c56f5fe0b4b9c72ab069f654d5084e83f7660
2022-11-03 09:20:33 +01:00
SpiritCroc
35ffbd2c88 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I000ef490de8964a7b17ddfa70ff5fde8ee7e8ba9
2022-11-03 09:20:32 +01:00
SpiritCroc
6a3d000be5 Fix frowning face emoji-only message detection
Change-Id: I9f1d41406feef32d5b83f73ef5759800981ccfbd
2022-11-02 09:10:41 +01:00
SpiritCroc
6c5e72a695 Fix space discovery search icon
Change-Id: I5cbcabd7dfeeabb728af03c2b7e7bcf2b34032f6
2022-11-02 08:37:34 +01:00
Jorge Martín
0cb9fdd3a2 Fix share actions from outside the app
Change-Id: I2671d6b9b096c487c22f4032a9152e60c260b4c4
2022-10-29 18:11:02 +02:00
SpiritCroc
84ba75ccec Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: I125e1538dc9e94c409a214ffa0534392508dfd8c
2022-10-29 11:13:07 +02:00
SpiritCroc
cf92927a03 Fix some neutral grey icons
Change-Id: Ib90cb3d72503889fc1a5945974fd2ba7b3eb8f73
2022-10-28 18:29:51 +02:00
SpiritCroc
da5dcd18b0 Move voice message setting out of labs
Having no voice message button is actually more thoroughly tested than
the default setting... so let's put it to the other related settings

Change-Id: I82fda959dd8d0798a59d0444cd0cecdcda6b8cd3
2022-10-28 18:24:14 +02:00
SpiritCroc
9269a4442c Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc
Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-10-28 18:16:15 +02:00
SpiritCroc
50959b90bd Automatic SchildiChat string correction
Change-Id: Ia647b8ed077b7ba459412339e7b9298cf24ee5c6
2022-10-28 18:03:00 +02:00
SpiritCroc
a2d5204646 Automatic upstream merge postprocessing
Change-Id: I639d840a38e9994921c4b537d4f3c6325603710d
2022-10-28 18:02:59 +02:00
SpiritCroc
759da1fd09 Merge tag 'v1.5.4' into merge-v1.5.4
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.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/send/LocalEchoEventFactory.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/SpaceStateHandler.kt
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	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/MessageComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/drawable/ic_voice_mic.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-10-28 18:02:53 +02:00
SpiritCroc
22f5408a1c Always allow collapsing sections to fix cases where state doesn't restore
Change-Id: Ib609de02b48b84a08e0643281a918793074ccc9d
2022-10-27 17:15:27 +02:00
autoteelar
821047ceda Translated using Weblate (Japanese)
Currently translated at 0.6% (1 of 156 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ja/
2022-10-27 11:11:03 +02:00
Weblate
43adc6f220 Added translation using Weblate (Japanese) 2022-10-26 10:50:56 +02:00
Linerly
6e96bfe088 Translated using Weblate (Indonesian)
Currently translated at 100.0% (156 of 156 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-10-23 10:28:03 +02:00
waclaw66
32dd95e1b0 Translated using Weblate (Czech)
Currently translated at 100.0% (156 of 156 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-10-23 10:28:03 +02:00
SpiritCroc
ca65de5eb5 Add SC settings migration and simplified mode prompt also to new home
Change-Id: Ib36c4504f1cb0b62c1d67c4f43682fa52d0bc289
2022-10-23 10:19:35 +02:00
SpiritCroc
a77772a20e Simplified mode prompt: show "Complete" first
People seem to select easy and wonder how to discover spaces... maybe
this helps for those who don't read...?

Change-Id: I56d104e2e4f052654bb461f6166b56ac039b755f
2022-10-23 10:14:57 +02:00
SpiritCroc
00e02789e7 Hide "Explore rooms" in simplified mode also in new layout
Change-Id: Ica471fbf23b106c2fbe761257c04250131f4d7ee
2022-10-23 10:11:03 +02:00
SpiritCroc
5d147d9665 Move bottom space bar bellow DM/group tab navigation
Change-Id: I2dbb2e22ab8166f9e1025dd831da1c7ea25e3bf1
2022-10-23 10:05:32 +02:00
SpiritCroc
d880bdb798 Add some extra UTD logging
Change-Id: Ie694b2317cb457d314b7cec36bf07a377c2af2d2
2022-10-22 10:59:33 +02:00
SpiritCroc
3ce5b3b10b Fix rendering replies after fixing pills
Change-Id: I5f29a1e64ab681337b08cc8a21ba9b735e10b41e
2022-10-21 16:28:55 +02:00
SpiritCroc
3d39699542 Fix following the system locale
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/157

Change-Id: Idcf4bb84e5a0ec5bcd3d73c81447e13f3fd0e9e3
2022-10-21 09:39:22 +02:00
SpiritCroc
23a96329d6 Fix rendering pills when markdown nests some spans inside
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/156

Also improves the fix for https://github.com/SchildiChat/SchildiChat-android/issues/148,
since pills are rendered again and the content is discarded, as per
https://spec.matrix.org/v1.3/client-server-api/#user-and-room-mentions :
"Clients should display mentions differently from other elements"

Change-Id: I9d05fba4110737aacdd9939480b6f78d23bd4298
2022-10-21 09:36:19 +02:00
SpiritCroc
746c68c269 [TMP] Automatic upstream merge preparation
Change-Id: I79d0b50ea5600459ae715e0bb20af9e80baf110d
2022-10-19 18:30:26 +02:00
SpiritCroc
b73ef3a002 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Id256ba8eba06cf5e2916c0e17d07f2e9e1523d20
2022-10-19 18:30:26 +02:00
SpiritCroc
b531fb523c Increment version
Change-Id: Ie3e63a0e8cc2affa4a1a957173e6f8d115214720
2022-10-19 18:18:51 +02:00
Marek Ľach
d74247f279 Translated using Weblate (Slovak)
Currently translated at 34.1% (53 of 155 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sk/
2022-10-19 18:15:18 +02:00
SpiritCroc
af95abe15e Fix some space back navigation crashes
Change-Id: I6d6058547688503a99fa7308a42e25652b00c01f
2022-10-19 18:11:36 +02:00
Benoit Marty
db35f5c7f2 Merge branch 'release/1.5.4' into main 2022-10-19 17:15:48 +02:00
Benoit Marty
86f7099127 fastlane 2022-10-19 17:15:35 +02:00
Benoit Marty
6b2ae76b48 Update recipe. 2022-10-19 17:14:07 +02:00
Benoit Marty
e2a6a19429 Rewrite the Changelog 2022-10-19 17:12:29 +02:00
Benoit Marty
21c30c488c Towncrier 2022-10-19 17:07:11 +02:00
Benoit Marty
767be72eec
Merge pull request #7404 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-10-19 13:26:19 +02:00
Weblate
0f1e218fa7 Merge branch 'origin/develop' into Weblate. 2022-10-19 10:28:10 +00:00
Benoit Marty
7ca1c4f084
Merge pull request #7401 from vector-im/dependabot/gradle/flipper-0.171.1
Bump flipper from 0.171.0 to 0.171.1
2022-10-19 12:27:47 +02:00
Weblate
ac4c98e688 Merge branch 'origin/develop' into Weblate. 2022-10-19 10:27:18 +00:00
Yaron Shahrabani
4b63f1db82 Translated using Weblate (Hebrew)
Currently translated at 84.7% (2121 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
2022-10-19 10:27:15 +00:00
Jeff Huang
b6a33d1b7a Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-10-19 10:27:15 +00:00
phardyle
098aaf9d5c Translated using Weblate (Chinese (Simplified))
Currently translated at 94.7% (2371 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2022-10-19 10:27:13 +00:00
Ihor Hordiichuk
c2600dc535 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-10-19 10:27:12 +00:00
Jozef Gaal
5869c273bc Translated using Weblate (Slovak)
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-10-19 10:27:10 +00:00
Nui Harime
27b07e8b5c Translated using Weblate (Russian)
Currently translated at 95.7% (2396 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-10-19 10:27:08 +00:00
lvre
225627fbfc Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-10-19 10:27:07 +00:00
Suguru Hirahara
19164c2352 Translated using Weblate (Japanese)
Currently translated at 89.2% (2233 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2022-10-19 10:27:05 +00:00
random
c12b21fb8c Translated using Weblate (Italian)
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2022-10-19 10:26:59 +00:00
Linerly
f1f70c939f Translated using Weblate (Indonesian)
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-10-19 10:26:57 +00:00
Szimszon
ee655a3840 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2503 of 2503 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2022-10-19 10:26:55 +00:00