filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,234 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

25234 Commits

Author SHA1 Message Date
SpiritCroc befb402dbe Merge remote-tracking branch 'cintek/pin_messages' into sc 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/202

@SpiritCroc edit:
- change some merge-unfriendly things, e.g.
    - indention
    - strings_sc.xml
    - don't touch what shouldn't be touched
- add icon license to third party
- add FEATURES.md entry

Conflicts:
	library/ui-strings/src/main/res/values/strings.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt

Change-Id: I490e42d50276edce3e7b099a11dba90d040d0dc0
 2023-08-02 19:41:24 +02:00
SpiritCroc 16ccd7817f Add non-free warning to integration manager 
https://github.com/SchildiChat/SchildiChat-android/issues/130#issuecomment-1657198941

Change-Id: I0f5af145697f14b2e6e83095993fdb158b41b3d8
 2023-07-30 19:50:57 +02:00
SpiritCroc fa48365aaa Fix fdroid changelog generation 
May still be broken for split ABI, but at least works again for
universal apk now

Change-Id: Ib04b56effc23cb05645040f8981d6b0e23188495
 2023-07-26 15:14:19 +02:00
SpiritCroc 97eafeadcc Automatic SchildiChat string correction 
Change-Id: I49a3df97e9023dbc145322029851e52cff0c9e31
 2023-07-26 11:02:08 +02:00
SpiritCroc e3d862e68d Automatic upstream merge postprocessing 
Change-Id: I18116f0ab1e1503cffcccd3ecb1acef694470a92
 2023-07-26 11:02:06 +02:00
SpiritCroc 6b5bfde91e Merge tag 'v1.6.5' into sc 
tag

Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
 2023-07-26 11:01:57 +02:00
SpiritCroc e54a8029b1 [TMP] Automatic upstream merge preparation 
Change-Id: Iff21d6b13a6482dfdce0714f59946604dfd1762c
 2023-07-26 11:01:44 +02:00
SpiritCroc 43464da8a8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I5f4fd024e61a31b616d93b88838d7fb29b4dbaf4
 2023-07-26 11:01:43 +02:00
