Commit Graph

13178 Commits

Author SHA1 Message Date
SBiOSoftWhare 35a6177fb2 Merge pull request #2964 from vector-im/riot_2922_2
Settings: Add session verification screens
2020-01-31 17:54:02 +01:00
SBiOSoftWhare b54fd54ff1 Settings: Add session verification screens. 2020-01-31 17:46:16 +01:00
SBiOSoftWhare 7a9ed64fac User verification: Add possibility to present on session detail from UserVerificationCoordinator. 2020-01-31 17:46:03 +01:00
Weblate 952ecd31de Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate f3eb3c71b8 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate 87d12e1db4 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:14 +00:00
SBiOSoftWhare 988c504940 Merge pull request #2960 from vector-im/riot_2924
Cross-signing: New room member screen design (WIP)
2020-01-31 16:54:09 +01:00
SBiOSoftWhare 3ed104b16d Merge branch 'develop' into riot_2924
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2020-01-31 16:45:35 +01:00
Weblate e47b5f0a7f Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate 462f6e63d9 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate 7a72215473 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
manuroe 849cc0d483 Merge pull request #2963 from vector-im/riot_2906
Room decoration: Make shields bigger
2020-01-31 16:22:12 +01:00
manuroe 7ccc5740e2 Room decoration: Make shields bigger 2020-01-31 16:20:28 +01:00
Weblate c3c4435b48 Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:14 +00:00
Kévin C f522504101 Translated using Weblate (French)
Currently translated at 100.0% (877 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2020-01-31 14:59:14 +00:00
Weblate b86afa455c Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
Weblate f1bf133e9e Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
manuroe 23078e4196 Merge pull request #2962 from vector-im/riot_2906
Room decoration: Use shields instead of padlocks
2020-01-31 15:59:07 +01:00
SBiOSoftWhare edcafe3925 User verification: User device verification flow when verify a session. 2020-01-31 15:09:19 +01:00
SBiOSoftWhare 58b08cc51c User verification: Update device verification flow to support device or user verification. 2020-01-31 15:07:30 +01:00
SBiOSoftWhare 7380baf114 User verification: Add table view title for session list screen. 2020-01-31 15:03:44 +01:00
SBiOSoftWhare 4789a6ef0e Add modules property on NavigationRouterType. 2020-01-31 15:02:02 +01:00
manuroe babec2ff28 Room decoration: Use shields instead of padlocks
#2906
2020-01-31 14:59:54 +01:00
SBiOSoftWhare 6c8d9da7da Merge branch 'riot_2924' of github.com:vector-im/riot-ios into riot_2924 2020-01-30 21:37:39 +01:00
SBiOSoftWhare a0d87b740b Update MXUsersTrustLevelSummary fetch. 2020-01-30 21:37:25 +01:00
Weblate 4a828f91db Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate ddda8eca69 Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate 14a73b841e Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
manuroe 66a2a366fd Merge pull request #2958 from vector-im/membersTrustLevelSummary_sync
Fix shields
2020-01-30 21:10:07 +01:00
SBiOSoftWhare ec47e964b8 Update Riot/Modules/UserVerification/Start/UserVerificationStartViewModelType.swift
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2020-01-30 20:58:12 +01:00
SBiOSoftWhare b8c7c4f5cb Update Riot/AppDelegate.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2020-01-30 20:57:51 +01:00
manuroe ae99baa2db E2E: Do not warn anymore for unknown devices
# 2959
2020-01-30 18:13:49 +01:00
SBiOSoftWhare 470dd63c4f Update pbxproj 2020-01-30 18:05:55 +01:00
SBiOSoftWhare 03264f2db6 User verification: Update room member details screen with security section and shields. 2020-01-30 18:05:41 +01:00
SBiOSoftWhare d95dfb4924 User verification: Handle start user verification flow through AppDelegate. 2020-01-30 17:59:42 +01:00
SBiOSoftWhare 5e19a345d8 User verification: Add start user verification flow to DeviceVerificationCoordinator. 2020-01-30 17:57:09 +01:00
SBiOSoftWhare 86ae300586 User verification: Implement user session status flow coordinator. 2020-01-30 17:55:36 +01:00
SBiOSoftWhare ce91ee0548 User verification: Implement session list status screen. 2020-01-30 17:54:03 +01:00
manuroe aeaf99d0d2 Shields: Shields in one self room should be green if I have no other device 2020-01-30 17:48:22 +01:00
SBiOSoftWhare b23b18a6a5 User verification: Create UserEncryptionTrustLevel enum. 2020-01-30 17:42:54 +01:00
SBiOSoftWhare 1a40f056f1 User verification: Implement single session status screen. 2020-01-30 17:41:51 +01:00
SBiOSoftWhare 01c77a91b5 User verification: Implement start user verification screen. 2020-01-30 17:38:33 +01:00
manuroe 3c4383534a Room Shield: Use sync version of [MXRoom membersTrustLevelSummary:]
https://github.com/vector-im/riot-ios/issues/2956
to break keys downloads in loop
2020-01-30 17:16:53 +01:00
Weblate 7f9ab168ba Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
Weblate 4f31c3b8ab Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
Weblate 80e6338064 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
manuroe aac36ea6f4 Merge pull request #2955 from vector-im/riot_2957
E2E by default: canEnableE2EByDefaultInNewRoomWithUsers is now define…
2020-01-30 16:13:13 +01:00
manuroe 91d5452c11 E2E by default: canEnableE2EByDefaultInNewRoomWithUsers is now defined in the SDK 2020-01-30 16:08:58 +01:00
Weblate f1f0094d7e Merge branch 'origin/develop' into Weblate. 2020-01-30 13:17:22 +00:00
random 61259d9301 Translated using Weblate (Italian)
Currently translated at 100.0% (862 of 862 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-01-30 13:17:22 +00:00