mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 14:38:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
7769 commits 7 branches 121 tags 229 MiB
Commit graph

2881 commits

Author SHA1 Message Date
SpiritCroc
04f4e13230 Merge tag 'v1.0.17' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
 2021-02-10 11:05:22 +01:00
SpiritCroc
2c22f1e926 Treat manually unread chats as notifications in bottom tabs 
Change-Id: I34cea91674843d8d60285295b449d2722cb061e9
 2021-02-09 17:48:00 +01:00
Benoit Marty
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
Benoit Marty
eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms 
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
 2021-02-08 15:44:43 +01:00
Benoit Marty
d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes 2021-02-08 14:32:55 +01:00
Benoit Marty
f2619df13d Import and cleanup 2021-02-08 14:25:33 +01:00
Benoit Marty
30be440774 Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction 2021-02-08 12:37:38 +01:00
Benoit Marty
8363eba32e Better test of a reply 2021-02-08 10:12:01 +01:00
Benoit Marty
b0e5d5d3e5 Copyright 2021-02-07 20:21:31 +01:00
Benoit Marty
07220d7a59 URL preview on reply fallback (#2756) 2021-02-07 15:28:07 +01:00
Benoit Marty
6ee6b0cad9 Ensure no invisible displayName will be used 2021-02-07 12:00:33 +01:00
Benoit Marty
d47ba6bd11 Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference) 2021-02-06 16:52:46 +01:00
Benoit Marty
d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness 2021-02-06 11:19:15 +01:00
Benoit Marty
41e4e823fb HTML unescaping for URL preview (#2766) 2021-02-05 20:40:57 +01:00
Benoit Marty
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation 
Join room other federation via alias error
 2021-02-05 18:48:23 +01:00
Benoit Marty
6ecd63bf5d Fix a new bug 2021-02-05 13:25:58 +01:00
Benoit Marty
afd2ecd384 Remove duplicated method 2021-02-05 12:10:25 +01:00
Benoit Marty
557a5c715a Widget URL: properly encode parameters 2021-02-05 11:47:35 +01:00
Benoit Marty
b068dc39eb Update doc 2021-02-05 11:36:12 +01:00
Benoit Marty
5b3065730e Widget: avoid empty user display name 2021-02-05 09:36:29 +01:00
Benoit Marty
dd0be54b05 Fix lint issue and typo 2021-02-04 20:19:02 +01:00
Benoit Marty
0c613e36f1 Fix lint issue 2021-02-04 18:10:57 +01:00
Valere
6d5f89b65b Fixes #2778 2021-02-04 18:06:35 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
Weblate
63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty
9b13381938
Merge pull request #2762 from vector-im/feature/bma/track 
Improvements
 2021-02-03 17:02:25 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth 
Feature/bca/sso reauth
 2021-02-03 16:12:54 +01:00
Benoit Marty
ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere
e976100f1a Fix test compilation error 2021-02-03 14:48:43 +01:00
Valere
289a3ab21f remove dev id for now 2021-02-03 14:36:38 +01:00
Weblate
cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Slobodan Simić
db6fdcd098 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-03 08:53:28 +00:00
Benoit Marty
424035f56f Better clearing of RealmLists 2021-02-03 09:46:35 +01:00
Valere
697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere
0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
Benoit Marty
3b65761110 Delete on cascade 2021-02-02 21:23:57 +01:00
Benoit Marty
cfdfd3a8af internal 2021-02-02 21:22:54 +01:00
Benoit Marty
a820443c56 Fix copyright 2021-02-02 13:05:39 +01:00
Valere
2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Slobodan Simić
883a22ba83 Translated using Weblate (Serbian) 
Currently translated at 89.5% (197 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-02 11:21:10 +00:00
sr093906
3e87534ddc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 86.3% (190 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
 2021-02-02 11:21:09 +00:00
Benoit Marty
e6fc605b08 Data for Worker overload (#2721) 2021-02-02 11:40:52 +01:00
Valere
8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
Valere
76b425ee8a Cleaning 2021-02-01 16:39:14 +01:00
Valere
5b8215a356 Support SSO provider brand + UI fixes 2021-02-01 16:39:14 +01:00
Valere
9c7df25862 Relax rule for e2e by default 2021-02-01 16:39:14 +01:00
Valere
da16ec0af3 UIA fixes + better error support 2021-02-01 16:39:14 +01:00
Valere
1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
Onuray Sahin
06be3e691d Support $matrix_widget_id parameter. 2021-02-01 18:13:26 +03:00
Slobodan Simić
323a0a5aeb Translated using Weblate (Serbian) 
Currently translated at 45.9% (101 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-01 02:35:53 +00:00