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.

Morgan Pretty 1dd8e8f197 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Calls/Views & Modals/IncomingCallBanner.swift # Session/Calls/WebRTC/WebRTCSession.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Home/GlobalSearch/GlobalSearchViewController.swift # Session/Home/HomeVC.swift # Session/Home/Message Requests/MessageRequestsViewModel.swift # Session/Meta/AppDelegate.swift # Session/Meta/AppEnvironment.swift # Session/Meta/SessionApp.swift # Session/Notifications/NotificationPresenter.swift # Session/Notifications/PushRegistrationManager.swift # Session/Notifications/UserNotificationsAdaptee.swift # Session/Onboarding/Onboarding.swift # Session/Open Groups/JoinOpenGroupVC.swift # Session/Utilities/IP2Country.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/Models/ClosedGroup.swift # SessionMessagingKit/Database/Models/Interaction.swift # SessionMessagingKit/Database/Models/SessionThread.swift # SessionMessagingKit/Jobs/DisappearingMessagesJob.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/Open Groups/OpenGroupManager.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+LegacyClosedGroups.swift # SessionMessagingKit/Sending & Receiving/Pollers/CurrentUserPoller.swift # SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift # SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift # SessionMessagingKit/Sending & Receiving/Typing Indicators/TypingIndicators.swift # SessionMessagingKit/Utilities/AppReadiness.swift # SessionMessagingKit/Utilities/Preferences.swift # SessionMessagingKit/Utilities/ProfileManager.swift # SessionMessagingKit/Utilities/SessionEnvironment.swift # SessionMessagingKitTests/Jobs/MessageSendJobSpec.swift # SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift # SessionNotificationServiceExtension/NotificationServiceExtension.swift # SessionShareExtension/ShareNavController.swift # SessionSnodeKit/LibSession/LibSession+Networking.swift # SessionSnodeKit/Networking/SnodeAPI.swift # SessionUIKit/Components/PlaceholderIcon.swift # SessionUIKit/Utilities/UIContextualAction+Theming.swift # SessionUtilitiesKit/Crypto/Crypto.swift # SessionUtilitiesKit/Database/Storage.swift # SessionUtilitiesKit/Database/Types/Migration.swift # SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift # SessionUtilitiesKit/General/AppContext.swift # SessionUtilitiesKit/General/Atomic.swift # SessionUtilitiesKit/General/Caches.swift # SessionUtilitiesKit/General/Dependencies.swift # SessionUtilitiesKit/General/FileSystem.swift # SessionUtilitiesKit/General/Logging.swift # SessionUtilitiesKit/General/SNUserDefaults.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift # SessionUtilitiesKit/Types/BackgroundTaskManager.swift # SessionUtilitiesKit/Types/KeychainStorage.swift # SignalUtilitiesKit/Utilities/AppSetup.swift # _SharedTestUtilities/Mock.swift # _SharedTestUtilities/MockCaches.swift # _SharedTestUtilities/NimbleExtensions.swift		4 months ago
..
AppContext.swift	Refactored `Atomic<T>` to `@ThreadSafe` and `@ThreadSafeObject`	5 months ago
Array+Utilities.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	4 months ago
Authentication.swift	Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild	10 months ago
CallRingTonePlayer.swift	add ringtone and other UI improvement	3 years ago
Collection+Utilities.swift	Defensive coding for C API conversation, threading & logging tweaks	11 months ago
Constants.swift	[Automated] Update translations from Crowdin	4 months ago
Data+Utilities.swift	Replaced Cocoapods with Swift Package Manager for dependency management	9 months ago
Dictionary+Utilities.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	4 months ago
Feature+ServiceNetwork.swift	Finished up the remaining testing and added some more improvements	10 months ago
Feature.swift	Added new 'animationsEnabled' feature flag, message deletion tweaks	5 months ago
General.swift	Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild	10 months ago
LRUCache.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	5 months ago
Localization.swift	Added additional developer settings and fixed some bugs	7 months ago
Logging.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	4 months ago
NSCache+Utilities.swift	Refactored `Atomic<T>` to `@ThreadSafe` and `@ThreadSafeObject`	5 months ago
NSRegularExpression+SSK.swift	enable CBR	3 years ago
Notifications+Lifecycle.swift	Refactored AppContext and AppRediness to Swift	1 year ago
ReusableView.swift	Started re-adding media gallery interactions (in progress)	3 years ago
SessionId.swift	Fixed a number of QA issues	5 months ago
Set+Utilities.swift	Pushing up my WIP changes from the last few days	2 years ago
Setting+Theme.swift	Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild	10 months ago
String+SSK.swift	Replaced Cocoapods with Swift Package Manager for dependency management	9 months ago
String+Utilities.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	5 months ago
TimeInterval+Utilities.swift	add auto deletes subtitle on delete action in long press menu screen	1 year ago
Timer+MainThread.swift	Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild	10 months ago
TimestampUtils.swift	Replaced Cocoapods with Swift Package Manager for dependency management	9 months ago
UICollectionView+ReusableView.swift	Started re-adding media gallery interactions (in progress)	3 years ago
UIDevice+featureSupport.swift	Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild	5 months ago
UIEdgeInsets.swift	Reverted the isRTL changes (preferred the old approach)	7 months ago
UITableView+ReusableView.swift	Cleared out some of the legacy serialisation logic, further UI binding	3 years ago
UnicodeScalar+Utilities.swift	Updated the JobRunner to have multiple job queues (needs more testing)	3 years ago
Weak.swift	Re-organize files	4 years ago