0a61819a7e
Merge branch 'develop' into support-other-browsers
2020-09-30 10:51:44 -05:00
7b2f9087f8
Merge branch 'develop' into element_3672
...
# Conflicts:
# CHANGES.rst
2020-09-30 17:31:38 +03:00
d58b35fc25
Merge branch 'develop' into protection_fine_tuning
...
# Conflicts:
# CHANGES.rst
# Riot/Assets/en.lproj/Vector.strings
2020-09-30 15:19:32 +03:00
1feb05e100
Merge branch 'develop' into handleAppState
2020-09-30 13:31:01 +02:00
cafa35ef2d
Merge branch 'develop' into theme_fixes
2020-09-30 14:28:14 +03:00
5136428cb3
Merge branch 'develop' into element_3672
...
# Conflicts:
# CHANGES.rst
2020-09-30 12:32:40 +03:00
dbaaeee20f
Add changelog
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2020-09-30 00:57:05 -05:00
54e79eb177
Update CHANGES.rst
2020-09-29 18:45:52 +03:00
5d40ae1f70
Merge branch 'develop' into protection_fine_tuning
2020-09-29 18:33:22 +03:00
403a337f4c
BF: PIN Code: Do not show verification dialog at the top of PIN code.
2020-09-29 17:02:02 +02:00
a7edf4afef
Update CHANGES.rst
2020-09-29 17:17:29 +03:00
df36e72843
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
f5d861fe11
Merge branch 'develop' into hide_push_content_on_pin_protection
2020-09-29 12:18:42 +03:00
f406b20597
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
94901987c1
Merge branch 'develop' into wording_for_dm
2020-09-25 16:49:41 +03:00
2660d7c630
Update CHANGES.rst
2020-09-25 14:55:01 +03:00
65cbdf17e8
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
024333b127
Merge branch 'develop' into complete_security_allow_device_verification_retry
2020-09-25 09:24:25 +02:00
94314fef54
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
081c10e5a9
Merge branch 'develop' into convert_to_coordinators
...
# Conflicts:
# CHANGES.rst
2020-09-24 14:13:53 +03:00
47ab675f73
Fix changes.
2020-09-24 12:32:29 +02:00
47bd8a656b
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
89e4b6d10c
Update CHANGES.rst
2020-09-23 16:54:41 +03:00
96988e1a0c
Merge branch 'develop' into hide_push_content_on_pin_protection
2020-09-22 14:23:15 +03:00
26bbab66d5
Merge branch 'develop' into new_room_settings
2020-09-22 14:22:47 +03:00
7002c376b0
Merge branch 'develop' into theme_fixes
2020-09-22 14:19:55 +03:00
b463683de3
Update CHANGES.rst
2020-09-22 14:18:06 +03:00
ef99780f76
Update CHANGES.rst
2020-09-21 17:27:45 +03:00
cc2e7e3be4
Update CHANGES.rst
2020-09-21 17:07:19 +03:00
255d466b1e
Update CHANGES.rst
2020-09-17 17:56:54 +03:00
553082cc80
Merge branch 'develop' into hide_push_content_on_pin_protection
2020-09-17 17:16:39 +03:00
baf873f717
Update CHANGES.rst
...
Co-authored-by: manuroe <manuroe@users.noreply.github.com >
2020-09-17 16:20:05 +03:00
75e9ae14fe
Update CHANGES.rst
2020-09-17 14:08:20 +03:00
7c62c52079
Prepare for new sprint
2020-09-16 17:51:36 +03:00
8f3d506ce0
version++
2020-09-16 16:36:11 +03:00
a167ed1a7b
Update CHANGES.rst
2020-09-16 16:09:42 +03:00
5b73b49364
Prepare for new sprint
2020-09-15 18:37:32 +02:00
fd21827adc
version++
2020-09-15 18:23:52 +02:00
ca7aaab5d4
AppDelegate: Do not show incoming key verification requests while authenticating.
2020-09-15 17:39:19 +02:00
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
dfbaf2c9e0
AuthVC: Make force PIN working for registration as well
2020-09-15 16:47:13 +02:00
120c73f888
Update CHANGES.rst
...
Co-authored-by: manuroe <manuroe@users.noreply.github.com >
2020-09-15 16:35:34 +03:00
24c41c1dbd
Update CHANGES.rst
2020-09-14 19:45:54 +03:00
d2b63d14da
Merge pull request #3644 from vector-im/element_3627
...
Contextualize Floating Button Actions
2020-09-10 18:14:47 +03:00
41de5586d8
Update CHANGES.rst
2020-09-09 14:42:49 +03:00
ae3eb8b315
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
55161582ce
Prepare for new sprint
2020-09-08 15:04:08 +02:00
366421a425
version++
2020-09-08 13:44:53 +02:00
9b6a926eac
Update CHANGES.rst
2020-09-07 18:12:00 +03:00
757bab190f
Update CHANGES.rst
2020-09-07 13:52:52 +03:00
Aaron Raimist
ismailgulek
manuroe
ismailgulek
manuroe
SBiOSoftWhare
ismailgulek