mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
17257 commits 161 branches 158 tags 270 MiB
Commit graph

17257 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Benoit Marty
941c2a792f
Merge pull request #6409 from vector-im/dependabot/gradle/com.google.gms-google-services-4.3.13 
Bump google-services from 4.3.10 to 4.3.13
 2022-07-04 10:24:26 +02: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
Benoit Marty
cadd5c050b
Merge pull request #6450 from cloudrac3r/fix-attach-gallery 
Gallery picker can pick external images (not just videos)
 2022-07-04 09:44:50 +02:00
Cadence Ember
b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12: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
Benoit Marty
93b7e1094c
Merge pull request #6434 from vector-im/feature/bca/check_serialized_frozen 
Simple check to prevent frozen class modificaiton
 2022-07-01 18:01:08 +02: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
Valere
d281f9dde5 use XXX not TODO 2022-07-01 16:07:03 +02: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
Valere
6fd99dc302 resist ConnectivityManager$TooManyRequestsException 2022-07-01 15:56:03 +02:00
Valere
90a4e71b06 update flacky test 2022-07-01 14:30:21 +02:00
Maxime NATUREL
f5e33ca980 Fix unit tests 2022-07-01 14:27:10 +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
e326188aa8
Merge pull request #6108 from vector-im/feature/adm/ftue-msisdn-entry 
FTUE - Msisdn (phone number) entry
 2022-07-01 12:07:57 +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
a92fae6d25 add change log 2022-07-01 12:00:26 +02:00
Valere
28ca03cc67 Simple check to prevent frozen class modificaiton 2022-07-01 11:54:30 +02:00
Benoit Marty
9a2beb5017
Merge pull request #6416 from vector-im/dependabot/gradle/flipper-0.152.0 
Bump flipper from 0.151.1 to 0.152.0
 2022-07-01 11:43:53 +02:00
Valere
08cb6de83d Fix migration 2022-07-01 11:08:35 +02:00
Valere
fb5f0cbd00 Fix test compilation 2022-07-01 09:43:17 +02:00
Valere
e7322e8524 outdated configuration 2022-07-01 09:43:17 +02:00
Valere
5a67c39c7f reuse code for test 2022-07-01 09:43:17 +02:00
Valere
a885ff5e47 Fix test 2022-07-01 09:43:17 +02:00
Valere
b0907de582 Fix migration 2022-07-01 09:43:17 +02:00
Valere
ddd82441bd kdoc 2022-07-01 09:43:17 +02:00
Valere
8e829c6aad Add lab flag and more tests 2022-07-01 09:43:17 +02:00
Valere
d9fb58fbcb Fix tests 2022-07-01 09:42:31 +02:00
Valere
f64adeba7f fix bad sender key export 2022-07-01 09:42:31 +02:00
Valere
34145f0374 post rebase fix 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
df241dbdb8 Fix broken unit test 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
010cf540b6 Fix broken unit test 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
55fdff4242 Resolve merge conflicts 2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
d3a516b05d Enhance key sharing to respect matrix configuration 2022-07-01 09:42:31 +02:00