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/SignalUtilitiesKit/Messaging
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
3 years ago
..
Sending & Receiving Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
BlockListUIUtils.swift Removed the OWSBlockingManager replacing it with the config sync 3 years ago
ConversationStyle.swift Redesign conversation screen part 1 4 years ago
DisappearingTimerConfigurationView.swift Re-organize files 4 years ago
FullTextSearcher.swift Merge branch 'dev' into voice-calls-2 3 years ago
OWSFailedAttachmentDownloadsJob.h Re-organize files 4 years ago
OWSFailedAttachmentDownloadsJob.m Re-organize files 4 years ago
OWSFailedMessagesJob.h Re-organize files 4 years ago
OWSFailedMessagesJob.m Re-organize files 4 years ago
OWSMessageUtils.h Updated how the HomeVC counts unread message request threads 3 years ago
OWSMessageUtils.m Updated how the HomeVC counts unread message request threads 3 years ago
OWSUnreadIndicator.h Re-organize files 4 years ago
OWSUnreadIndicator.m Re-organize files 4 years ago
ThreadViewModel.swift refactor to apply this logic to unread message count 3 years ago