filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,346 Commits 7 Branches 127 Tags
Commit Graph

6346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valere
2908a5d345 Added first ui bootstrap test 2020-09-30 10:13:59 +02:00
Benoit Marty
d225fb7df0 Update Changelog 2020-09-30 10:08:26 +02:00
Onuray Sahin
5d18a7cc82 Lint fixes. 2020-09-30 10:07:20 +02:00
Onuray Sahin
07976988d9 Use RoomSummary to check if the room is direct. 2020-09-30 10:07:20 +02:00
Onuray Sahin
2a96b2c68e Differentiate wordings for the room profile screen. 2020-09-30 10:07:20 +02:00
Onuray Sahin
3a9e6fa97f Changelog added. 2020-09-30 10:07:20 +02:00
Onuray Sahin
24fcb3f58f Differentiate wordings for direct rooms. 2020-09-30 10:07:20 +02:00
Benoit Marty
5beaa93437
Merge pull request #2162 from gradle-update/develop 
Add workflow for Update Gradle Wrapper Action.
 2020-09-30 09:49:00 +02:00
Benoit Marty
415fb3a432
Merge pull request #2186 from vector-im/feature/bma_intent 
Finish what has been started on #1376: use Intent.ACTION_GET_CONTENT …
 2020-09-30 09:48:10 +02:00
Valere
1e3bdd6a2e Fix test 2020-09-29 18:00:15 +02:00
Cristian Greco
68907ff6c0 Merge remote-tracking branch 'upstream/develop' into develop 2020-09-29 17:40:55 +02:00
Valere
9f26d015ba Update change log 
Fixes #2052
 2020-09-29 17:07:56 +02:00
Valere
c20517599e Add option to reset 4S if lost pass/key 2020-09-29 17:05:29 +02:00
Benoit Marty
0bb75eed1f Finish what has been started on #1376: use Intent.ACTION_GET_CONTENT instead of Intent.ACTION_OPEN_DOCUMENT for other pickers 2020-09-29 16:41:55 +02:00
Benoit Marty
2b90f1395f
Merge pull request #1376 from dkanada/patch-1 
Fix gallery intent for certain apps
 2020-09-29 16:29:21 +02:00
Benoit Marty
51f225056c
Merge branch 'develop' into patch-1 2020-09-29 16:28:58 +02:00
Benoit Marty
7a494db40b
Merge pull request #2167 from vector-im/feature/ui_test 
Feature/ui test
 2020-09-29 16:13:54 +02:00
Benoit Marty
487bbe42a9
Merge branch 'develop' into feature/ui_test 2020-09-29 16:13:44 +02:00
Benoit Marty
ab74f6c1a8
Merge pull request #2165 from vector-im/feature/timeline_scroll_opti 
Feature/timeline scroll opti
 2020-09-29 16:11:57 +02:00
Benoit Marty
2def7f3910 PR Review 2020-09-29 16:10:54 +02:00
ganfra
11a4704161 Clean files and update CHANGES 2020-09-29 15:42:48 +02:00
ganfra
8bc0afa75e Timeline: add glide preloading 2020-09-29 15:42:21 +02:00
ganfra
3f5b1083f3 Timeline: add a prefetch backward item 2020-09-29 15:42:21 +02:00
Benoit Marty
435724ffa9
Merge pull request #2182 from vector-im/feature/bma_hs_diag 
Create a script to help getting public information form any homeserver
 2020-09-29 15:39:15 +02:00
Benoit Marty
b14d22550b PR Review 
Cleanup and Add command line to run the UI tests
 2020-09-29 15:12:25 +02:00
Valere
f79784bc8c Stabilisation 
Hide keyboard before entering text
 2020-09-29 12:51:27 +02:00
Valere
6ac401db9b Doc + change log 2020-09-29 12:51:27 +02:00
Valere
bc2c345e21 First automated UI tests 2020-09-29 12:51:27 +02:00
Benoit Marty
577f0e0d9a Create a script to help getting public information form any homeserver 2020-09-29 11:38:19 +02:00
Benoit Marty
a3570a69dd
Merge pull request #2181 from vector-im/feature/bma_pin_fix 
PIN code: request PIN code if phone has been locked
 2020-09-29 10:03:02 +02:00
John
6a67c0fd0d Translated using Weblate (Greek) 
Currently translated at 15.0% (282 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/el/
 2020-09-28 21:05:03 +00:00
OLIVIER Thomas
7bf510880f Translated using Weblate (French) 
Currently translated at 92.0% (1725 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/fr/
 2020-09-28 21:05:02 +00:00
Benoit Marty
77f06b962d PIN code: request PIN code if phone has been locked 2020-09-28 16:57:36 +02:00
Benoit Marty
d0ec5a13f3
Merge pull request #2166 from vector-im/feature/bma_splash_quick_fix 
Fix Splash screen layout, especially on small screens
 2020-09-28 13:52:03 +02:00
SpiritCroc
1cc4c7177f Increment version 
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
sc_v1.0.8.sc.21 sc_pre_v1.0.8.sc.21 		2020-09-27 14:11:52 +02:00
SpiritCroc
f9fc7abbd2 Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""""" 
This reverts commit ddeb73b20c99d12d6e17b3c84882405a229522d8.
 2020-09-27 13:57:56 +02:00
SpiritCroc
797e5a0490 Automatic SchildiChat string correction 
Change-Id: I034c30676887f41331fa1c7bf9c1d42f83684e9d
 2020-09-27 13:57:56 +02:00
SpiritCroc
7731d5eaaf Automatic upstream merge postprocessing 
Change-Id: I2bc98a8df74965a1b0662de1fd6c68109f4559cc
 2020-09-27 13:57:54 +02:00
SpiritCroc
97be4a5812 merge_helpers: add upstream_log 
Change-Id: I368d2728ac6ba2538fd2fbcf61c5546e938dc641
 2020-09-27 13:57:46 +02:00
SpiritCroc
43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
 2020-09-27 13:55:40 +02:00
Nikita Epifanov
d6d9ece045 Translated using Weblate (Russian) 
Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-09-27 09:05:00 +00:00
zeritti
c14bf80b40 Translated using Weblate (Czech) 
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/cs/
 2020-09-27 09:05:00 +00:00
zeritti
667ea844f2 Translated using Weblate (Czech) 
Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/cs/
 2020-09-27 09:04:58 +00:00
linsui
ae84a0bbe9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-09-27 09:04:58 +00:00
SpiritCroc
17ff2d76a9 [TMP] Automatic upstream merge preparation 
Change-Id: Ib66bf65ae9bfed527bec21f438456ef57b5d45d1
 2020-09-27 10:41:07 +02:00
SpiritCroc
a7198d6e1a Revert "Automatic SchildiChat string correction" 
This reverts commit d0c7393ae1967c65049d250bf8bc759d82444f12.
 2020-09-27 10:41:06 +02:00
SpiritCroc
ddeb73b20c Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""" 
This reverts commit e6cf19fe9476e9b336b2d59beccb147d0e1ac1ee.
 2020-09-27 10:41:06 +02:00
Benoit Marty
1ed0ef0948 Disable animation on title 2020-09-26 12:02:22 +02:00
Benoit Marty
21f1848499 Fix Splash screen layout, especially on small screens 2020-09-26 11:30:13 +02:00
SpiritCroc
17801fdf54 Multiple stickers in a row don't require showInformation each time 
Change-Id: I0364d46ba00f29291a4527e7ad3a98d1275ea829
 2020-09-25 15:22:45 +02:00