onurays
|
190fbb95ec
|
Merge branch 'develop' into feature/target-sdk-29
# Conflicts:
# vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
|
2020-04-14 13:59:54 +03:00 |
|
Valere
|
ccacd20428
|
Merge branch 'develop' into feature/verification_unified_emoji
|
2020-04-10 16:05:33 +02:00 |
|
Valere
|
9cfb83f0d2
|
Remove outdated translation
|
2020-04-10 14:31:03 +02:00 |
|
Valere
|
943ba3bebd
|
Fix / string bad argument number - lint
|
2020-04-10 13:14:12 +02:00 |
|
Valere
|
fccfd00949
|
Fix / design update
|
2020-04-10 12:12:21 +02:00 |
|
Valere
|
5081361c2d
|
Update Scan confirm flow
|
2020-04-10 12:12:06 +02:00 |
|
Valere
|
f5dc0b38ff
|
Code review
|
2020-04-10 11:47:54 +02:00 |
|
Valere
|
8357abd455
|
Added prefix to resources to avoid accidental override
|
2020-04-10 11:18:41 +02:00 |
|
Valere
|
a703574004
|
Uniform emoji representation for all platform
|
2020-04-10 11:02:33 +02:00 |
|
Valere
|
7c0137e2dc
|
Fix / await callback suspend forever
|
2020-04-09 10:46:52 +02:00 |
|
Valere
|
34dec64d9c
|
Fixes #1214
|
2020-04-08 17:56:12 +02:00 |
|
Valere
|
6f2d7aebba
|
code review
|
2020-04-08 16:37:52 +02:00 |
|
Valere
|
366a35913b
|
Fix alignement
|
2020-04-08 16:31:01 +02:00 |
|
Valere
|
f04d8b0e03
|
cleaning
|
2020-04-08 16:31:01 +02:00 |
|
Valere
|
08af61b778
|
rename layout
|
2020-04-08 16:31:01 +02:00 |
|
Valere
|
277f35a352
|
Merge room creation events in one summary
|
2020-04-08 16:31:01 +02:00 |
|
Valere
|
68512e475f
|
WIP
|
2020-04-08 16:31:01 +02:00 |
|
Onuray Sahin
|
8a4a288074
|
Merge branch 'develop' into feature/target-sdk-29
|
2020-04-08 14:15:02 +03:00 |
|
onurays
|
5b1f887760
|
Code review fixes.
|
2020-04-08 14:10:31 +03:00 |
|
Valere
|
8904ca27f2
|
clean
|
2020-04-07 15:30:19 +02:00 |
|
Valere
|
1a436f962f
|
update change log
cleaning
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
5b4b5e7a57
|
Gossip keybackup key after verification!
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
153587bd82
|
Merge branch 'develop' into feature/crosssigning_bootstrap
|
2020-04-07 15:14:43 +02:00 |
|
Valere
|
326f2e99fb
|
klint
|
2020-04-06 10:00:59 +02:00 |
|
Valere
|
1dfd6f232a
|
Code quality / line too long
|
2020-04-03 18:59:21 +02:00 |
|
Valere
|
f605bb8270
|
Code review
|
2020-04-03 15:57:05 +02:00 |
|
Valere
|
7ffb6113a4
|
Increase file logger size
|
2020-04-03 13:53:34 +02:00 |
|
Valere
|
92bf3f1349
|
Update change log
+ code quality
|
2020-04-03 11:14:14 +02:00 |
|
Valere
|
6474735662
|
Fix / devtools was not showing all json numbers
|
2020-04-03 10:31:44 +02:00 |
|
Valere
|
45c5626267
|
Add generate key option
|
2020-04-02 18:30:43 +02:00 |
|
Valere
|
c27264761d
|
Back /Skip navigation
|
2020-04-02 18:11:52 +02:00 |
|
Valere
|
c6abfa14ea
|
Fix / Bind continue button
|
2020-04-02 16:54:30 +02:00 |
|
Valere
|
2f237cf17b
|
klint
|
2020-04-02 16:51:40 +02:00 |
|
Valere
|
bf5ba99653
|
Full bootstrap flow initial commit
|
2020-04-02 16:51:03 +02:00 |
|
Valere
|
8ecdac7c31
|
Fixes #1191
|
2020-03-31 17:08:11 +02:00 |
|
Valere
|
a40dd31543
|
Bootstrap bottomsheet
|
2020-03-27 17:09:18 +01:00 |
|
Onuray Sahin
|
e2f7890bb8
|
Merge branch 'develop' into feature/target-sdk-29
|
2020-03-26 17:39:22 +03:00 |
|
onurays
|
0a77d5014e
|
Fix nullability issues.
|
2020-03-26 17:19:29 +03:00 |
|
Valere
|
91464a071e
|
Merge pull request #1180 from vector-im/feature/complete_security_design_update
Feature/complete security design update
|
2020-03-26 14:31:09 +01:00 |
|
Valere
|
acd90657c7
|
Fix / prevent cancel when in conclusion fragment
|
2020-03-26 14:09:41 +01:00 |
|
onurays
|
e5482d48c0
|
Remove deprecated & unused ImageTools class.
|
2020-03-26 16:02:50 +03:00 |
|
onurays
|
5816a04a37
|
Use MediaStore instead of deprecated addCompletedDownload since Android Q.
|
2020-03-26 15:58:31 +03:00 |
|
onurays
|
4b7da9ae6b
|
Replace deprecated getExternalStoragePublicDirectory with getExternalFilesDir.
|
2020-03-26 15:57:21 +03:00 |
|
onurays
|
f7cbc01023
|
Replace deprecated PreferenceManager with androidx version.
|
2020-03-26 15:56:33 +03:00 |
|
Valere
|
1de57bbf3b
|
Fix / cancel copy when verifying other
|
2020-03-26 13:49:48 +01:00 |
|
Valere
|
42a8c561db
|
Fix / Verification was not cancelled on back in ready state
|
2020-03-26 13:49:48 +01:00 |
|
Valere
|
5bef9aef6a
|
Fix / add specific copy for other verif cancel confirm
|
2020-03-26 13:49:48 +01:00 |
|
Valere
|
f8c1ec985f
|
re-prompt to verify on restart
|
2020-03-26 13:49:48 +01:00 |
|
onurays
|
12429d8091
|
Merge develop into the branch.
|
2020-03-26 14:39:50 +03:00 |
|
Onuray Sahin
|
3bb5e127d6
|
Merge pull request #1155 from vector-im/feature/multipicker
Multiple attachment picker implementation
|
2020-03-26 14:30:02 +03:00 |
|