Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
9414 commits 46 branches 261 tags 144 MiB
Commit graph

648 commits

Author SHA1 Message Date
ismailgulek
6ef778debb Update CHANGES.rst 2020-10-06 01:01:00 +03:00
ismailgulek
0ceceb183a
Merge pull request #3716 from vector-im/fix_pin_code_layout 
Fix Pin Code Screen Layout
 2020-10-05 10:54:54 +03:00
SBiOSoftWhare
720bf97c9d Prepare for new sprint 2020-10-02 15:57:10 +02:00
SBiOSoftWhare
f624831df7 version++ 2020-10-02 14:40:50 +02:00
ismailgulek
31322e7cb6 Update CHANGES.rst 2020-10-02 14:18:33 +03:00
ismailgulek
376e5b306c
Merge branch 'develop' into element_3679 2020-10-01 19:06:33 +03:00
ismailgulek
891148d98f
Merge pull request #3709 from vector-im/handle_retry_on_biometrics 
Handle Retry on Biometrics
 2020-10-01 19:06:03 +03:00
manuroe
0c036e4cc2 MXSession: Make sure vc_canSetupSecureBackup is reusable 
Put specific additional check out of this method
 2020-10-01 16:46:32 +02:00
ismailgulek
0e8178d5cb Update CHANGES.rst 2020-10-01 17:45:04 +03:00
ismailgulek
d2d127fe12 Merge branch 'develop' into element_3679 
# Conflicts:
#	CHANGES.rst
 2020-10-01 17:21:57 +03:00
ismailgulek
6ff5842e61 Update CHANGES.rst 2020-10-01 17:20:56 +03:00
SBiOSoftWhare
a4474bdeb3
Merge branch 'develop' into support-other-browsers 2020-10-01 15:46:11 +02:00
ismailgulek
a7df74ac8e
Merge pull request #3707 from vector-im/element_3677 
Handle Call Actions on Other Devices on VoIP Pushes
 2020-10-01 15:57:00 +03:00
SBiOSoftWhare
d256c58527
Merge pull request #3706 from vector-im/element_3688 
i18n: Add Estonian language
 2020-10-01 13:22:40 +02:00
ismailgulek
02565f3d9a
Merge branch 'develop' into element_3677 2020-10-01 14:22:26 +03:00
ismailgulek
cd0d47186d Update CHANGES.rst 2020-10-01 14:05:53 +03:00
SBiOSoftWhare
efb33f8280 Update changes 2020-10-01 12:46:16 +02:00
SBiOSoftWhare
76216be797 Update changes 2020-10-01 12:27:53 +02:00
ismailgulek
fe3b318ab3 Merge branch 'develop' into element_3672 2020-10-01 12:37:00 +03:00
Aaron Raimist
b0a7cb979f
Merge branch 'develop' into support-other-browsers 2020-09-30 18:42:36 -05:00
manuroe
d26458e4a5 Prepare for new sprint 2020-09-30 19:01:20 +02:00
manuroe
9c9fb8e590
CHANGES: Sort items 2020-09-30 18:49:51 +02:00
manuroe
eefdcf4bc5 version++ 2020-09-30 18:42:21 +02:00
SBiOSoftWhare
03684618a9 Update changes 2020-09-30 18:08:43 +02:00
SBiOSoftWhare
2ad54cce66 Update changes 2020-09-30 18:01:16 +02:00
Aaron Raimist
49e7aed444
Merge branch 'develop' into support-other-browsers 2020-09-30 10:51:44 -05:00
ismailgulek
7018444e7d Merge branch 'develop' into element_3672 
# Conflicts:
#	CHANGES.rst
 2020-09-30 17:31:38 +03:00
ismailgulek
e05d93884f Merge branch 'develop' into protection_fine_tuning 
# Conflicts:
#	CHANGES.rst
#	Riot/Assets/en.lproj/Vector.strings
 2020-09-30 15:19:32 +03:00
manuroe
8f7a06c77d
Merge branch 'develop' into handleAppState 2020-09-30 13:31:01 +02:00
ismailgulek
469c857a3c
Merge branch 'develop' into theme_fixes 2020-09-30 14:28:14 +03:00
ismailgulek
0d0bcb68fc Merge branch 'develop' into element_3672 
# Conflicts:
#	CHANGES.rst
 2020-09-30 12:32:40 +03:00
Aaron Raimist
09616173bf
Add changelog 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-09-30 00:57:05 -05:00
ismailgulek
e6110dfe4c
Update CHANGES.rst 2020-09-29 18:45:52 +03:00
ismailgulek
309e1f1c26
Merge branch 'develop' into protection_fine_tuning 2020-09-29 18:33:22 +03:00
manuroe
a91c60dcf5 BF: PIN Code: Do not show verification dialog at the top of PIN code. 2020-09-29 17:02:02 +02:00
ismailgulek
c3b80e1e81 Update CHANGES.rst 2020-09-29 17:17:29 +03:00
manuroe
670647e2e2 AppDelegate: Create handleAppState as central point to handle application state 
It is not complete. It is not yet a reducer. This is a start. At least, the state is no more managed by the launch screen
 2020-09-29 15:15:32 +02:00
ismailgulek
db8ab5ea7c
Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-29 12:18:42 +03:00
ismailgulek
2dacc99110 Merge branch 'develop' into hide_push_content_on_pin_protection 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
 2020-09-28 14:23:11 +03:00
ismailgulek
65f6dfcc7b Merge branch 'develop' into wording_for_dm 2020-09-25 16:49:41 +03:00
ismailgulek
3fb3f21090 Update CHANGES.rst 2020-09-25 14:55:01 +03:00
manuroe
7fae7c287f Complete Security: Make sure the authentication flow display it if auth is not complete yet 
The complete security flow can be unfortunately triggered from 2 places: AuthVC and MasterTabBarC.

On a fresh app installation, during authentication, it was unexpectedly displayed from MasterTabBarC. This prevented authentication flow to complete. The app stayed on the launching animation.

This commit fixes this race.
 2020-09-25 13:06:34 +02:00
manuroe
7c1fa2f922
Merge branch 'develop' into complete_security_allow_device_verification_retry 2020-09-25 09:24:25 +02:00
manuroe
b3c9cd26f6 Complete Security: Come back to the root screen if device verification is cancelled 
So that the user can retry to verify with another device
 2020-09-25 08:58:57 +02:00
ismailgulek
84c01e239c Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
 2020-09-24 14:13:53 +03:00
SBiOSoftWhare
e6b116b875 Fix changes. 2020-09-24 12:32:29 +02:00
SBiOSoftWhare
5ac652536b Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
 2020-09-24 11:37:24 +02:00
ismailgulek
3d8ecd65be Update CHANGES.rst 2020-09-23 16:54:41 +03:00
ismailgulek
8648a95aeb Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-22 14:23:15 +03:00
ismailgulek
91bce1f60d Merge branch 'develop' into new_room_settings 2020-09-22 14:22:47 +03:00