Commit Graph

10 Commits

Author SHA1 Message Date
ganfra 07c516ccdd Merge branch 'develop' into feature/crypto 2019-06-07 19:25:55 +02:00
ganfra 81330d30cf Merge branch 'develop' into feature/crypto 2019-06-07 18:53:24 +02:00
Valere 7409003949 Fix / Bug aggregation on initial sync
fix / All messages were not processed due to a test exiting the for loop
+ started adding context menu for non room messages
2019-06-07 14:14:51 +02:00
Benoit Marty 2b6eee4237 Merge branch 'develop' into feature/home_rework 2019-06-04 12:54:16 +02:00
ganfra b9d76f5047 Room list & event : decouple notice events formatting to be used within room controller 2019-05-27 15:37:18 +02:00
Valere d9fecabc1f Fix / Edits could break cells merging
Edits are not displayable
2019-05-27 12:30:05 +02:00
ganfra af338b0607 Crypto: decryption is working (but still a lot to do) 2019-05-26 19:21:45 +02:00
ganfra 287feace12 Timeline : merged events are now handled directly within the recyclerview and do not need a LinearLayout. 2019-04-20 10:42:37 +02:00
ganfra b3e2eca43d Timeline : start to handle merging room member events. Need to get better perf. 2019-04-18 16:50:02 +02:00
Benoit Marty 9048a1dbbe Rename `app` to `vector` 2019-04-02 11:24:54 +02:00