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
Morgan Pretty 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
2 years ago
..
Notification+Contacts.swift Removed the OWSBlockingManager replacing it with the config sync 2 years ago
OWSBackupFragment.h Make things compile again 4 years ago
OWSBackupFragment.m Make things compile again 4 years ago
OWSPrimaryStorage.h Restructure 4 years ago
OWSPrimaryStorage.m Merge branch 'unread-metion-fix' into voice-calls-2 2 years ago
OWSStorage+Subclass.h Make things compile again 4 years ago
OWSStorage.h Restructure 4 years ago
OWSStorage.m Add missing strings 3 years ago
SSKPreferences.swift refactor to make CallKit disabled for China mainland 2 years ago
Storage+ClosedGroups.swift Re-added the transaction requirement when generating the current config message 2 years ago
Storage+Contacts.swift Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Storage+Jobs.swift File upload working, further code cleanup 2 years ago
Storage+Messaging.swift Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Storage+OpenGroups.swift Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Storage+Shared.swift Re-added the transaction requirement when generating the current config message 2 years ago
TSDatabaseSecondaryIndexes.h Restructure 4 years ago
TSDatabaseSecondaryIndexes.m Restructure 4 years ago
TSDatabaseView.h fix unread mention indicator showing after the message is deleted 2 years ago
TSDatabaseView.m Removed the OWSBlockingManager replacing it with the config sync 2 years ago