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 2fba138782 Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild ... # Conflicts: # .drone.jsonnet # Session.xcodeproj/project.pbxproj # Session/Calls/Call Management/SessionCallManager.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Message Cells/InfoMessageCell.swift # Session/Conversations/Message Cells/MessageCell.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift # Session/Conversations/Views & Modals/InfoBanner.swift # Session/Meta/AppDelegate.swift # Session/Meta/MainAppContext.swift # Session/Meta/Translations/ar.lproj/Localizable.strings # Session/Meta/Translations/be.lproj/Localizable.strings # Session/Meta/Translations/bg.lproj/Localizable.strings # Session/Meta/Translations/bn.lproj/Localizable.strings # Session/Meta/Translations/cs.lproj/Localizable.strings # Session/Meta/Translations/da.lproj/Localizable.strings # Session/Meta/Translations/de.lproj/Localizable.strings # Session/Meta/Translations/el.lproj/Localizable.strings # Session/Meta/Translations/en.lproj/Localizable.strings # Session/Meta/Translations/eo.lproj/Localizable.strings # Session/Meta/Translations/es-ES.lproj/Localizable.strings # Session/Meta/Translations/fa.lproj/Localizable.strings # Session/Meta/Translations/fi.lproj/Localizable.strings # Session/Meta/Translations/fil.lproj/Localizable.strings # Session/Meta/Translations/fr.lproj/Localizable.strings # Session/Meta/Translations/hi.lproj/Localizable.strings # Session/Meta/Translations/hr.lproj/Localizable.strings # Session/Meta/Translations/hu.lproj/Localizable.strings # Session/Meta/Translations/id.lproj/Localizable.strings # Session/Meta/Translations/it.lproj/Localizable.strings # Session/Meta/Translations/ja.lproj/Localizable.strings # Session/Meta/Translations/ko.lproj/Localizable.strings # Session/Meta/Translations/ku.lproj/Localizable.strings # Session/Meta/Translations/lt.lproj/Localizable.strings # Session/Meta/Translations/lv.lproj/Localizable.strings # Session/Meta/Translations/ne-NP.lproj/Localizable.strings # Session/Meta/Translations/nl.lproj/Localizable.strings # Session/Meta/Translations/no.lproj/Localizable.strings # Session/Meta/Translations/pl.lproj/Localizable.strings # Session/Meta/Translations/pt-BR.lproj/Localizable.strings # Session/Meta/Translations/pt-PT.lproj/Localizable.strings # Session/Meta/Translations/ro.lproj/Localizable.strings # Session/Meta/Translations/ru.lproj/Localizable.strings # Session/Meta/Translations/si-LK.lproj/Localizable.strings # Session/Meta/Translations/sk.lproj/Localizable.strings # Session/Meta/Translations/sl.lproj/Localizable.strings # Session/Meta/Translations/sv-SE.lproj/Localizable.strings # Session/Meta/Translations/th.lproj/Localizable.strings # Session/Meta/Translations/tr.lproj/Localizable.strings # Session/Meta/Translations/uk.lproj/Localizable.strings # Session/Meta/Translations/vi.lproj/Localizable.strings # Session/Meta/Translations/zh-CN.lproj/Localizable.strings # Session/Meta/Translations/zh-TW.lproj/Localizable.strings # Session/Notifications/SyncPushTokensJob.swift # Session/Notifications/UserNotificationsAdaptee.swift # Session/Onboarding/PNModeVC.swift # Session/Shared/ScreenLockUI.swift # SessionMessagingKit/Configuration.swift # SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift # SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift # SessionMessagingKit/Database/Models/Interaction.swift # SessionMessagingKit/Jobs/ExpirationUpdateJob.swift # SessionMessagingKit/Jobs/GetExpirationJob.swift # SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver.swift # SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift # SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift # SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift # SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionMessagingKitTests/Sending & Receiving/MessageReceiverSpec.swift # SessionNotificationServiceExtension/NotificationServiceExtension.swift # SessionNotificationServiceExtension/NotificationServiceExtensionContext.swift # SessionShareExtension/Meta/SignalShareExtension-Bridging-Header.h # SessionShareExtension/ShareAppExtensionContext.swift # SessionSnodeKit/Networking/SnodeAPI.swift # SessionUtilitiesKit/Database/OWSFileSystem.m # SessionUtilitiesKit/General/AppContext.h # SessionUtilitiesKit/General/NSUserDefaults+OWS.m		1 year ago
..
AppReadiness.swift	Refactored AppContext and AppRediness to Swift	1 year ago
Authentication+SessionMessagingKit.swift	New DeveloperSettingsViewModel, bulk PN endpoints and updated group messages	2 years ago
Crypto+SessionMessagingKit.swift	Started adding tests for the DisplayPictureDownloadJob and clean up	2 years ago
Data+Utilities.swift	Added in missing code changes unrelated to closed groups rebuild	2 years ago
DeviceSleepManager.swift	Refactored AppContext and AppRediness to Swift	1 year ago
DisplayPictureError.swift	Pushing up my WIP changes from the last few days	2 years ago
DisplayPictureManager.swift	Reworked test DSL to speed up build time and added more tests	1 year ago
Environment.swift	Plugged in some more libSession functions and added more unit tests	1 year ago
FixedWidthInteger+BigEndian.swift	Partially implement receiving pipeline	5 years ago
Identity+Utilities.swift	Started adding logic and unit tests for group creation	2 years ago
MessageWrapper.swift	Updated to the latest libSession	2 years ago
OWSAudioPlayer.h	Fixed a few bugs and continued work on fixing unit tests	3 years ago
OWSAudioPlayer.m	Refactored AppContext and AppRediness to Swift	1 year ago
OWSAudioSession.swift	Fixed the broken unit tests	3 years ago
OWSWindowManager.h	Finished removing usages to non-theme colour variables	3 years ago
OWSWindowManager.m	Refactored AppContext and AppRediness to Swift	1 year ago
Preferences+NotificationPreviewType.swift	Added some more tests and cleaned up some warnings	2 years ago
Preferences+Sound.swift	Added some more tests and cleaned up some warnings	2 years ago
Preferences.swift	New DeveloperSettingsViewModel, bulk PN endpoints and updated group messages	2 years ago
Profile+CurrentUser.swift	Started adding tests for the DisplayPictureDownloadJob and clean up	2 years ago
ProfilePictureView+Convenience.swift	Added promotion handling, message deletion & deprecation banner	2 years ago
ProximityMonitoringManager.swift	Refactored AppContext and AppRediness to Swift	1 year ago
SMKDependencies.swift	Added toast and info message deletion, fixed layout issues & unit tests	3 years ago
SNProtoEnvelope+Conversion.swift	Removed all the old Storage classes and YapDB extensions	3 years ago
SSKReachabilityManager.swift	Fixed the QA issues and a few other bugs	2 years ago
String+Utlities.swift	More work on getting SOGS V4 integrated	3 years ago
Threading.swift	Fixed a number of issues found during internal testing	2 years ago