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/Meta
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
3 years ago
..
AudioFiles add ringtone and other UI improvement 4 years ago
Certificates Debug 5 years ago
Countries Improve onion request path loading efficiency 5 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago
Mnemonic
Settings.bundle
Translations Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
TurnServers add session turn server info 4 years ago
AppDelegate.swift Fixed a number of reported bugs, some cleanup, added animated profile support 3 years ago
AppEnvironment.swift Fixed the broken unit tests 3 years ago
Launch Screen.storyboard Added a simple migration progress indicator and animation (need timing tweaks) 3 years ago
MainAppContext.h
MainAppContext.m Fixed the broken unit tests 3 years ago
Session-Info.plist fix context menu shows wrong colour in dark mode 4 years ago
Session-Prefix.pch Finished of the Conversation screen and JobQueue concurrency 3 years ago
SessionApp.swift Fixed a number of reported bugs, some cleanup, added animated profile support 3 years ago
Signal-Bridging-Header.h Added code to ignore migrating open group messages older than 6 months 3 years ago
Signal.entitlements
SignalTSan.supp
SignalUBSan.supp