Commit Graph

3548 Commits

Author SHA1 Message Date
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
Valere 1dfd6f232a Code quality / line too long 2020-04-03 18:59:21 +02:00
Valere 42d61944b5
Merge pull request #1204 from vector-im/feature/increase_file_log_size
Increase file logger size
2020-04-03 16:40:18 +02:00
Valere 50a8ffeca1
Merge pull request #1203 from vector-im/feature/fix_e2e_null_alg
Feature/fix e2e null alg
2020-04-03 15:57:56 +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 156e6114c1 Updade change log 2020-04-03 13:43:40 +02:00
Valere c91bc82cd9 Fix / Ensure encryption set even if faield to fetch members 2020-04-03 13:35:09 +02:00
Valere 8b481e2294 Remove dead code 2020-04-03 13:34:38 +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
Christopher Rossbach dff89cb2e1 document changes
Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com>
2020-03-27 14:41:48 +01:00
Christopher Rossbach cdbb657961 Fix #957 by incrementing the catchup count on home icon.
Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com>
2020-03-27 14:24:42 +01:00
Onuray Sahin 443d45db6a
Merge branch 'develop' into feature/target-sdk-29 2020-03-27 12:21:39 +03:00
Valere a995615f87 Fix / protect against crash during migration 2020-03-26 18:20:12 +01:00
Valere 024c62515c
Merge pull request #1181 from vector-im/feature/update_shield_logic
Update shield logic for DM
2020-03-26 16:58:10 +01:00
Valere 75e66a6550
Merge branch 'develop' into feature/update_shield_logic 2020-03-26 16:58:01 +01:00