felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-03 22:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,797 Commits 1 Branch 67 Tags
43d4c4e082c4c8d17e46a074e4d19e68c9d7749e
Commit Graph

12797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SBiOSoftWhare e96ff90f01 Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +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
SBiOSoftWhare a11e740d53 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare b044488517 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare 1ef5ea0379 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
Weblate 3e100758ee Merge branch 'origin/develop' into Weblate. 2020-06-26 10:45:05 +00:00
manuroe 6ce4c159a1 Merge pull request #3363 from vector-im/sec_settings 
SecurityVC: Plug UX to set up cross-signing & secure backup
 2020-06-26 12:44:58 +02:00
manuroe 8280d6f244 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:43:26 +02:00
manuroe ee11480ec9 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:38:58 +02:00
manuroe 3c0f9ea05b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:36:57 +02:00
manuroe 72e0b2896c AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe 79c4c39c88 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:22:43 +02:00
manuroe b919fd7ea9 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:41 +02:00
manuroe e2fbd56010 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:34 +02:00
manuroe 2474d2b145 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:24 +02:00
manuroe 90cc4d4c1e Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:16 +02:00
manuroe 60686a2060 SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 0dde018c77 AuthenticatedSessionViewControllerFactory: Add hasSupport 2020-06-26 07:56:10 +02:00
manuroe 023480a6bf Security: Plug UX for cross-signing setup 
part of #3299
 2020-06-26 07:42:37 +02:00
manuroe d0121ecd52 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
manuroe fa1c18a9bf SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
Weblate c83024825c Merge branch 'origin/develop' into Weblate. 2020-06-25 15:56:47 +00:00
random 049c0ad415 Translated using Weblate (Italian) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-06-25 15:56:47 +00:00
Kévin C 888186999c Translated using Weblate (French) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-06-25 15:56:44 +00:00
Slavi Pantaleev 0b48b254bc Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/
 2020-06-25 15:56:42 +00:00
manuroe 6abbb6e7ff Merge pull request #3357 from vector-im/riot_3296 
Security settings: No-design update to add secure backup management
 2020-06-25 17:56:32 +02:00
SBiOSoftWhare 27ca10a665 Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare a028e71aff Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
ismailgulek 5b316ff87c Upgrade version to 0.12.6 2020-06-25 18:23:14 +03:00
manuroe 70a2aef338 Merge branch 'develop' into riot_3296 2020-06-25 17:20:47 +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 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 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 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 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 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
SBiOSoftWhare 8c047b47f5 AuthenticationViewController: Fix refact. 2020-06-25 16:30:47 +02:00
SBiOSoftWhare f9459f55eb Update changes 2020-06-25 16:04:01 +02:00
SBiOSoftWhare e87f8245d1 RecentsDataSource: Handle secure key backup banner display logic. 2020-06-25 16:01:32 +02:00
SBiOSoftWhare 6980d8c05a MXSession: Add convenient method to check if we can setup secure key backup. 2020-06-25 15:58:52 +02:00
ismailgulek a16a82551e Merge pull request #3347 from vector-im/riot_3325 
New Fallback Content for Push Notifications
 2020-06-25 16:30:14 +03:00
ismailgulek a7d7393dd1 Change fallback message for encrypted events 2020-06-25 15:14:57 +03:00
ismailgulek 431acab1b2 Change fallback contents to include room display name 2020-06-25 15:14:14 +03:00
ismailgulek 2a3d8a9dc8 Merge branch 'xcode11' into riot_3325 
# Conflicts:
#	CHANGES.rst
 2020-06-25 14:26:10 +03:00
ismailgulek 1117eb03a5 Refactor fallback method name 2020-06-25 14:23:21 +03:00
ismailgulek bfd2965cbd Refactor best attempt contents variable name 2020-06-25 14:22:16 +03:00
ismailgulek f144bc434c Include room display name in fallback content 2020-06-25 14:18:53 +03:00
SBiOSoftWhare f9db5550b7 HomeVC: Handle secure setup key backup flow presentation. 2020-06-25 11:47:52 +02:00
ismailgulek 262ceb8e99 Pass also roomId to fetch and sync methods 2020-06-25 12:42:07 +03:00
ismailgulek cb2f9973d3 Read badge from payload 2020-06-25 11:48:02 +03:00