Benoit Marty fd6a45a3ae Merge branch 'release/1.6.5' into main 2023-07-25 14:56:37 +02:00
Benoit Marty f8138a7860 Adding fastlane file for version 1.6.5 2023-07-25 14:56:31 +02:00
Benoit Marty 0dea54388c Changelog for version 1.6.5 2023-07-25 14:56:03 +02:00
Benoit Marty 9776839b50
Merge pull request #8589 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-07-25 09:59:16 +02:00
Edgars Andersons f48ed3679b Translated using Weblate (Latvian) 
Currently translated at 83.7% (2207 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-25 02:31:19 +00:00
Edgars Andersons d9a27b1514 Translated using Weblate (Latvian) 
Currently translated at 83.0% (2189 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-24 08:38:07 +00:00
Edgars Andersons 9d19ca6ec2 Translated using Weblate (Latvian) 
Currently translated at 82.7% (2180 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-22 11:22:15 +00:00
Weblate 657822891a Merge branch 'origin/develop' into Weblate. 2023-07-22 02:35:31 +00:00
raspin0 c86b4f9e9f Translated using Weblate (Polish) 
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/pl/
 2023-07-22 02:35:28 +00:00
Edgars Andersons 3fe71357dd Translated using Weblate (Latvian) 
Currently translated at 82.3% (2170 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-21 17:52:37 +00:00
Benoit Marty 14d691446a
Merge pull request #8583 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-07-21 17:52:19 +02:00
SpiritCroc 61205787a8 Fix banned users alignment in room settings 
Use new "labs" icon from Element, that we have changed back to the old
one for settings - but since it's a bit too big (even upstream),
fix width/height in addition.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/200

Change-Id: I9195df80a5dadb9e70799ed3dc49f5702335ac49
 2023-07-21 15:31:55 +02:00
SpiritCroc 92e9d9e747 Enable split ABI support 
https://github.com/SchildiChat/SchildiChat-android/issues/183

Change-Id: Ia8eff01c973d365d6d4a4390153f23510ab77e0e
 2023-07-21 15:10:01 +02:00
SpiritCroc 5f37ffd330 fastlane: build rust crypto 
Change-Id: I596ab7a32b1df247294c9907b5f8a8059942f1b4
 2023-07-21 12:27:58 +02:00
SpiritCroc 2fe66ed458 Disable build caching 
This sometimes messes my gradle cache really badly, as in:
- Clean builds will finish within 1 minute
- Any code changes I do will be ignored
- There's no real indicator whether this just happened, apart from clean
  builds being unreasonably fast

Change-Id: I4559368d3c12f2700827022a5266a451bd97dc6b
 2023-07-21 12:27:58 +02:00
Jonathan Soares d16ac5c9ea Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 67.2% (119 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/pt_BR/
 2023-07-19 13:57:49 +00:00
Edgars Andersons 86a126b257 Translated using Weblate (Latvian) 
Currently translated at 80.1% (2113 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-19 13:13:54 +00:00
Srebrni 69b8e125e0 Translated using Weblate (Slovenian) 
Currently translated at 2.6% (70 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 23:14:52 +00:00
Weblate 832b4680d2 Merge branch 'origin/develop' into Weblate. 2023-07-18 20:14:53 +00:00
Srebrni b3e8a64ad5 Translated using Weblate (Slovenian) 
Currently translated at 2.3% (63 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 20:14:50 +00:00
Poesty Li 37f62671f6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.1% (2613 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2023-07-18 20:14:49 +00:00
Srebrni 0c7fdae63a Translated using Weblate (Slovenian) 
Currently translated at 2.3% (63 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 20:14:35 +00:00
th ad 2ec4d1c98a Translated using Weblate (Slovenian) 
Currently translated at 2.3% (63 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 20:14:35 +00:00
th ad 9ce1034a5c Translated using Weblate (Slovenian) 
Currently translated at 2.3% (62 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 20:13:21 +00:00
Srebrni 2af1516ebd Translated using Weblate (Slovenian) 
Currently translated at 2.3% (62 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2023-07-18 20:13:06 +00:00
Edgars Andersons 2a158996e6 Translated using Weblate (Latvian) 
Currently translated at 75.6% (1995 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-18 20:01:58 +00:00
SpiritCroc 22b5d7d6bd Increment version 
Change-Id: I37bb4499dba5aae301cd6f34a6241de6e0328184
 2023-07-18 09:28:48 +02:00
Benoit Marty 180a2eec60
Merge pull request #8578 from vector-im/feature/bma/crashFixes 
Crash fixes
 2023-07-17 16:12:24 +02:00
Benoit Marty 13596594a4
Merge pull request #8579 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-07-17 11:05:53 +02:00
Jozef Gaal 12a7506b57 Translated using Weblate (Slovak) 
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/sk/
 2023-07-17 05:25:50 +00:00
Edgars Andersons 23f0f6ada3 Translated using Weblate (Latvian) 
Currently translated at 75.1% (1982 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-15 09:15:15 +00:00
SpiritCroc 526fe77b6a Merge remote-tracking branch 'origin/sc' into sc 
Change-Id: I4ca62196d38a7a3837e8b3f44edbeb4c95b8123f
 2023-07-14 19:07:33 +02:00
Edgars a07613485e Translated using Weblate (Latvian) 
Currently translated at 100.0% (177 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/lv/
 2023-07-14 16:28:02 +00:00
DarkCoder15 4249216b3c Translated using Weblate (Russian) 
Currently translated at 100.0% (177 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ru/
 2023-07-14 16:27:37 +00:00
Edgars Andersons 6ac5254ff3 Translated using Weblate (Latvian) 
Currently translated at 73.1% (1929 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-14 06:58:43 +00:00
Edgars Andersons d98ba3c08e Translated using Weblate (Latvian) 
Currently translated at 72.3% (1908 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-14 06:13:43 +00:00
walito-arch 70744b2dad Translated using Weblate (Swahili) 
Currently translated at 1.4% (38 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sw/
 2023-07-14 00:15:56 +00:00
Nui Harime e76063126b Translated using Weblate (Russian) 
Currently translated at 99.8% (2633 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2023-07-14 00:15:55 +00:00
Edgars Andersons 66f6cfcc6c Translated using Weblate (Latvian) 
Currently translated at 71.6% (1888 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2023-07-14 00:15:54 +00:00
Benoit Marty ae52d4cd3c Fix crash in the setting when enabling/disabling integration manager and there is no network. 2023-07-11 18:10:54 +02:00
Benoit Marty 8433e222ad Fix unhandled crashes when network is not reacheable. 2023-07-11 18:10:38 +02:00
Benoit Marty 2a5df54ae4 Fix crash: show an error message with a Retry button when there is no network when displaying the BootstrapBottomSheet. 2023-07-11 18:09:00 +02:00