Morgan Pretty 4f8fb63f2c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Session/Media Viewing & Editing/PhotoCapture.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/Notifications/AppNotifications.swift # Session/Onboarding/RestoreVC.swift # Session/Shared/SessionTableViewController.swift # Session/Shared/SessionTableViewModel.swift # SessionMessagingKit/Calls/WebRTCSession.swift # SessionMessagingKit/Database/Models/Attachment.swift # SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift # SessionMessagingKit/File Server/FileServerAPI.swift # SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift # SessionMessagingKit/Open Groups/OpenGroupAPI.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver.swift # SessionMessagingKit/Sending & Receiving/MessageSender.swift # SessionSnodeKit/OnionRequestAPI.swift # SessionSnodeKit/SnodeAPI.swift # SessionUtilitiesKit/Database/Models/Identity.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift		2023-01-27 14:26:17 +11:00
..
MessageReceiver+Calls.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
MessageReceiver+ClosedGroups.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
MessageReceiver+ConfigurationMessages.swift	Fixed a few issues uncovered when testing the shared util feature flag	2023-01-05 13:40:33 +11:00
MessageReceiver+DataExtractionNotification.swift	Updated the code to take the service node offset into account when setting timestamps	2022-12-21 16:39:52 +11:00
MessageReceiver+ExpirationTimers.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
MessageReceiver+MessageRequests.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
MessageReceiver+ReadReceipts.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
MessageReceiver+TypingIndicators.swift	Reduced unneeded DB write operations and fixed a few minor UI bugs	2022-08-05 17:10:01 +10:00
MessageReceiver+UnsendRequests.swift	Work on the PromiseKit refactor	2022-12-07 15:50:58 +11:00
MessageReceiver+VisibleMessages.swift	Sorted out a bunch of the config syncing logic	2022-12-16 16:51:08 +11:00
MessageSender+ClosedGroups.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00