Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
9160 commits 46 branches 261 tags 144 MiB
Commit graph

9160 commits

This branch
This branch
All branches
Author SHA1 Message Date
ismailgulek
8648a95aeb Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-22 14:23:15 +03:00
ismailgulek
dc089ee341
Merge pull request #3675 from vector-im/fix_fab_images 
Fix Fab Images
 2020-09-22 01:23:21 +03:00
ismailgulek
cbc2e44da9 Update CHANGES.rst 2020-09-21 17:27:45 +03:00
ismailgulek
da4e1bcf0f Fix floating buttons' bg images 2020-09-21 17:27:15 +03:00
ismailgulek
4de41b9fcf
Merge pull request #3664 from vector-im/pin_code_explanatory 
Pin code explanatory
 2020-09-18 13:19:13 +03:00
ismailgulek
32f39c372c Specify set pin view mode after auth 2020-09-17 20:42:49 +03:00
ismailgulek
58a3906b81 Keep original view mode, fixes 2020-09-17 20:37:52 +03:00
ismailgulek
2299a51ced Add new view states and explanatory label 2020-09-17 20:20:43 +03:00
ismailgulek
d36fca38ae Add setPin view modes after login & registration 2020-09-17 18:34:00 +03:00
ismailgulek
751582fb22 Add strings 2020-09-17 18:29:51 +03:00
ismailgulek
d532f69e86
Merge pull request #3662 from vector-im/element_3660 
Timeline: Hide encrypted history (pre-invite)
 2020-09-17 18:02:39 +03:00
ismailgulek
1421aaa1a9 Update CHANGES.rst 2020-09-17 17:56:54 +03:00
ismailgulek
63d3562e31 Set hidePreJoinedUndecryptableEvents to true 2020-09-17 17:56:42 +03:00
ismailgulek
1b44bc8bf2
Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-17 17:16:39 +03:00
ismailgulek
2bdad52fba
Merge pull request #3659 from vector-im/blocked_pins 
Implementation of Not Allowed PINs
 2020-09-17 16:36:13 +03:00
ismailgulek
be56cf5b7d Merge branch 'blocked_pins' of https://github.com/vector-im/element-ios into blocked_pins 2020-09-17 16:26:49 +03:00
ismailgulek
38b75abb35 Change localization key 2020-09-17 16:22:32 +03:00
ismailgulek
049b96e5cf
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-17 16:20:05 +03:00
ismailgulek
7bc88999e6 Change variables' names 2020-09-17 16:01:08 +03:00
ismailgulek
754db0415a Change view state name 2020-09-17 15:58:25 +03:00
ismailgulek
7e085c9e11 Change view mode name 2020-09-17 15:57:06 +03:00
ismailgulek
9cace44927 Change variable name to notAllowedPINs 2020-09-17 15:55:41 +03:00
ismailgulek
71843c72b0 Update CHANGES.rst 2020-09-17 14:08:20 +03:00
ismailgulek
aa41d75fd4 Implement logic and UI 2020-09-17 14:07:12 +03:00
ismailgulek
9094ed128b Add blockedPin view mode 2020-09-17 14:06:31 +03:00
ismailgulek
9a6780faad Add blocked pins build setting 2020-09-17 14:01:29 +03:00
ismailgulek
a17b9e60a5 Add error string 2020-09-17 14:01:07 +03:00
ismailgulek
9257d38238 Prepare for new sprint 2020-09-16 17:51:36 +03:00
ismailgulek
f59dd097c2 Merge branch 'master' into develop 2020-09-16 17:51:31 +03:00
ismailgulek
3b2634ece5 Merge branch 'release/1.0.12/master' 2020-09-16 17:22:20 +03:00
ismailgulek
43358e3dc2 finish version++ 2020-09-16 17:22:20 +03:00
ismailgulek
099182e08b
Merge pull request #3657 from vector-im/release/1.0.12/release 
Release 1.0.12
 2020-09-16 17:20:24 +03:00
ismailgulek
0d0aba749d Update MatrixKit 2020-09-16 16:38:53 +03:00
ismailgulek
41723f7c05 version++ 2020-09-16 16:36:11 +03:00
ismailgulek
dc5e9b0d0d Update CHANGES.rst 2020-09-16 16:09:42 +03:00
ismailgulek
b41888a9e8 Do not allow reply if protected, also set to be removed 2020-09-16 16:08:02 +03:00
ismailgulek
b87ab2ae83 Do not show content if protection is set 2020-09-16 16:07:09 +03:00
ismailgulek
27ca4803e1 Include some files to NSE target 2020-09-16 16:05:59 +03:00
manuroe
762dfb7666 Prepare for new sprint 2020-09-15 18:37:32 +02:00
manuroe
1e74b52d2c Merge branch 'master' into develop 2020-09-15 18:37:28 +02:00
manuroe
659c094745 Merge branch 'release/1.0.11/master' 2020-09-15 18:37:17 +02:00
manuroe
b2a8dbe964 finish version++ 2020-09-15 18:37:17 +02:00
manuroe
71c8029ae5
Merge pull request #3652 from vector-im/release/1.0.11/release 
Release 1.0.11
 2020-09-15 18:36:41 +02:00
manuroe
5a048fb2c8 version++ 2020-09-15 18:23:52 +02:00
manuroe
510c74386f
Merge pull request #3651 from vector-im/authvc_improvements 
Various improvements for the authentication step
 2020-09-15 18:18:42 +02:00
manuroe
23056d557b AppDelegate: Do not show incoming key verification requests while authenticating. 2020-09-15 17:39:19 +02:00
manuroe
b79e83e24c AppDelegate: Fix missing delegate 2020-09-15 17:27:56 +02:00
manuroe
35aa4b7549 * Loading animation: Fix the bug where, after authentication, the animation disappeared too early and made auth screen flashed. 2020-09-15 16:48:35 +02:00
manuroe
82b4025c3b AuthVC: Make force PIN working for registration as well 2020-09-15 16:47:13 +02:00
manuroe
e760bd81a1 AuthVC: Fix PIN setup that broke cross-signing bootstrap 2020-09-15 16:43:29 +02:00