Commit Graph

10267 Commits

Author SHA1 Message Date
ismailgulek abb27e4d00 Merge pull request #3659 from vector-im/blocked_pins
Implementation of Not Allowed PINs
2020-09-17 16:36:13 +03:00
ismailgulek 1ad0e27d04 Merge branch 'blocked_pins' of https://github.com/vector-im/element-ios into blocked_pins 2020-09-17 16:26:49 +03:00
ismailgulek 097f168ebb Change localization key 2020-09-17 16:22:32 +03:00
ismailgulek baf873f717 Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-17 16:20:05 +03:00
ismailgulek 0bbf71efa7 Change variables' names 2020-09-17 16:01:08 +03:00
ismailgulek 4421eb579e Change view state name 2020-09-17 15:58:25 +03:00
ismailgulek ead4ba4092 Change view mode name 2020-09-17 15:57:06 +03:00
ismailgulek 8936c4e92e Change variable name to notAllowedPINs 2020-09-17 15:55:41 +03:00
ismailgulek 75e9ae14fe Update CHANGES.rst 2020-09-17 14:08:20 +03:00
ismailgulek 7509d25f77 Implement logic and UI 2020-09-17 14:07:12 +03:00
ismailgulek 428076b7c5 Add blockedPin view mode 2020-09-17 14:06:31 +03:00
ismailgulek 16ccde751d Add blocked pins build setting 2020-09-17 14:01:29 +03:00
ismailgulek 6951dd540b Add error string 2020-09-17 14:01:07 +03:00
ismailgulek 7c62c52079 Prepare for new sprint 2020-09-16 17:51:36 +03:00
ismailgulek 429dc21a4d Merge branch 'master' into develop 2020-09-16 17:51:31 +03:00
ismailgulek d368fbd618 Merge branch 'release/1.0.12/master' 2020-09-16 17:22:20 +03:00
ismailgulek 202315154b finish version++ 2020-09-16 17:22:20 +03:00
ismailgulek adc045aba5 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 ddbc674d9b Update MatrixKit 2020-09-16 16:38:53 +03:00
ismailgulek 8f3d506ce0 version++ 2020-09-16 16:36:11 +03:00
ismailgulek a167ed1a7b Update CHANGES.rst 2020-09-16 16:09:42 +03:00
ismailgulek 0d5044e8ba Do not allow reply if protected, also set to be removed 2020-09-16 16:08:02 +03:00
ismailgulek 0c5ec0f5c3 Do not show content if protection is set 2020-09-16 16:07:09 +03:00
ismailgulek 65d5226b58 Include some files to NSE target 2020-09-16 16:05:59 +03:00
manuroe 5b73b49364 Prepare for new sprint 2020-09-15 18:37:32 +02:00
manuroe f899f50e32 Merge branch 'master' into develop 2020-09-15 18:37:28 +02:00
manuroe 59c749d0ac Merge branch 'release/1.0.11/master' 2020-09-15 18:37:17 +02:00
manuroe 5413962b0d finish version++ 2020-09-15 18:37:17 +02:00
manuroe ea25338913 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 fd21827adc version++ 2020-09-15 18:23:52 +02:00
manuroe 2cf5a72c20 Merge pull request #3651 from vector-im/authvc_improvements
Various improvements for the authentication step
2020-09-15 18:18:42 +02:00
manuroe ca7aaab5d4 AppDelegate: Do not show incoming key verification requests while authenticating. 2020-09-15 17:39:19 +02:00
manuroe a330d9dba4 AppDelegate: Fix missing delegate 2020-09-15 17:27:56 +02:00
manuroe d81d03b29a * 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 dfbaf2c9e0 AuthVC: Make force PIN working for registration as well 2020-09-15 16:47:13 +02:00
manuroe dd5f8bfd4e AuthVC: Fix PIN setup that broke cross-signing bootstrap 2020-09-15 16:43:29 +02:00
manuroe f973ef8ca0 AuthVC: Make sure the initial sync is done before checking cross-signing state 2020-09-15 16:42:34 +02:00
ismailgulek 75feafc898 Merge pull request #3650 from vector-im/element_3629
Collapse State Events on Room Creation
2020-09-15 17:39:40 +03:00
ismailgulek ec01d8fc02 Update MatrixKit 2020-09-15 17:37:27 +03:00
ismailgulek 9f57d8584c Fix room display name 2020-09-15 16:45:17 +03:00
ismailgulek 9f041aacdd Remove unused view state 2020-09-15 16:43:34 +03:00
ismailgulek aa51d9fe57 Remove useless operation and cancel viewAction 2020-09-15 16:41:55 +03:00
ismailgulek aad96bda4a Update method doc 2020-09-15 16:39:09 +03:00
ismailgulek e75db5c5f5 Update Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-15 16:36:09 +03:00
ismailgulek 495fac07f0 Update Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-15 16:36:02 +03:00
ismailgulek 9a8e5c55c8 Update Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-15 16:35:55 +03:00
ismailgulek f729905194 Update Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.h
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-15 16:35:47 +03:00
ismailgulek 120c73f888 Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-15 16:35:34 +03:00
ismailgulek e4a1d499ac Add dots to attributed texts programatically 2020-09-15 16:16:38 +03:00
ismailgulek 8409c9352f Remove extra bottom space on iPads 2020-09-15 14:48:40 +03:00