Commit Graph

6357 Commits

Author SHA1 Message Date
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 d0c7393ae1.
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 e6cf19fe94.
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
SpiritCroc 037a333c37 Use pseudo-bubbles for for ImageVideo items
Pseudo-bubbles: align like bubbles, but don't draw the actual bubbles.
Closes #8.

Change-Id: I8ff281858f67ed8a3ee5e4530e3ce02aa786b955
2020-09-25 15:22:38 +02:00
Benoit Marty 6958d114a9 Version++ 2020-09-25 14:09:25 +02:00
Benoit Marty 34760a00be Merge branch 'release/1.0.8' 2020-09-25 14:08:25 +02:00
Benoit Marty 1bc42959d0 Merge branch 'release/1.0.8' into develop 2020-09-25 14:08:24 +02:00
Benoit Marty 22cfb64348 Prepare release 1.0.8 2020-09-25 14:08:15 +02:00
Benoit Marty 056405939b
Merge pull request #2170 from vector-im/feature/bma_fix_wellknown_redirect
Fix crash when wellknown are malformed
2020-09-25 13:56:41 +02:00
SpiritCroc 0d7c0bc29c Increase sticker size
As proposed in https://github.com/SpiritCroc/SchildiChat-android/issues/8

Change-Id: I225515eaf7b269d82572dd1b0f745d6da6b8c3be
2020-09-25 13:37:17 +02:00
SpiritCroc 01b5a88d59 Hide sender avatar in DMs
As proposed in https://github.com/SpiritCroc/SchildiChat-android/issues/7

Change-Id: I4a76283191fa1c6a021f7fb643bfddff7551abf8
2020-09-25 13:36:54 +02:00
Benoit Marty 2dcaabe4c4 Fix crash when wellknown are malformed, or redirect to some HTML content (reported by rageshakes) 2020-09-25 11:25:27 +02:00
Benoit Marty bbd86661a4
Merge pull request #2159 from vector-im/feature/bma_pin_settings
Feature/bma pin settings
2020-09-24 17:16:05 +02:00
Benoit Marty d684c11c65 Iterate on wording 2020-09-24 15:14:08 +02:00
Benoit Marty a2fb6d5664 Split long line 2020-09-24 12:47:58 +02:00
Benoit Marty 31029e90cc Fix test compilation issue (no detected since Olm was not available) 2020-09-24 12:46:14 +02:00
Benoit Marty 2e95c78f4e Iterate on wording 2020-09-24 12:40:37 +02:00
Cristian Greco 62f620f79b Add workflow for Update Gradle Wrapper Action.
This action keeps Gradle Wrapper up-to-date to the latest release. It
will run every day at midnight (UTC) and create a pull request if a new
Gradle version is available. The updated Wrapper script is validated
(with checksum verification) during the update process, and the Wrapper
is setup so that it will validate the Gradle binary itself on first run
of the new version.

Signed-off-by: Cristian Greco <cristian@regolo.cc>
2020-09-24 11:19:28 +02:00
Benoit Marty f271968238 Upgrade library PFLockScreen-Android 2020-09-24 08:20:17 +02:00
Nikita Epifanov c2a938a17c 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-24 01:04:56 +00:00
Lua e02b0aad6f Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2020-09-24 01:04:56 +00:00
Marcelo Filho 32e8caab03 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (1866 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
2020-09-24 01:04:56 +00:00
call_xz be2c629590 Translated using Weblate (Japanese)
Currently translated at 49.2% (922 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ja/
2020-09-24 01:04:55 +00:00
random 63718ab4f2 Translated using Weblate (Italian)
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/it/
2020-09-24 01:04:55 +00:00
@a2sc:matrix.org 5b7bfe5302 Translated using Weblate (German)
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/de/
2020-09-24 01:04:54 +00:00
Priit Jõerüüt 8aae5b2599 Translated using Weblate (Estonian)
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/et/
2020-09-24 01:04:54 +00:00
Jeff Huang ebc1725f5b Translated using Weblate (Chinese (Traditional))
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_Hant/
2020-09-24 01:04:53 +00:00
Benoit Marty 27d3a36c1b Use same animation for all Fragment transaction 2020-09-23 22:12:02 +02:00
Benoit Marty dfa0308db6 Pin code: user has to enter pin code twice (#2005) 2020-09-23 21:58:21 +02:00
Benoit Marty 299bcc2bc7 Kill the task if PinActivity is cancelled 2020-09-23 21:58:21 +02:00
Benoit Marty 03c66315cb Ganfra's review 2020-09-23 21:58:21 +02:00
Benoit Marty 9f154748ae Avoid using 1, prefer %d (for translation) 2020-09-23 21:58:21 +02:00
Benoit Marty 5eb66c4617 Small fix and avoid using 1, prefer %d (for translation) 2020-09-23 21:58:21 +02:00
Benoit Marty 44b2673848 PIN: Add a setting to hide notification content when PIN code is configured 2020-09-23 21:58:21 +02:00
Benoit Marty a6cf2b0685 First test if resultCode == Activity.RESULT_OK 2020-09-23 21:57:58 +02:00
Benoit Marty b8c350488b Avoid code duplication and let the Activity manage the Fragments 2020-09-23 21:57:58 +02:00
Benoit Marty fb74628aa8 Protect access to pin code setting, and so remove protection to disable the pin code 2020-09-23 21:57:58 +02:00
Benoit Marty fdedfc954c PIN Code Improvements. Add more settings (#1985)
- enable/disable biometrics
- enbale/disable grace period
2020-09-23 21:57:58 +02:00
Benoit Marty b8cbafa75d PIN: move setting to a dedicated screen (no other change) 2020-09-23 21:57:36 +02:00
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