Commit Graph

15 Commits

Author SHA1 Message Date
Benoit Marty ed39b02924 Avoid using keyword for variable names 2019-09-05 16:04:41 +02:00
Dominic Fischer 456908c851
Merge branch 'develop' into kt-remove_java_util 2019-08-06 18:27:39 +01:00
Dominic Fischer 02e342849f Remove most usages of the java.util package
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-07-21 23:23:56 +01:00
ganfra 2c81e41288 Merge branch 'develop' into feature/create_direct_room 2019-07-19 18:18:22 +02:00
Benoit Marty 6d01a570fd Clear notification for a room left on another client 2019-07-19 16:44:30 +02:00
ganfra cb274d6a33 Add some cancelable on service methods and start branching Rx 2019-07-19 11:21:16 +02:00
Benoit Marty 0919b9460d Code quality: split long lines 2019-07-09 15:26:32 +02:00
Benoit Marty f41c0311fa Fix done TODO 2019-07-03 11:58:50 +02:00
Benoit Marty 0f039fce32 Add 30 missing copyright block 2019-06-28 15:59:20 +02:00
Benoit Marty 134c2fcd42 Notification: Fix TestAccountSettings test 2019-06-26 12:19:54 +02:00
Benoit Marty 2625e11508 rename method 2019-06-26 12:19:54 +02:00
Benoit Marty 71ae99012b Code review and cleanup 2019-06-26 12:19:54 +02:00
Benoit Marty ab0141a5c6 Fix issue after rebase 2019-06-26 12:19:54 +02:00
Valere 0584fc3666 Get real push rules from server and evaluate them 2019-06-26 12:19:54 +02:00
Valere 0e46fc4c0a WIP 2019-06-26 12:19:54 +02:00