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

7232 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
4651bd9e4d Automatic upstream merge postprocessing 
Change-Id: I94adeba9d95496efd5e0e9bfb94ba0174bbf5933
 2020-09-17 12:03:28 +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
dfe1a31d35 [TMP] Automatic upstream merge preparation 
Change-Id: Id475a6e7689a8bce4193be08d256c58cc0663622
 2020-09-17 11:57:41 +02:00
SpiritCroc
6d55aa22f0 Revert "Automatic SchildiChat string correction" 
This reverts commit 2e16cc7997.
 2020-09-17 11:57:41 +02:00
SpiritCroc
66ed064d27 Revert "Revert "Revert "Resolve required manual intervention in german strings""" 
This reverts commit 7da51068bc.
 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 5e4d9c18be.
 2020-09-17 11:57:33 +02:00
SpiritCroc
f217ece630 Revert "Exclude state-events from room summaries and unread indicators" 
This reverts commit 72d2b1c9f1.

Change-Id: I412f846cd82d953fa25d761ca5804b5a216e2dff
 2020-09-17 11:53:56 +02:00
SpiritCroc
1ff602db3b Revert "Setting for unread badge / room summary event visibility" 
This reverts commit b1d96ebba9.

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
SpiritCroc
9a61361e3e Revert "Hide redactions from the overview except for "show all events" setting" 
This reverts commit 2995375586.
 2020-09-17 11:47:43 +02:00
Benoit Marty
216138394f Version++ 2020-09-17 09:32:35 +02:00
Benoit Marty
d0d4a19033 Merge branch 'release/1.0.7' 2020-09-17 09:31:36 +02:00
Benoit Marty
719189bd90 Merge branch 'release/1.0.7' into develop 2020-09-17 09:31:35 +02:00
Benoit Marty
01af5115a2 Prepare release 1.0.7 2020-09-17 09:31:09 +02:00
Benoit Marty
7761376306
Merge pull request #2120 from vector-im/feature/post_weblate 
Feature/post weblate
 2020-09-16 22:28:49 +02:00
Benoit Marty
43f34f6330 Fix issue on test compilation 2020-09-16 20:40:05 +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
b97aed0723 Ganfra's review 2020-09-16 17:00:14 +02:00
Benoit Marty
1614707943 Ganfra's review 2020-09-16 16:58:27 +02:00
Benoit Marty
88b806326e
Merge pull request #2117 from vector-im/feature/event_type_filtering 
Feature/event type filtering
 2020-09-16 16:28:45 +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
ganfra
a1f98eb6bf Allow to filter all room member state events in timeline 2020-09-16 15:36:48 +02:00
Benoit Marty
f882986f7d Remove unused member 2020-09-16 13:43:45 +02:00
linsui
9b8bcc4464 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2020-09-16 03:43:01 +00:00
linsui
487a90fba5 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-09-16 03:43:00 +00:00
ganfra
abb9a0839a Room summary : change displayable events types 2020-09-15 18:13:09 +02:00
Benoit Marty
7a01be9c0d
Merge pull request #2109 from vector-im/feature/fragment_transaction 
Feature/fragment transaction
 2020-09-15 17:44:54 +02:00
Benoit Marty
23aaa58834
Merge pull request #2101 from vector-im/feature/clean_call 
Feature/clean call
 2020-09-15 17:43:49 +02:00
ganfra
0077091175 Update CHANGES and clean files 2020-09-15 12:56:37 +02:00
ganfra
624a8ff04c Fragment transaction: allow state loss when needed 2020-09-15 12:36:27 +02:00
Benoit Marty
94a7db26f5
Merge pull request #2104 from ginnyTheCat/develop 
Only front camera is mirrored now
 2020-09-15 12:33:00 +02:00
Benoit Marty
58edc83e11
Merge branch 'develop' into develop 2020-09-15 12:32:31 +02:00
Valere
653d6c6050
Merge pull request #2108 from vector-im/feature/fix_cannnot_play_video 
output stream not closed
 2020-09-15 10:33:56 +02:00
Valere
5e39d3c6fb output stream not closed 2020-09-15 10:03:49 +02:00
discapacidad5
ebde029cce Translated using Weblate (Spanish) 
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/es/
 2020-09-14 23:43:30 +00:00
discapacidad5
dd4391941e Translated using Weblate (Spanish) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/es/
 2020-09-14 23:43:30 +00:00
discapacidad5
6e1fc4d84e Translated using Weblate (Spanish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
 2020-09-14 23:43:29 +00:00
AnonymousWebHacker
86603ed1a6 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
 2020-09-14 23:43:12 +00:00
ziriSut
a246993df3 Translated using Weblate (Kabyle) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-14 23:43:11 +00:00
random
2e88275766 Translated using Weblate (Italian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/it/
 2020-09-14 23:43:09 +00:00
zeritti
eb2166dd4c Translated using Weblate (Czech) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/cs/
 2020-09-14 23:43:08 +00:00