Benoit Marty
|
ef6847671a
|
Import strings from Riot
|
2020-04-14 17:13:43 +02:00 |
|
Benoit Marty
|
b8cb0588fe
|
Add new resources
|
2020-04-14 17:06:05 +02:00 |
onurays
|
667b371653
|
Continue supporting old APIs.
|
2020-04-14 16:29:11 +03:00 |
|
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 |
|
onurays
|
f97e08b4e5
|
Remove .gitignore which belongs to another PR.
|
2020-04-14 13:12:17 +03:00 |
|
onurays
|
7242cbda40
|
Catch network errors during file downloading.
Fixes #1229
|
2020-04-13 17:48:19 +03:00 |
Valere
|
9e3011d4c8
|
Make initialize cross signing as a task
|
2020-04-10 17:04:34 +02:00 |
|
Valere
|
eb50256af7
|
Merge pull request #1222 from vector-im/feature/verification_unified_emoji
Uniform emoji representation for all platform
|
2020-04-10 16:05:42 +02:00 |
|
Valere
|
ccacd20428
|
Merge branch 'develop' into feature/verification_unified_emoji
|
2020-04-10 16:05:33 +02:00 |
|
Valere
|
ac46fe9e16
|
Merge pull request #1218 from vector-im/feature/scan_confirm_update
Feature/scan confirm update
|
2020-04-10 16:05:02 +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
|
68323057aa
|
Update change log
|
2020-04-10 12:12:21 +02:00 |
|
Valere
|
5081361c2d
|
Update Scan confirm flow
|
2020-04-10 12:12:06 +02:00 |
|
Valere
|
3ba619d45c
|
Merge pull request #1215 from vector-im/feature/ssss_and_backup
Fixes #1214
|
2020-04-10 12:10:42 +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
|
ede899d78e
|
Fix / Bad smiley emojii
|
2020-04-10 11:09:16 +02:00 |
|
Valere
|
a703574004
|
Uniform emoji representation for all platform
|
2020-04-10 11:02:33 +02:00 |
Christopher Rossbach
|
ef2abbfbd4
|
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite
|
2020-04-09 11:11:44 +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
|
3968bb3488
|
Merge pull request #1213 from vector-im/feature/timeline_sum_item
Feature/timeline sum item
|
2020-04-08 17:08:53 +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
|
aec49fe542
|
Change log
|
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 |
|
Valere
|
0eff00ebee
|
Merge pull request #1211 from vector-im/feature/fix_gossiping_to_early
Fix / Send gossip request on other done received
|
2020-04-08 16:30:17 +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 |
|
onurays
|
dcb6af6c45
|
.gitignore file added.
|
2020-04-08 12:40:29 +03:00 |
|
Christopher Rossbach
|
3ff5952417
|
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite
|
2020-04-07 20:53:31 +02:00 |
|
Valere
|
b480eb3688
|
Update change log
|
2020-04-07 19:20:49 +02:00 |
|
Valere
|
12abca1b80
|
Fix / Send gossip request on other done received
|
2020-04-07 19:09:56 +02:00 |
|
Valere
|
1d8ed387bc
|
Merge pull request #1206 from vector-im/feature/gossip_keybackup_key
Feature/gossip keybackup key
|
2020-04-07 18:06:05 +02:00 |
|
Christopher Rossbach
|
5521c094f7
|
fix typing difference
|
2020-04-07 17:50:01 +02:00 |
|
Christopher Rossbach
|
222b72a014
|
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite
|
2020-04-07 17:46:23 +02:00 |
|
Valere
|
8904ca27f2
|
clean
|
2020-04-07 15:30:19 +02:00 |
|
Valere
|
6c5da97c16
|
code review
|
2020-04-07 15:25:31 +02:00 |
|
Valere
|
d4d73db5ae
|
keybackup gossip test
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
1a436f962f
|
update change log
cleaning
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
dc61ee61f5
|
Fix / wrong export format
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
5b4b5e7a57
|
Gossip keybackup key after verification!
|
2020-04-07 15:15:45 +02:00 |
|
Valere
|
0164f94047
|
Merge pull request #1198 from vector-im/feature/crosssigning_bootstrap
Feature/crosssigning bootstrap
|
2020-04-07 15:14:54 +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 |