Morgan Pretty f4d6babca2 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Podfile.lock # Session.xcodeproj/project.pbxproj # Session/Closed Groups/EditClosedGroupVC.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Home/HomeVC.swift # Session/Home/HomeViewModel.swift # Session/Meta/Translations/de.lproj/Localizable.strings # Session/Meta/Translations/en.lproj/Localizable.strings # Session/Meta/Translations/es.lproj/Localizable.strings # Session/Meta/Translations/fa.lproj/Localizable.strings # Session/Meta/Translations/fi.lproj/Localizable.strings # Session/Meta/Translations/fr.lproj/Localizable.strings # Session/Meta/Translations/hi.lproj/Localizable.strings # Session/Meta/Translations/hr.lproj/Localizable.strings # Session/Meta/Translations/id-ID.lproj/Localizable.strings # Session/Meta/Translations/it.lproj/Localizable.strings # Session/Meta/Translations/ja.lproj/Localizable.strings # Session/Meta/Translations/nl.lproj/Localizable.strings # Session/Meta/Translations/pl.lproj/Localizable.strings # Session/Meta/Translations/pt_BR.lproj/Localizable.strings # Session/Meta/Translations/ru.lproj/Localizable.strings # Session/Meta/Translations/si.lproj/Localizable.strings # Session/Meta/Translations/sk.lproj/Localizable.strings # Session/Meta/Translations/sv.lproj/Localizable.strings # Session/Meta/Translations/th.lproj/Localizable.strings # Session/Meta/Translations/vi-VN.lproj/Localizable.strings # Session/Meta/Translations/zh-Hant.lproj/Localizable.strings # Session/Meta/Translations/zh_CN.lproj/Localizable.strings # Session/Shared/FullConversationCell.swift # SessionMessagingKit/Configuration.swift # SessionMessagingKit/Database/Models/SessionThread.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionUIKit/Utilities/UIContextualAction+Theming.swift # SessionUtilitiesKit/Database/Models/Job.swift # SessionUtilitiesKit/General/Dictionary+Utilities.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift		2023-04-06 18:09:26 +10:00
..
LegacyDatabase	Added a restore account button to the failed migrations alert	2022-06-23 17:30:18 +10:00
Migrations	Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling	2023-02-01 18:12:36 +11:00
Models	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
Types	Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling	2023-02-01 18:12:36 +11:00
Utilities	Fixed issues raised during QA	2023-03-17 15:12:35 +11:00
OWSFileSystem.h	Re-organize files	2020-12-18 15:37:29 +11:00
OWSFileSystem.m	Re-organize files	2020-12-18 15:37:29 +11:00
SSKKeychainStorage.swift	Started work on GRDB logic and migrations	2022-03-31 11:47:09 +11:00
Storage.swift	Updated to the latest version of libSession-util	2023-02-20 12:56:48 +11:00
StorageError.swift	Updated to the latest lib, started handling UserGroups	2023-02-28 17:23:56 +11:00