filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-07 23:58:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,007 Commits 7 Branches 126 Tags
Commit Graph

3704 Commits

Author SHA1 Message Date
Benoit Marty
160c1b49a1 It work on on Android 10, to check on Android 5 2020-09-22 14:58:47 +02:00
Benoit Marty
5b1737ae46 It work on on Android 10, to check on Android 5 2020-09-22 14:58:47 +02:00
Benoit Marty
fee7701d26 Better management of requested permissions (#2048) 2020-09-22 14:58:47 +02:00
Benoit Marty
1e5122f741 Rename ids 2020-09-22 14:58:25 +02:00
Weblate
d6ba653c21 Merge branch 'origin/develop' into Weblate. 2020-09-22 12:55:48 +00:00
LinAGKar
51b1d1fa87 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sv/
 2020-09-22 12:55:38 +00:00
Marcelo Filho
4249d9d906 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.7% (1848 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-09-22 12:55:38 +00:00
Kahina Messaoudi
a7e33e9c0a Translated using Weblate (Kabyle) 
Currently translated at 99.8% (1868 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-22 12:55:38 +00:00
@a2sc:matrix.org
7a2e70ee2d Translated using Weblate (German) 
Currently translated at 99.9% (1870 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-09-22 12:55:37 +00:00
Priit Jõerüüt
416c153d2e Translated using Weblate (Estonian) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-09-22 12:55:37 +00:00
SpiritCroc
7bdc4c30ec Increment version 
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
 2020-09-22 10:22:29 +02:00
SpiritCroc
2fa4518600 Revert "Revert "Setting for unread badge / room summary event visibility"" 
This reverts commit 1ff602db3bd6906651f45267e63e97e0a7f0fa76.

Change-Id: I161a6dcbbee2b2dc517912f6fb1f6b2ec772df0b

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
 2020-09-22 10:05:36 +02:00
SpiritCroc
5ab3e45f10 Revert "Revert "Fix sorting rooms when filtering out events from overview"" 
This reverts commit 80c2490336ee1d6151bd2e7a52b5267bc419f47b.
 2020-09-22 09:56:11 +02:00
SpiritCroc
4ef447d739 Revert "RoomSummaryController: Remove deprecated usage of ScSdkPreferences" 
This reverts commit 777f349f8262e235ee8f6650838b5478cf399166.
 2020-09-22 09:56:04 +02:00
Benoit Marty
48b10e6d08
Merge pull request #2139 from enzingerm/callbuttons 
Visually disable call buttons/prohibit calling on insufficient permissions
 2020-09-21 21:24:36 +02:00
Marinus Enzinger
84df86df37 Visually disable call buttons/prohibit calling on insufficient permissions 
Signed-off-by: Marinus Enzinger <marinus@enzingerm.de>
 2020-09-21 20:20:06 +02:00
Benoit Marty
d1fed08764 Rename tryThis to tryOrNull 2020-09-21 18:26:35 +02:00
Benoit Marty
bca24c0198 Safe call to awaitCallback 2020-09-21 17:51:35 +02:00
LinAGKar
bdaecc5b2e Translated using Weblate (Swedish) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sv/
 2020-09-21 05:43:08 +00:00
notramo
fa9ff86ab2 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/hu/
 2020-09-21 05:43:07 +00:00
Nikita Epifanov
f8e3e33e49 Translated using Weblate (Russian) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-09-18 16:43:06 +00:00
Priit Jõerüüt
73778f8669 Translated using Weblate (Estonian) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-09-18 16:43:05 +00:00
zeritti
cd5a146f1a Translated using Weblate (Czech) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/cs/
 2020-09-18 16:43:05 +00:00
Jeff Huang
3c45b84474 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1872 of 1872 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hant/
 2020-09-18 16:43:04 +00:00
Benoit Marty
4b66ffcd5b Add "show password" in import Megolm keys dialog 2020-09-18 15:00:36 +02:00
Benoit Marty
0e85a3d59f Add an advanced action to reset an account data entry (there is no API to completely delete it) 2020-09-18 12:49:14 +02:00
SpiritCroc
7364aeec93 Remove duplicated value after merge 
Change-Id: Ic66a449e30725f3818c9cde5b7de98828f0cef18
 2020-09-17 12:42:51 +02:00
SpiritCroc
777f349f82 RoomSummaryController: Remove deprecated usage of ScSdkPreferences 
Change-Id: I3ef6148e6162b2836c335234df17fb26c9978e5f
 2020-09-17 12:27:31 +02:00
SpiritCroc
80c2490336 Revert "Fix sorting rooms when filtering out events from overview" 
This reverts commit 4d3229a3212c60efd07b509eeda77a7554711037.
 2020-09-17 12:21:58 +02:00
SpiritCroc
e6cf19fe94 Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""" 
This reverts commit 66ed064d27c73c433f67c95f58c072de24d833d7.

Change-Id: Ib8e7a4e947830c7690b35e9d9de90808f485a4ab

Conflicts:
	vector/src/main/res/values-de/strings.xml
 2020-09-17 12:07:10 +02:00
SpiritCroc
d0c7393ae1 Automatic SchildiChat string correction 
Change-Id: Id39c2bee7ff975fbe6f260ce53df2ae897644958
 2020-09-17 12:03:29 +02:00
SpiritCroc
2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
SpiritCroc
6d55aa22f0 Revert "Automatic SchildiChat string correction" 
This reverts commit 2e16cc79976e03c6d90e43d95b05d9cec868ed02.
 2020-09-17 11:57:41 +02:00
SpiritCroc
66ed064d27 Revert "Revert "Revert "Resolve required manual intervention in german strings""" 
This reverts commit 7da51068bc3d2d19b405095b57f8bff05c79c2b3.
 2020-09-17 11:57:41 +02:00
SpiritCroc
9663d8046c Revert "Overview: display the year instead of the weekday for old chats" 
This reverts commit 5e4d9c18be0630680d16b8fe1caf7da047a2c067.
 2020-09-17 11:57:33 +02:00
SpiritCroc
1ff602db3b Revert "Setting for unread badge / room summary event visibility" 
This reverts commit b1d96ebba9e82721de0e393c58f352684667ae46.

Change-Id: I567628cbf4bbdc059d3c73991bf3053f702730af

Conflicts:
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values/strings_sc.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-09-17 11:51:44 +02:00
Benoit Marty
216138394f Version++ 2020-09-17 09:32:35 +02:00
Benoit Marty
a77069297d Remove R.string.copy, use R.string.action_copy (Fix clash with androidx.preferences private resource) 2020-09-16 19:51:43 +02:00
Benoit Marty
36899af36b Strings has been replaced by a plurals 2020-09-16 19:41:24 +02:00
Benoit Marty
bfa4e00fe7 Hyphen can be replaced with dash 2020-09-16 19:38:08 +02:00
Benoit Marty
4c6bb93eaf ellipsis 2020-09-16 19:36:26 +02:00
Benoit Marty
7e62e8e2cd Fix typo 2020-09-16 19:35:39 +02:00
Benoit Marty
762fd02eb7 Format strings.xml 2020-09-16 19:35:27 +02:00
Benoit Marty
825592e443
Merge pull request #2118 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-09-16 19:28:17 +02:00
Benoit Marty
4c6234796d
Merge pull request #2111 from vector-im/feature/bma_raw_service 
Raw service
 2020-09-16 17:55:42 +02:00
Weblate
d6dd2a02b5 Merge branch 'origin/develop' into Weblate. 2020-09-16 15:55:23 +00:00
Benoit Marty
1614707943 Ganfra's review 2020-09-16 16:58:27 +02:00
Benoit Marty
82bf0dcae9 Create a RawService SDK side, to avoid that the SDK manage client needs 2020-09-16 16:17:10 +02:00
ganfra
0ada12e646 Merge branch 'develop' into feature/event_type_filtering 2020-09-16 15:49:16 +02:00
ganfra
a7ae66e0de Clean files and update CHANGES 2020-09-16 15:48:09 +02:00