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
Morgan Pretty 2bcd8e28ab Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/Content Views/QuoteView.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Database/Models/RecipientState.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/General/String+Utilities.swift
#	SessionUtilitiesKit/Networking/IPv4.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLock.swift
1 year ago
..
Calls Fixed the share extension and moved the WebRTC logic 1 year ago
Crypto Fixed issues with sending sync messages and uploading attachments 1 year ago
Database Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Jobs/Types Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
LibSession Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 1 year ago
Messages Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Meta
Open Groups Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Protos Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 1 year ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Shared Models Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Utilities Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Configuration.swift Additional bug fixes, log tweaks and update checking 2 years ago