Commit Graph

12250 Commits

Author SHA1 Message Date
SBiOSoftWhare fd56402ea5 Merge pull request #2968 from vector-im/riot_2966
Decoration: Display shields in room members list
2020-02-04 10:10:29 +01:00
SBiOSoftWhare c81d04b2db ContactTableViewCell: Handle trust level shields decoration. 2020-02-03 19:01:47 +01:00
SBiOSoftWhare 4b8127e070 RoomMemberDetailsViewController: Get user encryption trust level with MXRoom. 2020-02-03 19:00:33 +01:00
SBiOSoftWhare 74803d1ebb MXRoom: Add a method to get user encryption trust level. 2020-02-03 18:59:25 +01:00
SBiOSoftWhare c9e34cd599 UserVerificationSessionStatusViewController: Fix wording issue. 2020-02-03 18:07:53 +01:00
SBiOSoftWhare a5780a517e User verification: Use localization strings. 2020-02-03 17:52:39 +01:00
SBiOSoftWhare 2b57e98bfe RoomMemberDetailsViewController: Update security section and use localization strings. 2020-02-03 17:50:52 +01:00
SBiOSoftWhare 307597c941 Add user verification strings. 2020-02-03 17:48:45 +01:00
Szimszon be8899b896 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 9bdeac0418 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:49 +00:00
Osoitz 928bb83c8c 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 a3ca250c3c Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
Weblate 45123676a0 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
manuroe 69d89e8b85 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 89bfa95a29 Room e2e decoration: Change the algo a bit 2020-02-01 17:25:23 +01:00
Weblate 034a539be0 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate 9c9a0f1cf3 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate cc7993fcc7 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
manuroe 19499a2240 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 af24da802a Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate 4020ea6417 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate 767eabae21 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
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