filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,009 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

6009 Commits

Author SHA1 Message Date
Benoit Marty 9ab053d702
Merge pull request #2145 from vector-im/feature/login_ui 
Login ui
 2020-09-23 17:00:28 +02:00
Benoit Marty 6e2c733319 Fix lint issue (MissingConstraints). Use a simple FrameLayout 2020-09-23 16:59:42 +02:00
Benoit Marty ad2191a76e Fix scrolling issue. 
Sign in and log in tested ok
 2020-09-23 16:59:42 +02:00
Benoit Marty ecc189aeac Restore logo on login screens 
This reverts commit 4cc3e87d64.
 2020-09-23 16:59:23 +02:00
Benoit Marty 34d2c3d391
Merge pull request #2152 from vector-im/feature/various_fixes 
Redcude requested permission to access file on the phone
 2020-09-23 16:57:20 +02:00
Benoit Marty 1699a57850
Merge branch 'develop' into feature/various_fixes 2020-09-23 16:56:13 +02:00
Benoit Marty ea9b99b38b
Merge pull request #2146 from vector-im/feature/outdated_warning 
Allow using an outdated homeserver, at user's risk (#1972)
 2020-09-23 16:25:23 +02:00
Benoit Marty 8edecf5937 Allow using an outdated homeserver, at user's risk (#1972) 
Just warn the user using a non blocking popup
 2020-09-23 16:25:01 +02:00
Benoit Marty cede7b1dc1
Merge pull request #2155 from vector-im/feature/bma_show_timestamp 
Add a setting to show timestamp for all messages (#2123)
 2020-09-23 16:21:44 +02:00
Benoit Marty 1464f5aa02
Merge branch 'develop' into feature/bma_show_timestamp 2020-09-23 16:21:36 +02:00
Benoit Marty 5ab7ec0bc8
Merge pull request #2154 from vector-im/feature/bma_user_color_cache 
Use cache for user color
 2020-09-23 16:20:37 +02:00
Benoit Marty 7f85331448 Add a setting to show timestamp for all messages (#2123) 2020-09-22 18:40:37 +02:00
Benoit Marty 7c063972ac Use cache for user color 2020-09-22 17:05:25 +02:00
Benoit Marty bd72c0ca8d
Merge pull request #2153 from vector-im/feature/wl 
Feature/wl
 2020-09-22 16:04:08 +02:00
Benoit Marty 91fe308113 Import SAS strings 2020-09-22 15:39:56 +02:00
Benoit Marty 78a76a8038 Remove `↵` from string resource 2020-09-22 15:38:37 +02:00
Benoit Marty 759974d9a8 Format resource 2020-09-22 15:33:58 +02:00
Benoit Marty 00a3e802fc
Merge pull request #2151 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-09-22 15:29:43 +02:00
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
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