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
History
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
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Added linting for the localized strings, updated the quote & mention behaviour for the current user 2022-07-15 18:15:28 +10:00
Closed Groups Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 2022-07-01 13:08:45 +10:00
Conversations Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
DMs Applied the "increase min version to iOS 13" changes 2022-07-01 13:33:00 +10:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
Home Updated the message request approval process to run asynchronously 2022-07-18 12:32:46 +10:00
Media Viewing & Editing Added defensive coding to prevent some crashes 2022-07-18 17:40:32 +10:00
Meta Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
Notifications Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
Onboarding Added linting for the localized strings, updated the quote & mention behaviour for the current user 2022-07-15 18:15:28 +10:00
Open Groups Fixed an edge-case crash, a couple of minor bugs and made future-proofing tweaks 2022-07-12 17:43:52 +10:00
Path Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 2022-06-08 14:29:51 +10:00
Settings Added linting for the localized strings, updated the quote & mention behaviour for the current user 2022-07-15 18:15:28 +10:00
Shared Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
Sheets & Modals Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 2022-06-08 14:29:51 +10:00
Utilities Merge branch 'feature/database-refactor' into emoji-reacts 2022-07-25 15:39:56 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00