felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 14:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,250 Commits 1 Branch 67 Tags
165e4e2039a8d4356169b0776c4e06cfa793a4e7
Commit Graph

12250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
 2020-06-26 17:33:09 +03:00
Weblate 562a3e63d6 Merge branch 'origin/develop' into Weblate. 2020-06-26 12:37:09 +00:00
SBiOSoftWhare 0ee1a3a783 Merge pull request #3359 from vector-im/riot_3293 
Set up SSSS from banners
 2020-06-26 14:37:03 +02:00
SBiOSoftWhare a433e3647e 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 dfb5627126 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare f353d69c14 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare f3f1654007 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
Weblate 2c95323a1f Merge branch 'origin/develop' into Weblate. 2020-06-26 10:45:05 +00:00
manuroe 74a0f7adee 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 6e6ea6b672 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:43:26 +02:00
manuroe 34bf39679b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:38:58 +02:00
manuroe 68642f150f Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:36:57 +02:00
manuroe f2d41b6b8c AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe c00d482ba7 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:22:43 +02:00
manuroe 2abecd28a6 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:41 +02:00
manuroe 85c3921bbb Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:34 +02:00
manuroe d538a31847 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:24 +02:00
manuroe bbdb8d790b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:16 +02:00
manuroe e37d2cef0d SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 8fd9d815cb AuthenticatedSessionViewControllerFactory: Add hasSupport 2020-06-26 07:56:10 +02:00
manuroe df188da49b Security: Plug UX for cross-signing setup 
part of #3299
 2020-06-26 07:42:37 +02:00
manuroe b378080857 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
manuroe 47cb148537 SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
Weblate ea17df59c4 Merge branch 'origin/develop' into Weblate. 2020-06-25 15:56:47 +00:00
random 7a240f5abe 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 42749f6eb1 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 d94736e012 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 8e3968d693 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 7c749a026f Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare 057890dd52 Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
ismailgulek 102c68a666 Upgrade version to 0.12.6 2020-06-25 18:23:14 +03:00
manuroe 75b80248d8 Merge branch 'develop' into riot_3296 2020-06-25 17:20:47 +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 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 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 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 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 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
SBiOSoftWhare 40bdba8ac0 AuthenticationViewController: Fix refact. 2020-06-25 16:30:47 +02:00
SBiOSoftWhare 899cd783ed Update changes 2020-06-25 16:04:01 +02:00
SBiOSoftWhare 2c30d7daa2 RecentsDataSource: Handle secure key backup banner display logic. 2020-06-25 16:01:32 +02:00
SBiOSoftWhare 65a60cac9c MXSession: Add convenient method to check if we can setup secure key backup. 2020-06-25 15:58:52 +02:00
ismailgulek 80cb9d0953 Merge pull request #3347 from vector-im/riot_3325 
New Fallback Content for Push Notifications
 2020-06-25 16:30:14 +03:00
ismailgulek 8d98ba8eeb Change fallback message for encrypted events 2020-06-25 15:14:57 +03:00
ismailgulek 1592910ccc Change fallback contents to include room display name 2020-06-25 15:14:14 +03:00
ismailgulek ff09d626b3 Merge branch 'xcode11' into riot_3325 
# Conflicts:
#	CHANGES.rst
 2020-06-25 14:26:10 +03:00
ismailgulek efa8001f50 Refactor fallback method name 2020-06-25 14:23:21 +03:00
ismailgulek 6a996a0f8a Refactor best attempt contents variable name 2020-06-25 14:22:16 +03:00
ismailgulek f479592b85 Include room display name in fallback content 2020-06-25 14:18:53 +03:00