mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-23 01:31:24 +03:00
Code Issues Projects Releases Packages Wiki Activity
3884 commits 160 branches 159 tags 271 MiB
Commit graph

3884 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
a233e9b0a0 Avoid code duplication, and improve readability 2020-04-27 14:25:45 +02:00
Benoit Marty
ebecb9bb9a i18n 2020-04-27 14:25:07 +02:00
Benoit Marty
35962c3cb5 Do not propose bootsrap for SSO accounts 
Because we do not support yet confirming account credentials using SSO
 2020-04-27 14:25:07 +02:00
Benoit Marty
0ac6a26b6e Add "continue" button to the bootstrap bottom sheet 2020-04-27 14:25:07 +02:00
Benoit Marty
0a887c0926 Cleanup 2020-04-27 14:25:07 +02:00
Benoit Marty
54c0239969 fix layout issue when text is displayed on 2 lines 2020-04-27 14:25:07 +02:00
Benoit Marty
8559254593
Merge pull request #1289 from vector-im/feature/fix-edited_event_click 
Do not handle url if it is not valid.
 2020-04-27 14:24:25 +02:00
onurays
626eb4d06b Comments added to explain why we should check if the url is valid. 2020-04-27 13:44:16 +03:00
Benoit Marty
a633c11c1d Do not clear developer preference when logging out 2020-04-27 12:29:38 +02:00
Benoit Marty
a4931e21ae Clear sharedPreference when logging out 2020-04-27 12:26:19 +02:00
Valere
996fabb327
Merge pull request #1288 from vector-im/feature/fix_update_4s_backup_after_bootstrap 
Fix / backup key was not save in 4S after bootstrap
 2020-04-27 11:42:09 +02:00
onurays
6c4e71d7d4 Do not handle url if it is not valid. 2020-04-27 12:26:35 +03:00
Valere
ad0ad502aa Fix / backup key was not save in 4S after bootstrap 2020-04-27 11:14:13 +02:00
Valere
42b47c25aa Remember ignored unknown sessions 2020-04-27 10:09:37 +02:00
Benoit Marty
7ef1970a0b Better layout preview 2020-04-27 01:17:20 +02:00
Benoit Marty
409d751612
Merge pull request #1278 from vector-im/feature/fix_misleading_url_color 
Fix the color of misleading url according to design document.
 2020-04-27 00:50:03 +02:00
Valere
bdce71abfd Update change log 2020-04-24 16:50:56 +02:00
Valere
114bce5f64 Fix / DB crash due to deserializaion 2020-04-24 16:50:56 +02:00
Valere
20e5ebc88b Decorate timeline with e2e warning 2020-04-24 16:50:56 +02:00
onurays
52aa57ac7c Fix the color of misleading url according to design document. 2020-04-24 17:18:59 +03:00
Benoit Marty
8daf72a4b0 Use correct URL for SSO connection (#1178) 2020-04-24 15:54:02 +02:00
Benoit Marty
51eb2cda95 Move some constants to the Matrix SDK 2020-04-24 15:53:30 +02:00
Benoit Marty
57779c99c2 improve script 2020-04-24 14:39:55 +02:00
Benoit Marty
02e02ed691
Merge pull request #1275 from vector-im/feature/log_improvement 
Log improvement for test
 2020-04-24 14:38:28 +02:00
Benoit Marty
af0b798ef1 Ensure Timber log output when running tests 
to squash
 2020-04-24 13:38:28 +02:00
Benoit Marty
51be8d5ed5 Remove previous temporary solution 2020-04-24 13:26:25 +02:00
Benoit Marty
270bed5013 EventBus logs using Timber 2020-04-24 11:57:49 +02:00
Benoit Marty
20b3c33fb0 Remove bad comment 2020-04-24 11:57:49 +02:00
Benoit Marty
b2aaf1cca1 CurlLoggingInterceptor now uses Timber to log 2020-04-24 11:57:49 +02:00
Onuray Sahin
5f6969e2cc
Merge pull request #1270 from vector-im/feature/misleading_url_target 
Show a warning dialog if the text of the clicked link does not match
 2020-04-24 11:53:16 +03:00
Onuray Sahin
f0648ee52a
Merge branch 'develop' into feature/misleading_url_target 2020-04-24 11:24:39 +03:00
Valere
88c70a2c10
Merge pull request #1266 from vector-im/feature/update_ssss_activity 
Feature/update ssss activity
 2020-04-23 21:20:43 +02:00
Valere
22c3ed6bb9 Code review 2020-04-23 21:20:01 +02:00
Valere
b0d25fa84f Update vector/src/main/res/values/strings_riotX.xml 
Co-Authored-By: Benoit Marty <benoitm@matrix.org>
 2020-04-23 21:16:46 +02:00
Valere
57636207d2 Fix copy 2020-04-23 21:16:46 +02:00
Valere
eac9133bb1 update change log 2020-04-23 21:16:46 +02:00
Valere
f7e7659750 klint 2020-04-23 21:16:28 +02:00
Valere
e719541b5e Fix / crash when generating random key 2020-04-23 21:16:28 +02:00
Valere
bd7acfbb1a Add option to recover with recovery key 2020-04-23 21:16:28 +02:00
Valere
25b42cb4f3
Merge pull request #1272 from vector-im/feature/update_design_complete_secu 
Update design wait for self verification
 2020-04-23 21:14:02 +02:00
Valere
928149fe35
Merge branch 'develop' into feature/update_design_complete_secu 2020-04-23 21:13:53 +02:00
Onuray Sahin
a80181da9e
Merge branch 'develop' into feature/misleading_url_target 2020-04-23 20:18:44 +03:00
onurays
72de5d6adc Code review fixes. 2020-04-23 20:17:52 +03:00
Benoit Marty
ed4154d763
Merge pull request #1261 from vector-im/feature/unwedging 
Feature/unwedging
 2020-04-23 18:20:31 +02:00
Benoit Marty
4ee13b6fa1
Merge branch 'develop' into feature/unwedging 2020-04-23 18:20:09 +02:00
Benoit Marty
33fb1dd147
Merge pull request #1262 from vector-im/feature/fix_add_by_user_id 
Add user to direct chat by user id.
 2020-04-23 18:05:15 +02:00
Valere
736905edf8
Merge pull request #1269 from vector-im/feature/complete_security_hide_4s 
Hide Use recovery key when 4S is not setup
 2020-04-23 18:03:14 +02:00
Benoit Marty
e8a91eab88
Merge pull request #1265 from vector-im/feature/deactivate 
Deactivate account using password
 2020-04-23 17:30:08 +02:00
Valere
b951af0116 RiotX spelling 2020-04-23 17:00:37 +02:00
onurays
c3299845c1 use generic cancel and continue strings. 2020-04-23 17:44:30 +03:00