session-ios/Session/Conversations/Views & Modals
Morgan Pretty c25f378c54 Merge branch 'feature/database-refactor' into emoji-reacts
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Views & Modals/BodyTextView.swift
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SignalUtilitiesKit/Utilities/DisplayableText.swift
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/Notification+Loki.swift
2022-07-25 15:39:56 +10:00
..
BlockedModal.swift Fixed a number of bugs found during QA 2022-07-18 09:54:23 +10:00
CallModal.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 2022-07-01 13:08:45 +10:00
CallPermissionRequestModal.swift minor UI adjustment 2022-03-04 15:28:16 +11:00
ConversationTitleView.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 2022-06-09 18:37:44 +10:00
DownloadAttachmentModal.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 2022-07-01 13:08:45 +10:00
InfoBanner.swift Clean 2021-02-19 16:02:19 +11:00
InsetLockableTableView.swift Fixed a couple more bugs 2022-06-30 17:48:43 +10:00
JoinOpenGroupModal.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 2022-07-01 13:08:45 +10:00
LinkPreviewModal.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 2022-07-01 13:08:45 +10:00
PermissionMissingModal.swift UI minor adjustment to modals 2022-03-04 15:23:02 +11:00
ReactionListSheet.swift Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
ScrollToBottomButton.swift Re-added a bunch of functionality to the home and message requests screens 2022-05-06 18:07:57 +10:00
SendSeedModal.swift UI minor adjustment to modals 2022-03-04 15:23:02 +11:00
URLModal.swift Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 2022-06-08 14:29:51 +10:00
UserDetailsSheet.swift Re-added a bunch of functionality to the home and message requests screens 2022-05-06 18:07:57 +10:00