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 d9a64e0148 Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
11 months ago
..
GIFs Merge remote-tracking branch 'upstream/dev' into standardised-strings 11 months ago
Transitions Fixed a hang, removed redundant libs, files and code 2 years ago
AllMediaViewController.swift WIP: strings! 1 year ago
CropScaleImageViewController.swift replace NSLocalizedString() wiith .localized, and remove CommonStrings 1 year ago
DocumentTitleViewController.swift WIP: strings! 1 year ago
ImagePickerController.swift WIP: check for any untouched strings 1 year ago
MediaDetailViewController.swift Fixed a few bugs and crashes around media interactions 2 years ago
MediaGalleryNavigationController.swift WIP: show full screen media gallery in message info screen 2 years ago
MediaGalleryViewModel.swift Merge branch 'dev' into standardised-strings 1 year 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 rename dynamic variables in strings 12 months ago
MediaTileViewController.swift WIP: check for any untouched strings 1 year ago
MessageInfoScreen.swift Merge branch 'onboarding' into standardised-strings 12 months ago
MessageInfoView.swift WIP: update strings for onboarding changes 12 months ago
OWSImagePickerController.swift Fixed a hang, removed redundant libs, files and code 2 years ago
PhotoCapture.swift Merge branch 'dev' into onboarding 2 years ago
PhotoCaptureViewController.swift update strings 1 year ago
PhotoCollectionPickerViewModel.swift WIP: add strings 1 year ago
PhotoGridViewCell.swift Further config util logic 2 years ago
PhotoLibrary.swift WIP: check for any untouched strings 1 year ago
SendMediaNavigationController.swift update more localized strings 1 year ago