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/Shared
Morgan Pretty c398fa01ae Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Calls/CallVC.swift
#	Session/Calls/Views & Modals/IncomingCallBanner.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewModel.swift
#	Session/Home/New Conversation/NewMessageScreen.swift
#	Session/Home/New Conversation/StartConversationScreen.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/AppEnvironment.swift
#	Session/Meta/SessionApp.swift
#	Session/Notifications/NotificationPresenter.swift
#	Session/Notifications/PushRegistrationManager.swift
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Onboarding/DisplayNameScreen.swift
#	Session/Onboarding/LoadingScreen.swift
#	Session/Onboarding/Onboarding.swift
#	Session/Onboarding/PNModeScreen.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/BlockedContactsViewModel.swift
#	Session/Settings/DeveloperSettingsViewModel.swift
#	Session/Settings/PrivacySettingsViewModel.swift
#	Session/Settings/QRCodeScreen.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Settings/Views/VersionFooterView.swift
#	Session/Shared/Types/ObservableTableSource.swift
#	Session/Utilities/MockDataGenerator.swift
#	Session/Utilities/UIContextualAction+Utilities.swift
#	SessionMessagingKit/Calls/CallManagerProtocol.swift
#	SessionMessagingKit/Database/Migrations/_013_SessionUtilChanges.swift
#	SessionMessagingKit/Database/Migrations/_014_GenerateInitialUserConfigDumps.swift
#	SessionMessagingKit/Database/Migrations/_018_DisappearingMessagesConfiguration.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/BlindedIdLookup.swift
#	SessionMessagingKit/Database/Models/ClosedGroup.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Jobs/Types/GroupLeavingJob.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+ConvoInfoVolatile.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift
#	SessionMessagingKit/LibSession/Database/QueryInterfaceRequest+Utilities.swift
#	SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift
#	SessionMessagingKit/LibSession/Types/Config.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKit/Utilities/ProfileManager.swift
#	SessionMessagingKit/Utilities/SessionEnvironment.swift
#	SessionMessagingKitTests/Jobs/MessageSendJobSpec.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUIKit/Utilities/Localization+Style.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/LibSession/LibSessionError.swift
5 months ago
..
Types Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
Views Fixed a bunch of issues found by QA 5 months ago
BaseVC.swift Added additional developer settings and fixed some bugs 7 months ago
BezierPathView.swift WIP: refactor BezierPathView with swiftUI 2 years ago
CaptionView.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
FullConversationCell.swift Fixed a bunch of issues found by QA 5 months ago
LoadingIndicatorView.swift minor change of swiftui preview syntax for CI 1 year ago
LoadingViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
QRCodeScanningViewController.swift workaround for restarting capture after going back from message notification screen 10 months ago
ScanQRCodeScreen.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
ScanQRCodeWrapperVC.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
ScreenLockUI.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
SessionCarouselView+Info.swift optimise round corner for carousel view 2 years ago
SessionCarouselView+SwiftUI.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
SessionCarouselView.swift implement carousel view delegate 2 years ago
SessionCarouselViewDelegate.swift implement carousel view delegate 2 years ago
SessionHostingViewController.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
SessionListViewModel.swift Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 10 months ago
SessionTableViewController.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
SessionTableViewModel.swift Updated accessibility ids as per documentation 1 year ago
SessionTableViewTitleView.swift Fixed a number of bugs found in the internal release 1 year ago
UserListViewModel.swift Working through QA Issues 5 months ago