oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session/Media Viewing & Editing
History
Morgan Pretty 4f8fb63f2c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCapture.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Notifications/AppNotifications.swift
#	Session/Onboarding/RestoreVC.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	SessionMessagingKit/Calls/WebRTCSession.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Database/Models/Identity.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
 		2023-01-27 14:26:17 +11:00
..
GIFs Fixed the broken tests and resolved some warnings 2022-12-07 16:05:32 +11:00
Transitions Further refactoring work 2022-12-07 15:54:17 +11:00
AllMediaViewController.swift Further config util logic 2022-12-07 15:06:15 +11:00
CropScaleImageViewController.swift Further config util logic 2022-12-07 15:06:15 +11:00
DocumentTitleViewController.swift Added in missing code changes unrelated to closed groups rebuild 2022-12-08 14:21:38 +11:00
ImagePickerController.swift Refactored the remaining references to PromiseKit 2022-12-07 15:58:53 +11:00
MediaDetailViewController.swift Further config util logic 2022-12-07 15:06:15 +11:00
MediaGalleryNavigationController.swift Fixed most of the styling issues raised during QA 2022-09-30 18:22:28 +10:00
MediaGalleryViewModel.swift Removed unneeded imports of libraries to understand usage 2022-12-08 18:07:02 +11:00
MediaPageViewController.swift Further refactoring work 2022-12-07 15:54:17 +11:00
MediaTileViewController.swift Further config util logic 2022-12-07 15:06:15 +11:00
OWSImagePickerController.swift Re-organize files 2021-01-12 11:05:52 +11:00
PhotoCapture.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-01-27 14:26:17 +11:00
PhotoCaptureViewController.swift Fixed a few issues caused by the PromiseKit refactor 2022-12-07 15:59:17 +11:00
PhotoCollectionPickerViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2022-12-08 14:21:38 +11:00
PhotoGridViewCell.swift Further config util logic 2022-12-07 15:06:15 +11:00
PhotoLibrary.swift Further refactoring work 2022-12-07 15:54:17 +11:00
SendMediaNavigationController.swift Further refactoring work 2022-12-07 15:54:17 +11:00