mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 17:35:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
19780 commits 6 branches 120 tags 229 MiB
Commit graph

19780 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
bcf7e069f1 [TMP] Automatic upstream merge preparation 
Change-Id: Icbdfae25a816938d002a288ab96e2d2f9d410026
 2022-09-10 09:31:51 +02:00
SpiritCroc
c6c106399a Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I69b561bc7fd50532d7a39387c79794ba2a4b5fdb
 2022-09-10 09:31:51 +02:00
SpiritCroc
484c418687 Merge remote-tracking branch 'weblate/sc' into merge-v1.4.36 
Change-Id: I83544f38202d2b546be390166a86297ddabe12b1
 2022-09-10 09:31:25 +02:00
SpiritCroc
f57dd91035 merge_helpers.sh: depend less on upstream tags 
Change-Id: Ic79931eba7d501e4f76e5dd069921f9f3486f86c
 2022-09-07 19:46:33 +02:00
Linerly
ce199ac77e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (153 of 153 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2022-09-07 02:10:45 +02:00
waclaw66
dd69e8a179 Translated using Weblate (Czech) 
Currently translated at 100.0% (153 of 153 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-08-31 07:04:53 +02:00
SpiritCroc
6076df81ed Increment version 
Change-Id: I1ee9cd971db7e929c6828c5fc20a8e700cb70bda
 2022-08-29 13:11:33 +02:00
SpiritCroc
16ca0951ca Move viewpager debugging visual feedback to own pref 
Visual feedback probably not needed for the remaining viewpager issues.

Change-Id: I9931c37b9d0c79ba9fd2f27782d0c0eaa5dfd318
 2022-08-24 10:22:57 +02:00
SpiritCroc
a3786cde1b Automatic SchildiChat string correction 
Change-Id: I18c187e75dbc237429a64c4a685098472a9afb9c
 2022-08-24 10:14:39 +02:00
SpiritCroc
84e56ef043 Automatic upstream merge postprocessing 
Change-Id: Ia74f735f2a81e1ff7f26cfa3c557fd23c9668017
 2022-08-24 10:14:38 +02:00
SpiritCroc
e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.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/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
SpiritCroc
569365c0d8 [TMP] Automatic upstream merge preparation 
Change-Id: I9cdd7da590aded7c7500f4df87d84781033211bb
 2022-08-24 09:35:36 +02:00
SpiritCroc
1e4c6993db Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ib51951e6254af4a3a6cb30af918effae5b4974fc
 2022-08-24 09:35:36 +02:00
Benoit Marty
ba6f7c4288 Merge branch 'release/v1.4.34' into main 2022-08-23 17:00:11 +02:00
Benoit Marty
6c2885ff39 Granfra's review 2022-08-23 16:36:39 +02:00
Benoit Marty
adcb3c594a fastlane 2022-08-23 16:09:36 +02:00
Benoit Marty
34fef8d197 reorder changelog 2022-08-23 16:08:52 +02:00
Benoit Marty
033557dba4 Towncrier 2022-08-23 16:07:57 +02:00
Benoit Marty
58954ed590 Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. 
See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975
 2022-08-23 15:36:17 +02:00
Benoit Marty
203a262c66 Add a step in the recipe 2022-08-23 15:21:44 +02:00
Benoit Marty
7883a6c617 Rename gl to gl-ES to be PlayStore compatible, and unignore this language. 2022-08-23 15:16:12 +02:00
Benoit Marty
1c8fccad30
Merge pull request #6908 from vector-im/feature/bma/fix_crash 
Fix crash when signing out.
 2022-08-23 15:07:55 +02:00
Benoit Marty
94e755552c
Merge pull request #6888 from vector-im/feature/adm/change-server-on-error 
FTUE - Allow changing server on onboarding start error
 2022-08-23 15:05:51 +02:00
Benoit Marty
074a9e0da6
Merge pull request #6916 from vector-im/feature/bma/weblate_sync_1_4_34 
Feature/bma/weblate sync 1 4 34
 2022-08-23 15:03:47 +02:00
Benoit Marty
9e0340bbea Remove unused strings 2022-08-23 12:13:47 +02:00
Benoit Marty
caf3308ea7 Fix lint issue 2022-08-23 11:24:54 +02:00
Benoit Marty
577cc58fab
Merge pull request #6915 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-08-23 11:24:06 +02:00
Weblate
3a44c7ce93 Merge branch 'origin/develop' into Weblate. 2022-08-23 08:12:46 +00:00
Metehan Özyürek
692f04496b Translated using Weblate (Turkish) 
Currently translated at 66.2% (1544 of 2330 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2022-08-23 08:12:37 +00:00
Eric Decanini
2830664dbb
Merge pull request #6868 from vector-im/feature/eric/space-settings 
Space Switching: Adds Toolbar Click To Open Space Settings
 2022-08-23 09:59:09 +02:00
Adam Brown
8336d4c269 adding changelog entry 2022-08-22 17:24:11 +01:00
Adam Brown
d7bc43584d adding tests around forwarding to the edit server selection when the initial server selection fails 2022-08-22 17:24:11 +01:00
Adam Brown
b50b6daca1 using wider range network error when deciding to forward to the edit server instead of just unknown host 
- will also capture timeouts
 2022-08-22 17:24:11 +01:00
Adam Brown
4cc0b81c86 removing deeplink error handling as its now covered by the edit server flow instead 2022-08-22 17:24:11 +01:00
Adam Brown
cdf75be0ec redirecting to the edit server screen when attempting to select the initial homeserver choice and it fails 2022-08-22 17:24:10 +01:00
Adam Brown
0be46adfda
Merge pull request #6862 from vector-im/feature/adm/ftue-fragment-crashes 
FTUE - Crash fixes
 2022-08-22 17:21:31 +01:00
Adam Brown
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications 
Missing notifications due to stuck background workers
 2022-08-22 17:20:04 +01:00
Benoit Marty
32bfaf8868 Fix crash when signing out. 
At this point, we do not want the sync to start, the DB is already deleted.
 2022-08-22 16:16:27 +02:00
Adam Brown
9b57630eae
Merge pull request #6873 from vector-im/feature/adm/allow-trusting-certificates 
FTUE - Fix trusting certificates during edit server flow
 2022-08-22 11:47:50 +01:00
Adam Brown
7211c9c08e
Merge pull request #6890 from vector-im/feature/adm/missing-notifications-on-login 
Missing push notifications on login
 2022-08-22 11:14:28 +01:00
Benoit Marty
e86058b299
Merge pull request #6884 from vector-im/feature/bma/sync_thread_investigation 
Ensure sync thread is started
 2022-08-22 12:09:54 +02:00
Benoit Marty
b90fa1a9ca
Merge pull request #6881 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.54 
Bump libphonenumber from 8.12.53 to 8.12.54
 2022-08-22 10:07:52 +02:00
Adam Brown
d405a66443
Merge pull request #6834 from vector-im/feature/adm/ftue-empty-identity-providers 
Allow empty SSO `identity_providers`
 2022-08-22 08:44:31 +01:00
dependabot[bot]
8a2894f038
Bump libphonenumber from 8.12.53 to 8.12.54 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.53 to 8.12.54.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.53...v8.12.54)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 05:58:19 +00:00
Glandos
4bc5426609 Translated using Weblate (French) 
Currently translated at 100.0% (73 of 73 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2022-08-21 08:32:39 +00:00
phardyle
64156ada60 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2330 of 2330 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-08-21 08:32:37 +00:00
Nui Harime
bb0c1af703 Translated using Weblate (Russian) 
Currently translated at 99.0% (2309 of 2330 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-08-21 08:32:37 +00:00
Glandos
d5dd1fb166 Translated using Weblate (French) 
Currently translated at 100.0% (2330 of 2330 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-08-21 08:32:36 +00:00
SpiritCroc
2a8ef64861 Increment version 
Change-Id: Ie0b38fea9008e75bc92184e0c1a58c31aab4db7e
 2022-08-20 09:55:23 +02:00
Adam Brown
06c77e4b5e adding changelog entry 2022-08-19 17:14:20 +01:00