ccdf0fca44
Merge branch 'origin/develop' into Weblate.
2020-04-08 16:37:41 +00:00
04335035b9
Merge pull request #3079 from vector-im/rior_3053
...
Key Backup: Use private key if we have it
2020-04-08 18:37:37 +02:00
21f2237af1
Merge remote-tracking branch 'origin/rior_3053' into rior_3053
2020-04-08 18:29:56 +02:00
38e5a1220a
Fix Steve's comment
2020-04-08 18:29:37 +02:00
7ee6dea00a
Update Riot/Modules/KeyBackup/Recover/PrivateKey/KeyBackupRecoverFromPrivateKeyViewState.swift
...
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com >
2020-04-08 18:25:42 +02:00
fd7e5187f7
Merge branch 'origin/develop' into Weblate.
2020-04-08 15:59:12 +00:00
1df58eb071
Merge pull request #3078 from vector-im/riot_2972
...
Make decoration uniform
2020-04-08 17:59:06 +02:00
14f707c2e5
Key Backup: Use legacy screens if the private key does not work
2020-04-08 16:48:12 +02:00
641025fac4
Key Backup: Add a screen for recovering with the local private key
2020-04-08 15:52:04 +02:00
024e45467f
Update changes
2020-04-08 15:10:36 +02:00
955c399fd3
RoomVC: Handle title view encryption trust level badge image
2020-04-08 15:07:24 +02:00
b4f54dc8db
RoomTitleView: Add badge image view.
2020-04-08 15:06:59 +02:00
c13439835a
Use EncryptionTrustLevelBadgeImageHelper where needed.
2020-04-08 15:06:27 +02:00
dae52e6a6d
Add an helper class for encryption trust level badge generation.
2020-04-08 15:05:11 +02:00
de272fcd65
Templates: 2019 -> 2020
2020-04-08 14:05:54 +02:00
203bc41865
RoomCollectionViewCell: Reduce trust level badge size.
2020-04-08 12:51:40 +02:00
1a4c385eb7
ExpandedRoomTitleView: Reduce trust level badge size.
2020-04-08 12:42:12 +02:00
7dbdb7f413
RoomMemberTitleView: Remove power level badge.
2020-04-08 12:38:55 +02:00
824d751980
RoomMemberDetailsViewController: Add power level label instead of badge.
2020-04-08 12:37:52 +02:00
64663310cc
GroupParticipantsViewController: Handle power level label instead of badge.
2020-04-08 12:36:48 +02:00
332d11ca89
RoomParticipantsViewController: Handle power level label instead of badge.
2020-04-08 12:36:34 +02:00
9ce0d59442
ContactTableViewCell: Display power label instead of badge.
2020-04-08 12:35:18 +02:00
f21325cbd7
Add power level localizable strings.
2020-04-08 12:33:28 +02:00
2124554889
RoomPowerLevel: Add dedicated file and convenient init.
2020-04-08 12:32:36 +02:00
81f45357d9
Merge branch 'origin/develop' into Weblate.
2020-04-03 15:42:27 +00:00
40b673ffaa
Merge pull request #3061 from vector-im/riot_3003
...
Cross-signing: Complete security at the end of sign in process
2020-04-03 17:42:22 +02:00
05f2a7354e
Update changes
2020-04-03 17:08:10 +02:00
5f48b38123
AppDelegate: Centralize modal presentation code. Listen to new key verification request only for current session. Prevent new key verification request alert to be presented twice.
2020-04-03 16:33:56 +02:00
2b41ec8edf
AuthenticationViewController: Handle complete security screen presentation.
2020-04-03 16:30:06 +02:00
b97ae46a2e
UserVerificationCoordinator: Update with new KeyVerificationCoordinator init.
2020-04-03 16:28:35 +02:00
8f917b6090
KeyVerificationCoordinatorBridgePresenter: Handle complete security screen.
2020-04-03 16:27:10 +02:00
1242451fca
KeyVerificationCoordinator: Refactor and add a single init with a KeyVerificationFlow enum parameter.
2020-04-03 16:23:32 +02:00
370951a2c6
Implement complete security screen.
2020-04-03 15:55:53 +02:00
b479f23e6d
Merge branch 'origin/develop' into Weblate.
2020-04-01 16:03:44 +00:00
ff7b7fca83
Fix CHANGES
2020-04-01 18:03:36 +02:00
217c3636aa
Merge branch 'origin/develop' into Weblate.
2020-04-01 15:58:04 +00:00
445f9bf1f0
Merge branch 'hotfix/v0.10.5' into develop
2020-04-01 17:56:25 +02:00
e769a7b10e
Fix merge conflict
2020-04-01 17:56:12 +02:00
d23ae092ea
version++
2020-04-01 17:51:38 +02:00
e17597b0ac
Update CHANGES.rst
...
Signed-off-by: Mark Schulte <schultetwin@gmail.com >
2020-04-01 17:49:26 +02:00
72d3d4ef31
AuthFallback: Stay in Riot App
...
When doing a SAML based SSO via Gsuite, I must click a link
specifying that I trust this app. That link will break me
out of the SSO sign-in process, and open up safari.
To fix address this, I've removed the feature that opens links in
safari.
Signed-off-by: Mark Schulte <schultetwin@gmail.com >
2020-04-01 17:49:17 +02:00
1440a25fff
Push notifications: Avoid any automatic deactivation
...
vector-im/riot-ios#3017
2020-04-01 17:35:28 +02:00
1886c4cef3
Fix crash due to malformed widget
2020-04-01 17:34:35 +02:00
b5bd882ac0
Fix issue with joining public rooms with no guest access.
...
This fixes #2888 .
Signed-off-by: Chris Moos <chris@chrismoos.com >
2020-04-01 17:31:31 +02:00
00d352485d
Merge branch 'origin/develop' into Weblate.
2020-04-01 13:57:36 +00:00
845a97b240
Merge pull request #3039 from schultetwin/dont_exit_app_for_sso
...
AuthFallback: Stay in Riot App
2020-04-01 15:57:31 +02:00
d22cdf63d7
Merge branch 'origin/develop' into Weblate.
2020-03-30 08:04:48 +00:00
746df06c37
Merge pull request #3052 from vector-im/riot_2918
...
Cross-Signing: Detect and expose new sign-ins
2020-03-30 10:04:43 +02:00
74351d2eee
Merge branch 'develop' into riot_2918
...
# Conflicts:
# Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
2020-03-30 09:55:40 +02:00
e12c647691
Merge branch 'origin/develop' into Weblate.
2020-03-30 06:58:55 +00:00
Weblate
manuroe
manuroe
SBiOSoftWhare
SBiOSoftWhare
Mark Schulte
Chris Moos