Commit graph

9813 commits

Author SHA1 Message Date
Benoit Marty
a030769aea Change icon background color for nightly build 2022-07-06 15:37:21 +02:00
Benoit Marty
f0c8c3fd63 Rename Android Service to use AndroidService suffix to limit confusion with our Matrix SDK Services 2022-07-04 21:39:01 +02:00
Adam Brown
2c444527bd
Merge pull request #6447 from cloudrac3r/fix-html-entities
Fix HTML entities being displayed in messages
2022-07-04 17:31:34 +01:00
Adam Brown
abf35d730d
Merge pull request #6157 from vector-im/feature/adm/ftue-msisdn-confirmation
[FTUE] MSISDN / Phone number confirmation
2022-07-04 11:29:39 +01:00
Maxime NATUREL
f3e7d0daff
Merge pull request #6431 from vector-im/fix/mna/closed-poll-visible-votes
[Poll] - Wrong votes in closed poll after removing 2 previous polls (PSG-590)
2022-07-04 11:33:26 +02:00
Maxime NATUREL
906fe8be76
Merge pull request #6425 from vector-im/fix/mna/undisclosed-poll-description
[Poll] - Add a description under undisclosed poll when not ended (PSB-134)
2022-07-04 11:20:59 +02:00
Adam Brown
2a36dc8ee5 using confirmation copy for the confirmation code entry field 2022-07-04 09:44:45 +01:00
Adam Brown
daecd7d43a returning the error result directly from the when 2022-07-04 09:21:15 +01:00
Maxime NATUREL
26aaf84806 Renaming field to votesStatus 2022-07-04 10:14:15 +02:00
Cadence Ember
a53ad39e1a Add comments for the EventHtmlRenderer file 2022-07-04 01:07:38 +12:00
Cadence Ember
84bb11c1bf Fix HTML entities being displayed in messages
Initially reported in #6445. Fixes #6445.
This was a regression from #6357.

The fix is to enable Markwon's HTML entities processor.
2022-07-04 01:07:14 +12:00
Valere
8dc57fe2f0
Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages
Share Megolm session keys when inviting a new user
2022-07-01 17:33:43 +02:00
Eric Decanini
bdb49f5946
Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken
Fixes broken SoftLogout UX for homeservers that support both Password and SSO
2022-07-01 15:52:48 +01:00
Maxime NATUREL
d5b375e82b
Merge pull request #6414 from vector-im/feature/mna/reply-to-lls
[Location sharing] - Reply action on a live message (PSG-343)
2022-07-01 16:03:02 +02:00
Adam Brown
82feda476d removing unused imports 2022-07-01 13:18:09 +01:00
Adam Brown
5e9e65e10f using clear error on change extension 2022-07-01 13:05:26 +01:00
Adam Brown
be3d419290 adding phone number confirmation resending 2022-07-01 12:14:34 +01:00
Adam Brown
e6e079a071 adding barebone phone confirmation fragment, copied from the phone number input 2022-07-01 12:14:02 +01:00
Adam Brown
bfa50f186a formatting 2022-07-01 11:14:25 +01:00
Adam Brown
f2db4be479 fixing formatting/unused imports 2022-07-01 11:14:25 +01:00
Adam Brown
0bbc74b193 injects the phonenumberutil and adds testcases around the parsing 2022-07-01 11:14:25 +01:00
Adam Brown
27b1bc9e66 handling msisdn 401 errors as success within the registration wizard delegate 2022-07-01 11:14:25 +01:00
Adam Brown
7617309058 hooking up, styling and applying copy to the phone number fragment 2022-07-01 11:14:24 +01:00
Adam Brown
a8b73f0cf9 applying autofill hints for phonenumber and email entry 2022-07-01 11:13:57 +01:00
Adam Brown
df6ebcacd1 adding msisdn fragment and layout, copied from email input 2022-07-01 11:12:45 +01:00
Valere
b0907de582 Fix migration 2022-07-01 09:43:17 +02:00
Valere
8e829c6aad Add lab flag and more tests 2022-07-01 09:43:17 +02:00
Benoit Marty
e2a55fb6f6
Merge pull request #4364 from vector-im/yostyle/open_url_on_browser_task
Open URL on external browser task
2022-06-30 22:36:26 +02:00
Benoit Marty
58580f1e6a
Merge pull request #6413 from vector-im/feature/bma/room_member_loading
Show a loader if all the Room Member are not yet loaded.
2022-06-30 17:13:50 +02:00
Benoit Marty
98a7f7df4d
Merge pull request #6429 from vector-im/feature/bma/fragile_data
Add `android:hasFragileUserData="true"` in the manifest
2022-06-30 17:11:27 +02:00
Adam Brown
72c4af0026
Merge pull request #6263 from vector-im/feature/adm/ftue-forgot-password
[FTUE] Forgot password
2022-06-30 15:40:09 +01:00
Adam Brown
ea71a8b5c2
Merge pull request #6415 from vector-im/feature/adm/replacing-epoxy-layout-id
Replacing epoxy item annotation layout references with getDefaultLayoutId
2022-06-30 14:58:46 +01:00
Maxime NATUREL
a8d43538f1 Explicitely hiding votes when disclosed poll 2022-06-30 14:51:07 +02:00
ganfra
88346ffc68 Weblate: also clean trads 2022-06-30 14:36:52 +02:00
Benoit Marty
2118eaea90 Format file 2022-06-30 14:19:20 +02:00
Benoit Marty
52b07021a7 Add android:hasFragileUserData="true" to the manifest. See details in #2352 2022-06-30 14:19:04 +02:00
ganfra
4bdde101b8 Clean the TODO delete (UnusedResource not compatible with string template) 2022-06-30 12:26:51 +02:00
Adam Brown
0d084648a3 showing a toast on password reset confirmation 2022-06-30 10:44:06 +01:00
Weblate
53a8098caa Merge branch 'origin/develop' into Weblate. 2022-06-30 09:34:40 +00:00
Adam Brown
d0e5b3eb21 lifting duplicated event_base layout to the base class, with the option for children to override 2022-06-30 09:46:20 +01:00
Adam Brown
a815ac996b using vector model for consistency 2022-06-30 09:45:56 +01:00
Maxime NATUREL
9fb19af39c Adding a description under undisclosed poll when not yet ended 2022-06-30 10:13:41 +02:00
LinAGKar
fabb345107 Translated using Weblate (Swedish)
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2022-06-29 19:32:19 +00:00
Nui Harime
45cb013e1a Translated using Weblate (Russian)
Currently translated at 99.7% (2233 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-06-29 19:32:19 +00:00
Adam Brown
c603b780cf extracting common breaker background selection to ftue extensions 2022-06-29 17:47:28 +01:00
Adam Brown
7df7df7541 removing unused imports 2022-06-29 17:40:25 +01:00
Adam Brown
33ca5753f1 replacing epoxy item annotation layout references with getDefaultLayoutId override 2022-06-29 17:21:05 +01:00
ericdecanini
4cf97d48c9 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
2022-06-29 15:53:22 +02:00
Benoit Marty
e75070be91 Use a DataSrouce instead of a Task and return a non Optional Boolean. 2022-06-29 15:35:00 +02:00
Adam Brown
1361852721 triggering an initial enabled state when using associateContentStateWith and extracts the resetting of errors on content change to an extension 2022-06-29 14:15:39 +01:00