Morgan Pretty 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Home/HomeVC.swift # Session/Home/Message Requests/MessageRequestsViewController.swift # Session/Media Viewing & Editing/MediaTileViewController.swift # Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift # SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift		2022-09-15 14:22:11 +10:00
..
DependencyExtensions.swift	Added fixes and defensive coding for a number of crashes	2022-08-30 09:45:40 +10:00
Mockable.swift	Finalised the OpenGroupAPI and more tests	2022-03-15 15:19:23 +11:00
MockAeadXChaCha20Poly1305Ietf.swift	Refactored the mocking code to use a better convention which also allows for call validation	2022-03-11 16:57:28 +11:00
MockBox.swift	Added more unit tests	2022-03-18 16:39:25 +11:00
MockEd25519.swift	Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes	2022-06-09 18:37:44 +10:00
MockGeneralCache.swift	Fixed a couple of bugs and did some more theming	2022-09-13 17:57:13 +10:00
MockGenericHash.swift	Refactored the mocking code to use a better convention which also allows for call validation	2022-03-11 16:57:28 +11:00
MockNonce16Generator.swift	Added more unit tests for the OpenGroupManager	2022-03-17 12:05:04 +11:00
MockNonce24Generator.swift	Added more unit tests for the OpenGroupManager	2022-03-17 12:05:04 +11:00
MockOGMCache.swift	Added fixes and defensive coding for a number of crashes	2022-08-30 09:45:40 +10:00
MockSign.swift	Added more unit tests	2022-03-18 16:39:25 +11:00
MockSodium.swift	Added more unit tests	2022-03-18 16:39:25 +11:00
MockUserDefaults.swift	Fixed the broken unit tests	2022-06-22 14:27:34 +10:00
OGMDependencyExtensions.swift	Added fixes and defensive coding for a number of crashes	2022-08-30 09:45:40 +10:00
TestOnionRequestAPI.swift	Fixed the broken unit tests	2022-07-19 09:22:15 +10:00