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
9246 commits 46 branches 261 tags 144 MiB
Commit graph

605 commits

Author SHA1 Message Date
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
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
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
ismailgulek
cbc2e44da9 Update CHANGES.rst 2020-09-21 17:27:45 +03:00
ismailgulek
703675ad30 Update CHANGES.rst 2020-09-21 17:07:19 +03:00
ismailgulek
1421aaa1a9 Update CHANGES.rst 2020-09-17 17:56:54 +03:00
ismailgulek
1b44bc8bf2
Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-17 17:16:39 +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
71843c72b0 Update CHANGES.rst 2020-09-17 14:08:20 +03:00
ismailgulek
9257d38238 Prepare for new sprint 2020-09-16 17:51:36 +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
manuroe
762dfb7666 Prepare for new sprint 2020-09-15 18:37:32 +02:00
manuroe
5a048fb2c8 version++ 2020-09-15 18:23:52 +02:00
manuroe
23056d557b AppDelegate: Do not show incoming key verification requests while authenticating. 2020-09-15 17:39:19 +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
ismailgulek
4b8e0cc71e
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-15 16:35:34 +03:00
ismailgulek
fd4eea31f5 Update CHANGES.rst 2020-09-14 19:45:54 +03:00
ismailgulek
4013bfde1e
Merge pull request #3644 from vector-im/element_3627 
Contextualize Floating Button Actions
 2020-09-10 18:14:47 +03:00
ismailgulek
1f58cc6689 Update CHANGES.rst 2020-09-09 14:42:49 +03:00
manuroe
377310ef36 buildRelease.sh: Pass a git_tag parameter to fastlane 
because fastlane `git_branch` method can fail.

It fails when using ./buildRelease.sh with a tag.
 2020-09-08 17:39:51 +02:00
manuroe
a3e811aef3 Prepare for new sprint 2020-09-08 15:04:08 +02:00
manuroe
672d27ad4e version++ 2020-09-08 13:44:53 +02:00
ismailgulek
7fc735a3fa Update CHANGES.rst 2020-09-07 18:12:00 +03:00
ismailgulek
48f3985f79 Update CHANGES.rst 2020-09-07 13:52:52 +03:00
ismailgulek
fb424ed613 Update CHANGES.rst 2020-09-07 13:09:02 +03:00
SBiOSoftWhare
8f61b84fe7 Update changes. 2020-09-07 10:11:20 +02:00
SBiOSoftWhare
c582260888 Merge branch 'develop' into element_3594 
# Conflicts:
#	CHANGES.rst
 2020-09-04 12:35:08 +02:00
manuroe
f91c932b1c CHANGES 2020-09-03 15:57:21 +02:00
manuroe
61c25c9a42 Fix CHANGES 2020-09-03 14:31:02 +02:00
manuroe
5f10152f32 Prepare for new sprint 2020-09-03 14:11:49 +02:00
manuroe
d80cfa2694 version++ 2020-09-03 13:14:49 +02:00
manuroe
7208b24776 Prepare for new sprint 2020-09-03 12:24:34 +02:00
manuroe
db098e49e0 version++ 2020-09-03 10:05:45 +02:00
manuroe
eda09b9e93 PushKit: Check all registered pushers and remove PushKit ones 2020-09-02 17:00:05 +02:00
SBiOSoftWhare
04083c72cb Update changes 2020-08-31 19:43:11 +02:00
manuroe
3dec5d95a4 PushKit pusher: Add more logs when removing it 
#3577
 2020-08-31 16:42:21 +02:00
ismailgulek
f3e11a4dec Prepare for new sprint 2020-08-28 16:51:39 +03:00
ismailgulek
85af8e0831 version++ 2020-08-28 14:02:10 +03:00
ismailgulek
9b9be8c75e Update CHANGES.rst 2020-08-28 13:18:29 +03:00
ismailgulek
29023d99cf Merge branch 'develop' into element_3577 
# Conflicts:
#	CHANGES.rst
 2020-08-27 17:59:51 +03:00
ismailgulek
9a227885de Update CHANGES.rst 2020-08-27 17:58:24 +03:00
ismailgulek
d13faf9db2 Update CHANGES.rst 2020-08-27 12:30:09 +03:00