Commit Graph

2866 Commits

Author SHA1 Message Date
Benoit Marty 629ecf786a
Merge pull request #1024 from vector-im/feature/wording
Account creation: wrongly hints that an email can be used to create an account (#941)
2020-02-17 13:34:04 +01:00
Benoit Marty ecf07ff64a Account creation: wrongly hints that an email can be used to create an account (#941) 2020-02-17 10:30:54 +01:00
Valere b04ee7153a
Merge pull request #995 from vector-im/feature/4s_msc1946
Feature/4s msc1946
2020-02-14 17:49:16 +01:00
Benoit Marty db19ab0531
Merge branch 'develop' into feature/4s_msc1946 2020-02-14 17:45:44 +01:00
Benoit Marty cad818c341 ktlint 2020-02-14 17:05:14 +01:00
Benoit Marty 1660a0f846 Version++ 2020-02-14 15:16:00 +01:00
Benoit Marty 4987a75039 Merge branch 'release/0.16.0' into develop 2020-02-14 15:14:54 +01:00
Benoit Marty e20d1724c9 Prepare release 0.16.0 2020-02-14 15:14:48 +01:00
Benoit Marty f6f9c349ec
Add entry in changelog for the 2 mistakes 2020-02-14 14:52:10 +01:00
Benoit Marty 88b8ceaeb5
Merge pull request #1005 from vector-im/feature/fix_event_redaction_prompt
Do not ask for a reason if user wants to delete his own message.
2020-02-14 14:36:01 +01:00
Benoit Marty e4577d8fef Small cleanup before merge 2020-02-14 14:34:22 +01:00
onurays 030d6824e3 Code review fixes. 2020-02-14 15:04:25 +03:00
Benoit Marty ab437e249d Update emoji for API change 2020-02-14 12:43:27 +01:00
Valere 35835be03e klint 2020-02-14 12:06:07 +01:00
Valere f99eca8014 Code review 2020-02-14 10:48:18 +01:00
Valere e0eede1150 cleaning 2020-02-14 10:48:18 +01:00
Valere 64647cb465 Fix / Save account data after update (local echo) 2020-02-14 10:48:18 +01:00
Valere def01cca8f Fix test + changes 2020-02-14 10:48:18 +01:00
Valere 61ea4191dc Update json viewer lib 2020-02-14 10:48:18 +01:00
Valere 108ebea84e SSSS service + test 2020-02-14 10:48:18 +01:00
Valere bf06b57bad Refactor Account Data
Auto stash before rebase of "develop"
2020-02-14 10:48:18 +01:00
Valere a250a895fe Remove redudant calls to eventBus post 2020-02-14 10:47:34 +01:00
Benoit Marty 5808c1de22 TextView displaying emoji should have text color set to black 2020-02-13 19:50:31 +01:00
Benoit Marty d21604b791
Merge pull request #989 from vector-im/feature/qr_code_mistake
Fix issue with verification when other client declares it can only show QR code (#988)
2020-02-13 19:41:10 +01:00
onurays fd135e1eeb Compute message body for encrypted messages too. 2020-02-13 18:09:26 +03:00
onurays f28e4cf991 Fix comparison of user ids. 2020-02-13 17:57:38 +03:00
Valere 1941862499 Fix / Remove debug code line 2020-02-13 15:50:08 +01:00
onurays 983593d647 getRedactionReason function is refactored. 2020-02-13 17:28:14 +03:00
onurays 1b413934b5 Set redaction reason as message body. 2020-02-13 16:42:13 +03:00
onurays 8a3e93ae96 Do not ask for a reason if user wants to delete his own message.
Fixes (#1003)
2020-02-13 14:59:41 +03:00
Benoit Marty 5191cbaf93
Merge pull request #1001 from vector-im/feature/pusher_service
Cleanup pusher service and improve API
2020-02-13 08:02:33 +01:00
Benoit Marty f2e6900cfb Move throw line 2020-02-13 07:44:54 +01:00
Benoit Marty 0b7e757f3c Code lisibility: use generic name for parameters in Dagger modules 2020-02-13 07:12:11 +01:00
Benoit Marty 5b2c947af1 Rename internal class 2020-02-13 07:05:46 +01:00
Benoit Marty 6a69c6356d PushersService.pushers() has been renamed to PushersService.getPushers() 2020-02-13 07:04:54 +01:00
Benoit Marty e492e4318b Do some parameter checks 2020-02-13 06:48:52 +01:00
Benoit Marty 93d38843c3 Add Javadoc 2020-02-13 06:36:21 +01:00
Benoit Marty 7d94519064
Merge pull request #998 from vector-im/feature/msc_2192_update_event_prefix
Use vendor prefix for non merged MSC
2020-02-12 22:41:12 +01:00
Valere 21bac0f867 Fix / typo in poll 2020-02-12 22:31:13 +01:00
Valere 32c4ad9ecb Use vendor prefix for non merged MSC 2020-02-12 19:09:23 +01:00
Valere e1342d096b
Merge pull request #810 from vector-im/feature/msc_2192
Feature/msc 2192
2020-02-12 17:41:50 +01:00
Valere e91c6c216d code quality 2020-02-12 17:03:21 +01:00
Onuray Sahin 6013e1653b
Open room member profile from reactions and read receipts. (#990)
Open room member profile from reactions and read receipts. Fixes #875
2020-02-12 15:57:49 +01:00
Benoit Marty 47f47e40c4 code review and cleanup 2020-02-12 15:09:38 +01:00
Benoit Marty 9016688aec Fix compilation issue after rebase 2020-02-12 13:48:08 +01:00
Valere d5f8a0c0fc code quality 2020-02-12 13:40:54 +01:00
Valere 33c657bff8 Update change log 2020-02-12 13:40:54 +01:00
Valere 9a7bd35ddc Add m.buttons support (a.k.a bot buttons) 2020-02-12 13:40:54 +01:00
Valere 3ac54c51f6 cleaning 2020-02-12 13:39:30 +01:00
Valere c4ea2507f8 Add command to send poll 2020-02-12 13:39:30 +01:00