7051 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	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	6ab7005bdf	Merge branch 'origin/develop' into Weblate.	2020-01-31 15:54:15 +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	2c9174fad3	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	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	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
manuroe	17ae756c64	E2E: Do not warn anymore for unknown devices ... # 2959	2020-01-30 18:13:49 +01:00
SBiOSoftWhare	d3648cfcb4	Update pbxproj	2020-01-30 18:05:55 +01:00
SBiOSoftWhare	0e0bc5557e	User verification: Update room member details screen with security section and shields.	2020-01-30 18:05:41 +01:00
SBiOSoftWhare	11eb717bb8	User verification: Handle start user verification flow through AppDelegate.	2020-01-30 17:59:42 +01:00
SBiOSoftWhare	6baec47dfd	User verification: Add start user verification flow to DeviceVerificationCoordinator.	2020-01-30 17:57:09 +01:00
SBiOSoftWhare	0e1a60389e	User verification: Implement user session status flow coordinator.	2020-01-30 17:55:36 +01:00
SBiOSoftWhare	a2a9e78b2f	User verification: Implement session list status screen.	2020-01-30 17:54:03 +01:00
manuroe	26813e0379	Shields: Shields in one self room should be green if I have no other device	2020-01-30 17:48:22 +01:00
SBiOSoftWhare	751cf92d89	User verification: Create UserEncryptionTrustLevel enum.	2020-01-30 17:42:54 +01:00
SBiOSoftWhare	458a8952d1	User verification: Implement single session status screen.	2020-01-30 17:41:51 +01:00
SBiOSoftWhare	50d146c6cd	User verification: Implement start user verification screen.	2020-01-30 17:38:33 +01:00
manuroe	cb2398da48	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	67544997ab	Merge branch 'origin/develop' into Weblate.	2020-01-30 15:13:19 +00:00
manuroe	5593598d3f	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	59fd9e12b5	E2E by default: canEnableE2EByDefaultInNewRoomWithUsers is now defined in the SDK	2020-01-30 16:08:58 +01:00
Weblate	59b48ac264	Merge branch 'origin/develop' into Weblate.	2020-01-30 13:17:20 +00:00
manuroe	242164b1e5	Merge pull request #2952 from vector-im/riot_2922 ... Settings: Add a dedicated screen for Security	2020-01-30 14:17:15 +01:00
manuroe	620952ecab	Settings > Security: Fix file name	2020-01-30 13:24:13 +01:00
manuroe	dc0fb2024f	Settings > Security: Fix Giom's remarks	2020-01-30 13:19:09 +01:00
manuroe	46a6979ee3	Settings: More cleaning	2020-01-30 07:14:35 +01:00
manuroe	8dbb4c229c	Settings: Remove code for things that have their own screen now	2020-01-30 07:12:05 +01:00
manuroe	60748eaf0a	Settings: Remove code for things that have their own screen now	2020-01-30 07:01:10 +01:00