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

22754 Commits

Author SHA1 Message Date
SpiritCroc dadeadcad4 Merge tag 'v1.5.18' into sc 
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
 2023-01-02 17:57:49 +01:00
SpiritCroc f9b8e07de4 [TMP] Automatic upstream merge preparation 
Change-Id: Ie66dfe9d287ccd955fce5ee56cd5f5f0b039da06
 2023-01-02 17:57:16 +01:00
SpiritCroc 0c3772f31e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ibcf17b45b7b91e5f83f86aec0be8af37b46b30d5
 2023-01-02 17:57:16 +01:00
Benoit Marty 2cc864a63e Merge branch 'release/1.5.18' into main 2023-01-02 13:38:03 +01:00
Benoit Marty 46225a6268 Merge branch 'release/1.5.18' into main 2023-01-02 13:35:09 +01:00
Benoit Marty 547940cadd Adding fastlane file for version 1.5.18 2023-01-02 13:35:04 +01:00
Benoit Marty 2c6115e090 Changelog for version 1.5.18 2023-01-02 13:34:36 +01:00
Benoit Marty 4249a1237b
Merge pull request #7848 from vector-im/sync-emojis 
Sync Emojis
 2023-01-02 12:15:18 +01:00
Benoit Marty e0c2dc0b2f
Merge pull request #7871 from vector-im/feature/bca/fix_7870 
fix 7870
 2023-01-02 11:42:08 +01:00
Benoit Marty b6258cf02f
Fix typo in changelog. 2023-01-02 09:51:57 +01:00
MohammadSaleh Kamyab 43b6b182fd Translated using Weblate (Persian) 
Currently translated at 91.4% (150 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/fa/
 2023-01-02 08:36:49 +00:00
Linerly 5decbc518c Translated using Weblate (Indonesian) 
Currently translated at 100.0% (164 of 164 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
 2023-01-02 08:36:48 +00:00
bmarty f79c4f3ad1 Sync Emojis 2023-01-02 00:03:13 +00:00
valere a345c6c8e5 fix 7870 2022-12-31 13:21:07 +01:00
SpiritCroc 740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc 
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
 2022-12-31 08:24:15 +01:00
SpiritCroc 141b46dfc3 Fix clicking on bridge contact opening bridge bot in encrypted chats 
Change-Id: I8749244f393639740885c7086a18cd127274baa7
 2022-12-30 18:24:25 +01:00
SpiritCroc 98fcd0db7b Automatic SchildiChat string correction 
Change-Id: I96beb67c89fed74e0384d1503ae55bfd46a1871a
 2022-12-30 17:58:12 +01:00
SpiritCroc 5d875c693e Automatic upstream merge postprocessing 
Change-Id: I73487fb01d776c536741ae928a721fb7a6d191d5
 2022-12-30 17:58:11 +01:00
SpiritCroc 25dddf7566 Merge tag 'v1.5.16' into sc 
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2022-12-30 17:58:06 +01:00
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
valere ea2c41b818 version++ 2022-12-29 18:24:33 +01:00
Valere 133fff1a8d Merge branch 'release/1.5.16' into main 2022-12-29 18:19:37 +01:00
Valere 6ccdde8394 Merge branch 'release/1.5.16' into develop 2022-12-29 18:19:36 +01:00
valere 0c9e318ae3 Adding fastlane file for version 1.5.16 2022-12-29 18:18:19 +01:00
valere 50d24a812b Changelog for version 1.5.16 2022-12-29 18:06:59 +01:00
Valere ebd0f8a5db
Merge pull request #7856 from vector-im/feature/bca/fix_ui_tests 
FIx UI Tests
 2022-12-29 14:27:34 +01:00
valere 53b1bec5db try fix lint 2022-12-29 10:51:57 +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
valere 6f5d8d6ece FIx UI Tests 2022-12-28 18:09:28 +01:00
Valere d75d7a3695
Merge pull request #7843 from vector-im/bugfix/nfe/sync_filter_fix 
sync filter params moved to matrix config
 2022-12-28 11:04:40 +01:00
valere 25f4f2175a Fix failing tests 2022-12-28 10:19:25 +01:00
valere 558317260b Add migration to clean db from SyncFilterParamsEntity 2022-12-27 15:40:49 +01: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
NIkita Fedrunov 91b4dc1f97 tests are fixed 2022-12-23 13:51:19 +01:00
NIkita Fedrunov bfa2844a0b changelog filename changed 2022-12-23 13:13:19 +01:00
NIkita Fedrunov d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
Onuray Sahin 9dec346cdc
Merge pull request #7836 from vector-im/feature/ons/increase_dm_test_coverage 
Increase session manager test coverage
 2022-12-23 14:36:26 +03:00
Onuray Sahin 2ddc3b6d05 Fix indentation. 2022-12-23 13:40:08 +03:00
Onuray Sahin 2085f7f17d Merge branch 'develop' into feature/ons/increase_dm_test_coverage 2022-12-23 13:38:28 +03:00