Commit Graph

12797 Commits

Author SHA1 Message Date
SBiOSoftWhare 8938c9c215 MXRoom: Add a method to get user encryption trust level. 2020-02-03 18:59:25 +01:00
SBiOSoftWhare 94a28e443a UserVerificationSessionStatusViewController: Fix wording issue. 2020-02-03 18:07:53 +01:00
SBiOSoftWhare 1717beb063 User verification: Use localization strings. 2020-02-03 17:52:39 +01:00
SBiOSoftWhare 08444abfc9 RoomMemberDetailsViewController: Update security section and use localization strings. 2020-02-03 17:50:52 +01:00
SBiOSoftWhare 396bf25825 Add user verification strings. 2020-02-03 17:48:45 +01:00
Szimszon 9e3910ce7a Translated using Weblate (Hungarian)
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/hu/
2020-02-02 20:23:43 +00:00
Weblate 5f96f394c0 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:49 +00:00
Osoitz 8ffec2b989 Translated using Weblate (Basque)
Currently translated at 99.0% (868 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
2020-02-01 16:26:49 +00:00
Weblate d0b3571749 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
Weblate 8786498a8d Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
manuroe 567d63c852 Merge pull request #2965 from vector-im/fosdem_fixes
Room e2e decoration: Change the algo a bit
2020-02-01 17:26:43 +01:00
manuroe 7f93dc68b7 Room e2e decoration: Change the algo a bit 2020-02-01 17:25:23 +01:00
Weblate 5dc3c24f65 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate 9919fea5e3 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate 9e2142f9ee Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
manuroe dbb4585407 Merge pull request #2961 from vector-im/riot_2959
E2E: Do not warn anymore for unknown devices
2020-01-31 18:01:02 +01:00
Weblate 2ac1a999e4 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate e80cb8ddd0 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate ab737634d2 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
SBiOSoftWhare 23a4139050 Merge pull request #2964 from vector-im/riot_2922_2
Settings: Add session verification screens
2020-01-31 17:54:02 +01:00
SBiOSoftWhare a0613247c3 Settings: Add session verification screens. 2020-01-31 17:46:16 +01:00
SBiOSoftWhare c7a4f1662c User verification: Add possibility to present on session detail from UserVerificationCoordinator. 2020-01-31 17:46:03 +01:00
Weblate b6c14f5211 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate 6ab7005bdf Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate a1fb96b91d Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:14 +00:00
SBiOSoftWhare f60f3e0ad2 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 793667b0d1 Merge branch 'develop' into riot_2924
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2020-01-31 16:45:35 +01:00
Weblate 72b546fe9a Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate 2c9174fad3 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate d4f25bcd8b Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
manuroe ddf838b606 Merge pull request #2963 from vector-im/riot_2906
Room decoration: Make shields bigger
2020-01-31 16:22:12 +01:00
manuroe b7ccbd326f Room decoration: Make shields bigger 2020-01-31 16:20:28 +01:00
Weblate 468311042a Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:14 +00:00
Kévin C 065f86a316 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 44c5c93e4a Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
Weblate 08e330cf9b Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
manuroe d6036ed51c 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 3d942ea8f2 User verification: User device verification flow when verify a session. 2020-01-31 15:09:19 +01:00
SBiOSoftWhare 57568fc769 User verification: Update device verification flow to support device or user verification. 2020-01-31 15:07:30 +01:00
SBiOSoftWhare f23bdddbc1 User verification: Add table view title for session list screen. 2020-01-31 15:03:44 +01:00
SBiOSoftWhare 924eed21a3 Add modules property on NavigationRouterType. 2020-01-31 15:02:02 +01:00
manuroe 3442a69924 Room decoration: Use shields instead of padlocks
#2906
2020-01-31 14:59:54 +01:00
SBiOSoftWhare ba33c192ef Merge branch 'riot_2924' of github.com:vector-im/riot-ios into riot_2924 2020-01-30 21:37:39 +01:00
SBiOSoftWhare 885c26292e Update MXUsersTrustLevelSummary fetch. 2020-01-30 21:37:25 +01:00
Weblate b39a88d383 Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate 896d4f9a20 Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate 3b3b4ba7db Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
manuroe 3fd073efbb Merge pull request #2958 from vector-im/membersTrustLevelSummary_sync
Fix shields
2020-01-30 21:10:07 +01:00
SBiOSoftWhare e356c50470 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 05e1747a77 Update Riot/AppDelegate.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2020-01-30 20:57:51 +01:00