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

2956 commits

Author SHA1 Message Date
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
Benoit Marty
1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection 2021-02-19 14:43:01 +01:00
Benoit Marty
e8026c6d3f
Naming convention 2021-02-19 13:53:38 +01:00
Benoit Marty
544c1e4a6a Also fix the problem of cleanup too early (or done several times in case of bad password) for DefaultFinalizeAddingThreePidTask 2021-02-18 19:23:31 +01:00
Benoit Marty
2271ddacf8 Remove unused task and API 2021-02-18 19:05:42 +01:00
Benoit Marty
9443b80811 Fix test: ensure the session is open 2021-02-18 18:46:23 +01:00
Benoit Marty
5afdc81ce0 Moar cleanup 2021-02-18 18:43:48 +01:00
Benoit Marty
2df9b43abc Make the code a bit easier to understand (no change) 2021-02-18 18:42:55 +01:00
Benoit Marty
73e93e7d3d Doc and method signature 2021-02-18 17:56:05 +01:00
Benoit Marty
c76ced68e0 Make the code a bit easier to understand (no other change) 2021-02-18 17:47:11 +01:00
Benoit Marty
dea76fd81b Fix test compilation 2021-02-18 15:36:51 +01:00
Benoit Marty
51fd45d317 typo and doc 2021-02-17 18:18:36 +01:00
Benoit Marty
0e322630f1 Ignore url override from credential if it is not valid (#2822) 2021-02-17 18:18:36 +01:00
Benoit Marty
d19cedef88 Less code 2021-02-17 18:18:36 +01:00
Benoit Marty
6aa5dc992d Migrate AuthenticationService API to coroutines (#2449) 2021-02-17 18:18:36 +01:00
Benoit Marty
373586c23e Cleanup 2021-02-17 10:25:06 +01:00
ganfra
776ebce497 Merge branch 'develop' into feature/fga/fix_some_voip_issues 2021-02-16 16:06:12 +01:00
ganfra
79acf1cc42 Fix copyright 2021-02-16 15:57:23 +01:00
Benoit Marty
b3a408a34c
Merge pull request #2805 from vector-im/feature/bca/devtools 
Dev tools initial commit
 2021-02-16 09:46:49 +01:00
ganfra
3170d4428c VoIP: extract the PSTNProtocoltChecker to the SDK 2021-02-15 19:34:37 +01:00
Benoit Marty
cf0b4d2581 Merge branch 'develop' into feature/bca/devtools 2021-02-15 16:00:32 +01:00
Benoit Marty
59634753b3 Code review 2021-02-15 15:03:58 +01:00
Slobodan Simić
adea3ab775 Translated using Weblate (Serbian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-15 12:08:01 +00:00
random
96b46af9f5 Translated using Weblate (Italian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
 2021-02-15 12:07:58 +00:00
Priit Jõerüüt
b3a9e20885 Translated using Weblate (Estonian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
 2021-02-15 12:07:57 +00:00
@a2sc:matrix.org
1f92e61d3c Translated using Weblate (German) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2021-02-15 12:07:57 +00:00
Auri B. P
a41b4a3621 Translated using Weblate (Catalan) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
 2021-02-15 12:07:57 +00:00
zer0-x
60041d433e Translated using Weblate (Arabic) 
Currently translated at 55.7% (126 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
 2021-02-15 12:07:57 +00:00
Weblate
2ac1287924 Merge branch 'origin/develop' into Weblate. 2021-02-12 10:30:37 +00:00
Andrejs
6203c393d7 Translated using Weblate (Latvian) 
Currently translated at 88.1% (194 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lv/
 2021-02-12 10:30:25 +00:00
Benoit Marty
1978a180ff Compute WidgetUrl "onDemand" to properly handle the theme value 2021-02-10 16:10:32 +01:00
Benoit Marty
463f2a7ad7 Widget: resolve the avatar URL 2021-02-10 13:41:01 +01:00
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
Valere
e5da026f1f Dev tools initial commit 2021-02-10 10:17:19 +01:00
ganfra
370b9dabff VoIP: made some minor changes after review 2021-02-09 19:42:05 +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
2cbce016bc Add missing case in a (not used) fun 2021-02-09 12:59:23 +01:00
Benoit Marty
f78c72db59 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 11:52:18 +01:00
ganfra
5c4cf3f7c9 VoIP: PR review remarks 2021-02-08 18:43:50 +01:00
Benoit Marty
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
ganfra
0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +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
XoseM
e9e3c0d011 Translated using Weblate (Galician) 
Currently translated at 44.5% (98 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-08 07:33:39 +00: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