Commit Graph

3003 Commits

Author SHA1 Message Date
Benoit Marty 707b69e3e2
Merge branch 'develop' into develop 2020-08-03 16:58:52 +02:00
Valere 33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere 69e499e497 Merge hotfix 2020-08-03 14:00:32 +02:00
Valere db6045778e Update change log 2020-08-03 12:11:50 +02:00
Valere 2810923519 FIx / Crash when opening Invite User screen 2020-08-03 12:00:08 +02:00
ganfra acf977577f Pin: clean code 2020-07-31 11:47:51 +02:00
ganfra 995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
ganfra 99ae1655f5 Pin: fix PopupAlertManager showing on top of PinCode 2020-07-31 11:34:24 +02:00
ganfra 7e45fe4509 Pin: add comment on UnlockActivity interface 2020-07-31 11:33:25 +02:00
Valere 531623178a Version ++ 2020-07-31 00:52:22 +02:00
ganfra a883d3ecdd Merge branch 'develop' into feature/pin_code 2020-07-30 18:49:13 +02:00
Valere 2f6cdc6529
Merge pull request #1847 from vector-im/feature/crash_store_mvrx
Fix IllegalArgumentException reported from store on HomeActivity aunch
2020-07-30 18:07:11 +02:00
ganfra eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere c90f5ed370 Fix IllegalArgumentException reported from store on HomeActivity aunch 2020-07-30 17:03:11 +02:00
Valere 1204f6d9ce UX feedback, reduce severity of message 2020-07-30 15:25:10 +02:00
ganfra efa1263c35 Pin: set back the grace period to 2 minutes 2020-07-30 15:22:41 +02:00
ganfra 06bd353d44 Pin: polish a bit and clean code 2020-07-30 14:58:46 +02:00
Valere 562cfce9e2 Support HS admin option to disable E2EE for DMs
Fixes #1794
2020-07-30 12:08:30 +02:00
ganfra bb066b7c65 Add PinLocker to handle lock state 2020-07-29 20:19:01 +02:00
ganfra 37521d2d4f Pin: add settings to enable/disable 2020-07-29 16:11:57 +02:00
Valere b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
ganfra 5426e43cbb Create PinCodeStore and migrate code to fragment 2020-07-29 11:38:04 +02:00
Valere c04f22d3bf quick fix plural 2020-07-29 09:51:20 +02:00
Valere 9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
ganfra cd38aa42aa Merge branch 'develop' into feature/pin_code 2020-07-28 17:49:36 +02:00
Valere dde9cdd8ac
Merge pull request #1821 from vector-im/feature/notification_off_alert
Check if migration disabled notif
2020-07-28 17:04:15 +02:00
Valere a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag 2020-07-28 16:58:00 +02:00
Valere e619217687 Code quality 2020-07-28 16:56:55 +02:00
Valere 6f5b3371fe Check if migration disabled notif 2020-07-28 16:56:55 +02:00
Valere f7b9fc3bb1
Merge pull request #1826 from vector-im/feature/banned_list
Added banned user screen
2020-07-28 16:53:58 +02:00
ganfra 5176a3e2aa
Merge branch 'develop' into feature/fix_timeline_loading 2020-07-28 16:30:34 +02:00
Valere 4631cd0e80
Merge pull request #1831 from vector-im/feature/quick_call_update
Allow call in all 2 participants rooms
2020-07-28 16:24:22 +02:00
Valere 60c6512418 Fix / item flickering 2020-07-28 16:23:21 +02:00
Valere 12bc821ef3 code review 2020-07-28 16:23:21 +02:00
Valere c82e910c38 Added banned user screen 2020-07-28 16:23:21 +02:00
Valere 12e2a8ffc8 Allow call in all 2 participants rooms 2020-07-28 14:43:50 +02:00
ganfra 833f64fcec Fix timeline non loading when there are lots of filtered events 2020-07-28 11:49:45 +02:00
Valere 73c051d2b1 Improve UI of edit role button 2020-07-28 11:35:37 +02:00
ganfra da06695ab7 Relation content should be checked in encrypted content and not the decrypted one 2020-07-24 18:31:01 +02:00
Onuray Sahin 984ffc4fb9
Merge pull request #1797 from vector-im/feature/fix_rebranding_assets
Fix rebranding assets on login screens
2020-07-24 15:16:02 +03:00
ganfra a19a3f2a7f Merge branch 'develop' into feature/pin_code 2020-07-24 11:35:38 +02:00
ganfra d7b44ba0cf
Merge branch 'develop' into feature/fix_reply_tag 2020-07-24 11:32:59 +02:00
ganfra 20c7d80bb1 Clean code 2020-07-24 11:30:27 +02:00
onurays 21b609420b ktlint fix. 2020-07-24 03:00:06 +03:00
ganfra 794b89c041 Reply: remove inner tags when replying 2020-07-23 18:23:49 +02:00
ganfra 407595e613 Change warning badge (white background) 2020-07-23 16:38:42 +02:00
onurays 4cc3e87d64 Fix rebranding assets on login screens. 2020-07-23 15:02:40 +03:00
ganfra 3e429490e7 Update CHANGES 2020-07-22 17:04:48 +02:00
ganfra e23b02f2e2 Composer: set max lines to 6 so it can scroll 2020-07-22 16:02:38 +02:00