You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SessionMessagingKit/Database/Models
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
3 years ago
..
Attachment.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
BlindedIdLookup.swift Sorted out a bunch of the config syncing logic 3 years ago
Capability.swift feat: add capability check for open group emoji reacts 3 years ago
ClosedGroup.swift Added in missing code changes unrelated to closed groups rebuild 3 years ago
ClosedGroupKeyPair.swift
Contact.swift Sorted out a bunch of the config syncing logic 3 years ago
ControlMessageProcessRecord.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
DisappearingMessageConfiguration.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
GroupMember.swift Removed unneeded imports of libraries to understand usage 3 years ago
Interaction.swift Updated the code to take the service node offset into account when setting timestamps 3 years ago
InteractionAttachment.swift
LinkPreview.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
OpenGroup.swift Fixed a bug where copying the open group url wasn't working correctly 3 years ago
Profile.swift Sorted out a bunch of the config syncing logic 3 years ago
Quote.swift WIP: observe quote update 3 years ago
Reaction.swift update sortId logic after open group reaction index 3 years ago
RecipientState.swift Added the updated delivery status UI 3 years ago
SessionThread.swift Updated the code to take the service node offset into account when setting timestamps 3 years ago
SharedConfigDump.swift Sorted out a bunch of the config syncing logic 3 years ago
ThreadTypingIndicator.swift