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 65057fba21 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
#	SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/Utilities/Bencode.swift
#	SignalUtilitiesKit/Utilities/AppSetup.swift
2 years ago
..
GIFs Fixed a few more PN logic issues 2 years ago
Transitions Fixed a hang, removed redundant libs, files and code 2 years ago
AllMediaViewController.swift Further config util logic 2 years ago
CropScaleImageViewController.swift Fixed a few more PN logic issues 2 years ago
DocumentTitleViewController.swift [WIP] Refactored dependency access to be more generic 2 years ago
ImagePickerController.swift Fixed an issue where the media picker wouldn't reload when changing image access 2 years ago
MediaDetailViewController.swift Merge branch 'dev' into disappearing-message-redesign 2 years ago
MediaGalleryNavigationController.swift feat: Enable upside down orientation for iPad 2 years ago
MediaGalleryViewModel.swift [WIP] Refactored dependency access to be more generic 2 years ago
MediaInfoVC+MediaInfoView.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
MediaInfoVC+MediaPreviewView.swift Various tweaks and fixes 2 years ago
MediaInfoVC.swift Various tweaks and fixes 2 years ago
MediaPageViewController.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
MediaTileViewController.swift [WIP] Refactored dependency access to be more generic 2 years ago
OWSImagePickerController.swift Fixed a hang, removed redundant libs, files and code 2 years ago
PhotoCapture.swift Include specific fixes from the other branch 2 years ago
PhotoCaptureViewController.swift Fixed a few more PN logic issues 2 years ago
PhotoCollectionPickerViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
PhotoGridViewCell.swift Further config util logic 2 years ago
PhotoLibrary.swift Fixed a few more PN logic issues 2 years ago
SendMediaNavigationController.swift Fixed a few more issues 2 years ago