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/Session/Media Viewing & Editing
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
8 months ago
..
GIFs Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
Transitions upgrade to minimum iOS 15.0 support 11 months ago
AllMediaViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
CropScaleImageViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
DocumentTitleViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
ImagePickerController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
MediaDetailViewController.swift Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
MediaGalleryNavigationController.swift WIP: show full screen media gallery in message info screen 2 years ago
MediaGalleryViewModel.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
MediaInfoVC+MediaInfoView.swift adding missing strings 1 year ago
MediaInfoVC+MediaPreviewView.swift Fixed a few bugs and crashes around media interactions 2 years ago
MediaInfoVC.swift WIP: add strings 1 year ago
MediaPageViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
MediaTileViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
MessageInfoScreen.swift Merge branch 'onboarding' into standardised-strings 1 year ago
MessageInfoView.swift WIP: update strings for onboarding changes 1 year ago
OWSImagePickerController.swift Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
PhotoCapture.swift Resolved a TODO I had missed 9 months ago
PhotoCaptureViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
PhotoCollectionPickerViewModel.swift WIP: add strings 1 year ago
PhotoGridViewCell.swift Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
PhotoLibrary.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
SendMediaNavigationController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago