oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
session-ios/Session/Meta/Images.xcassets
History
Morgan Pretty 290bce5ce0 Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 
# Conflicts:
#	Podfile
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationMessageMapping.swift
#	Session/Conversations/ConversationSearch.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/ConversationViewModel.m
#	Session/Conversations/Input View/InputView.swift
#	Session/Conversations/Input View/MentionSelectionView.swift
#	Session/Conversations/LongTextViewController.swift
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Settings/OWSConversationSettingsViewController.m
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Conversations/Views & Modals/DownloadAttachmentModal.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Conversations/Views & Modals/LinkPreviewModal.swift
#	Session/Conversations/Views & Modals/MessagesTableView.swift
#	Session/Conversations/Views & Modals/URLModal.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaDetailViewController.m
#	Session/Media Viewing & Editing/MediaPageViewController.swift
#	Session/Meta/AppDelegate.m
#	Session/Meta/AppDelegate.swift
#	Session/Meta/AppEnvironment.swift
#	Session/Meta/Signal-Bridging-Header.h
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Notifications/AppNotifications.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SeedModal.swift
#	Session/Settings/SettingsVC.swift
#	Session/Settings/ShareLogsModal.swift
#	Session/Shared/ConversationCell.swift
#	Session/Shared/UserSelectionVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	Session/Utilities/MentionUtilities.swift
#	Session/Utilities/MockDataGenerator.swift
#	SessionMessagingKit/Database/OWSPrimaryStorage.m
#	SessionMessagingKit/Database/SSKPreferences.swift
#	SessionMessagingKit/Database/Storage+Contacts.swift
#	SessionMessagingKit/Database/Storage+Jobs.swift
#	SessionMessagingKit/Database/Storage+Messaging.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Database/TSDatabaseView.m
#	SessionMessagingKit/File Server/FileServerAPIV2.swift
#	SessionMessagingKit/Jobs/AttachmentDownloadJob.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Jobs/JobQueue.swift
#	SessionMessagingKit/Jobs/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Jobs/NotifyPNServerJob.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Messages/Message+Destination.swift
#	SessionMessagingKit/Messages/Signal/TSIncomingMessage.h
#	SessionMessagingKit/Messages/Signal/TSIncomingMessage.m
#	SessionMessagingKit/Messages/Signal/TSInfoMessage.h
#	SessionMessagingKit/Messages/Signal/TSInfoMessage.m
#	SessionMessagingKit/Messages/Signal/TSInteraction.h
#	SessionMessagingKit/Messages/Signal/TSInteraction.m
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2+ObjC.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupMessageV2.swift
#	SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Threads/Notification+Thread.swift
#	SessionMessagingKit/Threads/TSContactThread.h
#	SessionMessagingKit/Threads/TSContactThread.m
#	SessionMessagingKit/Threads/TSGroupModel.h
#	SessionMessagingKit/Threads/TSGroupModel.m
#	SessionMessagingKit/Threads/TSGroupThread.m
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionSnodeKit/OnionRequestAPI+Encryption.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionSnodeKit/SnodeMessage.swift
#	SessionSnodeKit/Storage+SnodeAPI.swift
#	SessionSnodeKit/Storage.swift
#	SessionUtilitiesKit/General/Array+Utilities.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/General/SNUserDefaults.swift
#	SessionUtilitiesKit/General/Set+Utilities.swift
#	SessionUtilitiesKit/Meta/SessionUtilitiesKit.h
#	SessionUtilitiesKit/Utilities/Optional+Utilities.swift
#	SessionUtilitiesKit/Utilities/Sodium+Conversion.swift
#	SignalUtilitiesKit/Configuration.swift
#	SignalUtilitiesKit/Database/Migrations/OpenGroupServerIdLookupMigration.swift
#	SignalUtilitiesKit/Messaging/FullTextSearcher.swift
#	SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift
#	SignalUtilitiesKit/Profile Pictures/Identicon+ObjC.swift
#	SignalUtilitiesKit/To Do/OWSProfileManager.m
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/UIView+OWS.swift
2022-06-08 14:29:51 +10:00
..
actionsheet_camera_black.imageset Organize files 2020-11-12 08:48:41 +11:00
actionsheet_camera_roll_black.imageset Organize files 2020-11-12 08:48:41 +11:00
actionsheet_document_black.imageset Organize files 2020-11-12 08:48:41 +11:00
actionsheet_gif_black.imageset Organize files 2020-11-12 08:48:41 +11:00
AppIcon.appiconset Organize files 2020-11-12 08:48:41 +11:00
attachment_audio.imageset Organize files 2020-11-12 08:48:41 +11:00
conversation_settings_search.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_00.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_05.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_10.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_15.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_20.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_25.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_30.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_35.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_40.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_45.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_50.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_55.imageset Organize files 2020-11-12 08:48:41 +11:00
disappearing_message_60.imageset Organize files 2020-11-12 08:48:41 +11:00
giphy_logo.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_block.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_chevron_down.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_chevron_up.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_copy.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_dark_theme_off.imageset Appearance based on system theme 2021-10-19 11:03:59 +11:00
ic_dark_theme_on.imageset Appearance based on system theme 2021-10-19 11:03:59 +11:00
ic_download.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_flash_mode_auto.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_flash_mode_off.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_flash_mode_on.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_gallery_badge_gif.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_gallery_badge_video.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_info.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_lock_outline.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_plus_24.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_reply.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_switch_camera.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_theme_auto.imageset Appearance based on system theme 2021-10-19 11:03:59 +11:00
ic_timer.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_timer_disabled.imageset Organize files 2020-11-12 08:48:41 +11:00
ic_trash.imageset Organize files 2020-11-12 08:48:41 +11:00
image_editor_brush.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_caption.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_checkmark_empty.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_checkmark_full.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_crop.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_crop_lock.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_crop_unlock.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_flip.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_rotate.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_text.imageset Fix crash 2021-05-04 16:13:56 +10:00
image_editor_undo.imageset Fix crash 2021-05-04 16:13:56 +10:00
Loki Delete unused assets 2021-04-30 14:19:30 +10:00
media_album_caption.imageset Organize files 2020-11-12 08:48:41 +11:00
media_invalid.imageset Organize files 2020-11-12 08:48:41 +11:00
media_retry.imageset Organize files 2020-11-12 08:48:41 +11:00
media_send_batch_mode_disabled.imageset Organize files 2020-11-12 08:48:41 +11:00
message_status_failed.imageset Organize files 2020-11-12 08:48:41 +11:00
navbar_disclosure_down.imageset Organize files 2020-11-12 08:48:41 +11:00
NavBarBack.imageset Fix crash 2021-05-04 16:11:09 +10:00
NavBarBackRTL.imageset Fix crash 2021-05-04 16:11:09 +10:00
searchbar_clear.imageset Organize files 2020-11-12 08:48:41 +11:00
searchbar_search.imageset Organize files 2020-11-12 08:48:41 +11:00
selected_blue_circle.imageset Organize files 2020-11-12 08:48:41 +11:00
Session Merge branch 'dev' into voice-calls-2 2022-03-10 15:12:42 +11:00
settings-avatar-camera-2.imageset Organize files 2020-11-12 08:48:41 +11:00
sliderProgressThumb.imageset Fix crash 2021-05-03 08:34:28 +10:00
small_chevron_left.imageset Organize files 2020-11-12 08:48:41 +11:00
small_chevron_right.imageset Organize files 2020-11-12 08:48:41 +11:00
system_disclosure_indicator.imageset Organize files 2020-11-12 08:48:41 +11:00
system_disclosure_indicator_rtl.imageset Organize files 2020-11-12 08:48:41 +11:00
table_ic_block.imageset Organize files 2020-11-12 08:48:41 +11:00
table_ic_group_edit.imageset Organize files 2020-11-12 08:48:41 +11:00
table_ic_group_leave.imageset Organize files 2020-11-12 08:48:41 +11:00
table_ic_notification_sound.imageset Organize files 2020-11-12 08:48:41 +11:00
x-24.imageset Fixed a few bugs, resolved a number of TODOs and deleted more unused code 2022-05-23 17:16:14 +10:00
Contents.json Redesign conversation screen part 1 2021-02-09 15:14:18 +11:00