mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 03:18:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
25129 commits 7 branches 124 tags 230 MiB
Commit graph

25129 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
1aa3337cba Merge tag 'v1.6.3' into sc 
tag

Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
 2023-06-27 20:13:46 +02:00
SpiritCroc
22f30a4410 [TMP] Automatic upstream merge preparation 
Change-Id: I237b769b60f222f9abd425dda3445c49b1c1d3a9
 2023-06-27 15:19:36 +02:00
SpiritCroc
97d3c2ce77 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia1954e45223b8a4666903c1ca38f4d250d90be6b
 2023-06-27 15:19:36 +02:00
Valere
f5f4d4a326 Merge branch 'release/1.6.3' into main 2023-06-27 12:52:17 +02:00
Valere
637b1483cc Adding fastlane file for version 1.6.3 2023-06-27 12:12:06 +02:00
Valere
042f144afe Changelog for version 1.6.3 2023-06-27 12:11:42 +02:00
Valere
8cd51ea803 Setting version for the release 1.6.3 2023-06-27 10:04:39 +02:00
Benoit Marty
218799e025
Merge pull request #8560 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-06-26 20:37:33 +02:00
Weblate
0f581dc391 Merge branch 'origin/develop' into Weblate. 2023-06-26 15:17:53 +00:00
Valere
75fd62aef9
Merge pull request #8536 from vector-im/feature/bca/new_login_detection 
Fixes new device detections banner problems
 2023-06-26 16:45:11 +02:00
valere
3c1c645806 fix sdk ts is already in milliseconds 2023-06-26 11:55:04 +02:00
valere
7205cd73d4 quality 2023-06-26 11:13:08 +02:00
Weblate
ac1ee734f4 Merge branch 'origin/develop' into Weblate. 2023-06-26 09:13:05 +00:00
valere
51c4dfc675 fix changelog 2023-06-26 10:48:58 +02:00
valere
5f20ceeb1c Add change log 2023-06-26 10:48:58 +02:00
valere
3e73137c18 Fixes new device detections banner problems 2023-06-26 10:48:58 +02:00
Valere
dfadc8eca1
Merge pull request #8554 from vector-im/feature/bca/bump_rust_sdk 
Bump rust sdk version to 0.3.10
 2023-06-26 10:45:27 +02:00
waclaw66
93d3c73306 Translated using Weblate (Czech) 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-06-22 23:07:54 +00:00
valere
6ef9557698 add changelog 2023-06-22 16:57:48 +02:00
valere
08ae1105ff Bump rust sdk version to 0.3.10 2023-06-22 16:56:15 +02:00
waclaw66
de9d938012 Translated using Weblate (Czech) 
Currently translated at 100.0% (177 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-06-22 10:34:02 +00:00
Weblate
16f5d48120 Merge branch 'origin/develop' into Weblate. 2023-06-21 13:24:03 +00:00
David Langley
a065cd338c
Merge pull request #8440 from vector-im/jonny/feat/rich-text-mentions 
[Rich text editor] Add mentions and slash commands
 2023-06-21 11:26:13 +01:00
David Langley
cfae6e9e51 Remove TODO causing failed lint check. 2023-06-21 09:49:44 +01:00
David Langley
e988308dc6 Add space after mention inserstion. 2023-06-21 09:30:45 +01:00
Martin Berg Alstad
ff0873f5e8 Translated using Weblate (Norwegian Bokmål (nb)) 
Currently translated at 4.0% (4 of 100 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb/
 2023-06-20 22:18:15 +00:00
Makkkkus
3170d07f9b Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 19.0% (503 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nn/
 2023-06-20 22:18:15 +00:00
waclaw66
90e752472f Translated using Weblate (Czech) 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-06-20 18:12:56 +00:00
th ad
eeec549bd0 Translated using Weblate (Slovenian) 
Currently translated at 2.2% (60 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-06-19 16:06:24 +00:00
waclaw66
107f51da0d Translated using Weblate (Czech) 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-06-19 16:06:23 +00:00
jonnyandrew
9d239bf94d
Use proper API to insert mention from timeline user 2023-06-19 13:41:08 +01:00
th ad
3c645ef1bb Translated using Weblate (Slovenian) 
Currently translated at 2.2% (59 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-06-18 22:14:41 +00:00
th ad
f5ac1f120a Translated using Weblate (Slovenian) 
Currently translated at 2.1% (57 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-06-18 00:12:30 +00:00
Priit Jõerüüt
e8e8e7c5bc Translated using Weblate (Estonian) 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2023-06-17 08:08:22 +00:00
rofyobilte
7d4af8d059 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.5% (2597 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2023-06-17 06:16:49 +00:00
Weblate
c1887aaa9f Merge branch 'origin/develop' into Weblate. 2023-06-16 12:50:26 +00:00
random
38ba1cbbe9 Translated using Weblate (Italian) 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2023-06-16 12:50:26 +00:00
Benoit Marty
cd5737276c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.0% (2584 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2023-06-16 12:50:19 +00:00
Benoit Marty
4af2f700f7
Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy 
Fix fallbackKeySharingStrategy
 2023-06-16 13:05:30 +02:00
Yoan Pintas
710d21f6a4
Implement MSC3987: Push actions clean-up (#8530) 2023-06-16 09:13:13 +00:00
Someone
7497cf6729 Translated using Weblate (Vietnamese) 
Currently translated at 87.2% (2300 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2023-06-15 17:52:46 +00:00
Alex Baker
572bdb6dfe Fix fallbackKeySharingStrategy 
Signed-off-by: Alex Baker <alex@beeper.com>
 2023-06-14 16:29:22 -05:00
Weblate
5e60c97566 Merge branch 'origin/develop' into Weblate. 2023-06-13 12:08:05 +00:00
Valere
ce80d7ff2f
Merge pull request #8507 from vector-im/feature/bca/clean_room_shield_update 
Clean room shield update logic
 2023-06-13 12:27:28 +02:00
SpiritCroc
7e318f7d61 FEATURES.md: MSC4027-compatible 
Change-Id: I9186f5fb3c095cd09b3602d334e302f16d67212f
 2023-06-12 17:23:23 +02:00
SpiritCroc
4659b90589 Merge remote-tracking branch 'origin/sc' into sc 
Change-Id: I4ad3c5c76734a96e5a90c2044016fc419d7bbd43
 2023-06-12 17:22:17 +02:00
Weblate
b0558a300e Merge branch 'origin/develop' into Weblate. 2023-06-12 11:11:45 +00:00
random
257072330f Translated using Weblate (Italian) 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2023-06-12 11:11:40 +00:00
valere
1d651db82b Add change log 2023-06-12 11:39:55 +02:00
valere
6fe0002bd3 Clean room shield update logic 2023-06-12 11:39:55 +02:00