mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 19:38:53 +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
Benoit Marty
23d911cc2c
Merge pull request #2135 from vector-im/feature/safe_workers 
Create parent class for all MatrixWorker
 2020-09-22 14:35:15 +02:00
Benoit Marty
d868ef0168 Create parent class for all MatrixWorker 2020-09-22 12:06:01 +02:00
SpiritCroc
7bdc4c30ec Increment version 
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
 2020-09-22 10:22:29 +02:00
SpiritCroc
cc2d95f0dd increment_version.sh: Tag pre-release 
Change-Id: I2c1c34f54c2b259235c70a6ff18d77374365a431
 2020-09-22 10:21:24 +02:00
SpiritCroc
4ed7529179 Hide redactions by default again 
Change-Id: I7b50a2c9aadb55f19f9b7fe49fa6cc3ac169231f
 2020-09-22 10:12:36 +02:00
SpiritCroc
2fa4518600 Revert "Revert "Setting for unread badge / room summary event visibility"" 
This reverts commit 1ff602db3b.

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 80c2490336.
 2020-09-22 09:56:11 +02:00
SpiritCroc
4ef447d739 Revert "RoomSummaryController: Remove deprecated usage of ScSdkPreferences" 
This reverts commit 777f349f82.
 2020-09-22 09:56:04 +02:00
SpiritCroc
9425640277 Revert "Avoid db upgrade: add back deprecated fields concerning unread kind" 
This reverts commit 2812dc0a3e.
 2020-09-22 09:55:52 +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
Benoit Marty
4d9bd57336 Fix compilation issue after merge 2020-09-21 21:20:06 +02:00
Benoit Marty
30ab6d5ee7
Merge pull request #2147 from vector-im/feature/quick_fix 
Safe call to awaitCallback
 2020-09-21 21:18:36 +02:00
Benoit Marty
622faf5471
Merge pull request #2144 from vector-im/feature/fix_filtering_redacted 
Feature/fix filtering redacted
 2020-09-21 21:17:00 +02:00
ganfra
4d558c5f95
Merge branch 'develop' into feature/fix_filtering_redacted 2020-09-21 20:25:49 +02:00
ganfra
a29ca2ae09 Clean after Benoit's review 2020-09-21 20:25:16 +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
22e03b14d1
Merge pull request #2138 from enzingerm/widget_permission 
Fix widget creation permission check on group calls
 2020-09-21 18:32:02 +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
Marinus Enzinger
822c47d15f Fix widget creation permission check 
Signed-off-by: Marinus Enzinger <marinus@enzingerm.de>
 2020-09-21 17:35:44 +02:00
ganfra
03b3b82e0a Update CHANGES 2020-09-21 15:00:53 +02:00
ganfra
8279191339 Fix filtering of redacted events 2020-09-21 14:57:58 +02:00
Benoit Marty
6486b9e5cd
Merge pull request #2129 from vector-im/feature/fix_sending_too_long 
Feature/fix sending too long
 2020-09-21 12:09:13 +02:00
ganfra
4d7b0e3e68 Merge branch 'develop' into feature/fix_sending_too_long 2020-09-21 10:17:52 +02:00
Benoit Marty
66b0e6c68f
Merge pull request #2134 from vector-im/feature/fix_regression_verif_dm 
Fix / Verification in DM not working
 2020-09-21 09:53:26 +02:00
Benoit Marty
69a4312613
Merge branch 'develop' into feature/fix_regression_verif_dm 2020-09-21 09:52:58 +02:00
Benoit Marty
293f867988
Merge pull request #2132 from vector-im/feature/delete_account_data 
Add possibility to delete account data and fix bug
 2020-09-21 09:52:10 +02:00
LinAGKar
8d2c0dcb48 Translated using Weblate (Swedish) 
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/sv/
 2020-09-21 05:43:08 +00: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
ganfra
d4682e504c Clean after Benoit's review 2020-09-18 18:34:40 +02:00
ganfra
2717cca267 Room sending: fix again loss of number type 2020-09-18 18:33:49 +02:00
Valere
28d37f0106 Fix / Verification in DM not working 
CheckNumberType crashing on timestamp number
 2020-09-18 18:03:09 +02:00
Benoit Marty
30b51449ce Manual import of Megolm keys does back up the imported keys 2020-09-18 15:28:06 +02: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
ganfra
72f8c8ef72 Clean and update CHANGES 2020-09-18 12:25:29 +02:00
ganfra
b227dc3e5c Sending: remove events from Worker params by fetching in db instead 2020-09-17 18:37:33 +02:00
ganfra
144d0e56cc Realm transaction, use semaphore as suggested by Dominaezzz 2020-09-17 18:31:47 +02:00
Benoit Marty
d29d1ead9b Update issue templates 2020-09-17 16:58:43 +02:00
SpiritCroc
2812dc0a3e Avoid db upgrade: add back deprecated fields concerning unread kind 
Change-Id: I5fb946b58e581098f1f52c9730cc43435ff926a8
 2020-09-17 12:47:28 +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 4d3229a321.
 2020-09-17 12:21:58 +02:00
SpiritCroc
e6cf19fe94 Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""" 
This reverts commit 66ed064d27.

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