Commit Graph

272 Commits

Author SHA1 Message Date
SBiOSoftWhare fe468c0c09 Theme: Update disclosure indicator with theme color. 2020-07-16 23:16:11 +02:00
SBiOSoftWhare 3a5c549607 Theme: Update disclosure indicator with theme color. 2020-07-16 23:16:11 +02:00
ismailgulek 31c89bf4f8 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
ismailgulek bd1bb3b952 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
manuroe c05eb10491 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe 73ea84d33b SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe 759ad91e9f SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe 8a45ae14aa SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe 52f3605914 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe 7dd0fb2c60 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe fc55dfb55c SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe 7498d86797 SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe 13cbfc9741 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 1703ec8ab4 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 06c21ecf06 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
manuroe 7e97422624 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
ismailgulek b1acd2ad24 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare a433e3647e Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare e96ff90f01 Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare b1908231f7 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
SBiOSoftWhare ede85f9806 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
manuroe e37d2cef0d SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 60686a2060 SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe df188da49b Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe 023480a6bf Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe 47cb148537 SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
manuroe fa1c18a9bf SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
manuroe ddda57feff Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:17:04 +02:00
manuroe 998c602614 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:17:04 +02:00
manuroe 539c1feb5a Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:51 +02:00
manuroe 0b59c68269 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:51 +02:00
manuroe 122edffb63 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:44 +02:00
manuroe 86b1154a56 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:44 +02:00
manuroe 85ab663503 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:32 +02:00
manuroe 07878eeb20 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:32 +02:00
manuroe d80f0e6316 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:25 +02:00
manuroe 4c7067e8c6 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:25 +02:00
manuroe ed15566b4e Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:03 +02:00
manuroe c60eb0c140 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:03 +02:00
manuroe a41eedadc1 SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe 7d2b80e129 SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe 4fe62f1195 SecurityVC: Add warning if we do not have the MSK 2020-06-24 11:43:50 +02:00
manuroe 643d4e3fba SecurityVC: Add warning if we do not have the MSK 2020-06-24 11:43:50 +02:00
manuroe 774a32f5bf SecurityVC: Add Secure backup status 2020-06-24 11:43:41 +02:00
manuroe a24d3f47b9 SecurityVC: Add Secure backup status 2020-06-24 11:43:41 +02:00
manuroe f7879c4238 SecurityVC: Add cross-signing reset. Stub things using test passwords 2020-06-19 09:32:27 +02:00
manuroe e50f1a0856 SecurityVC: Add cross-signing reset. Stub things using test passwords 2020-06-19 09:32:27 +02:00
manuroe 9c8d3947b7 SecurityVC: Delete a secure backup 2020-06-19 08:00:22 +02:00
manuroe 296a60a8ed SecurityVC: Delete a secure backup 2020-06-19 08:00:22 +02:00