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 534343f8b0 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Session/Closed Groups/NewClosedGroupVC.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/New Conversation/NewDMVC.swift # Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift # Session/Meta/Translations/de.lproj/Localizable.strings # Session/Meta/Translations/en.lproj/Localizable.strings # Session/Meta/Translations/es.lproj/Localizable.strings # Session/Meta/Translations/fa.lproj/Localizable.strings # Session/Meta/Translations/fi.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/id-ID.lproj/Localizable.strings # Session/Meta/Translations/it.lproj/Localizable.strings # Session/Meta/Translations/ja.lproj/Localizable.strings # Session/Meta/Translations/nl.lproj/Localizable.strings # Session/Meta/Translations/pl.lproj/Localizable.strings # Session/Meta/Translations/pt_BR.lproj/Localizable.strings # Session/Meta/Translations/ru.lproj/Localizable.strings # Session/Meta/Translations/si.lproj/Localizable.strings # Session/Meta/Translations/sk.lproj/Localizable.strings # Session/Meta/Translations/sv.lproj/Localizable.strings # Session/Meta/Translations/th.lproj/Localizable.strings # Session/Meta/Translations/vi-VN.lproj/Localizable.strings # Session/Meta/Translations/zh-Hant.lproj/Localizable.strings # Session/Meta/Translations/zh_CN.lproj/Localizable.strings # Session/Settings/BlockedContactsViewController.swift # Session/Settings/NukeDataModal.swift # Session/Settings/SettingsViewModel.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionUIKit/Components/ConfirmationModal.swift		2 years ago
..
AppContext.h	Updated the colours to source from direct theme values (instead of individual)	3 years ago
AppContext.m	Updated the colours to source from direct theme values (instead of individual)	3 years ago
Array+Utilities.swift	JobRunner fixes	2 years ago
Atomic.swift	Various tweaks and fixes	2 years ago
BuildConfiguration.swift	Re-organize files	4 years ago
CallRingTonePlayer.swift	add ringtone and other UI improvement	3 years ago
Collection+Utilities.swift	Updated to the latest lib, started handling UserGroups	2 years ago
Data+Utilities.swift	Added in missing code changes unrelated to closed groups rebuild	2 years ago
Dependencies.swift	Fixed the broken unit tests	2 years ago
Dictionary+Utilities.swift	WIP	2 years ago
Features.swift	Updated the feature flag so it will continue to use User Config if the migrations have already been run	2 years ago
General.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2 years ago
LRUCache.swift	Fixed a few closed group and job issues	3 years ago
Logging.swift	Fixed the broken tests and resolved some warnings	2 years ago
NSNotificationCenter+OWS.h	Re-organize files	4 years ago
NSNotificationCenter+OWS.m	Re-organize files	4 years ago
NSRegularExpression+SSK.swift	enable CBR	3 years ago
NSString+SSK.h	Re-organize files	4 years ago
NSString+SSK.m	Re-organize files	4 years ago
NSTimer+Proxying.h	Re-organize files	4 years ago
NSTimer+Proxying.m	Re-organize files	4 years ago
NSUserDefaults+OWS.h	Re-organize files	4 years ago
NSUserDefaults+OWS.m	Re-organize files	4 years ago
OWSMath.h	Re-organize files	4 years ago
ReusableView.swift	Started re-adding media gallery interactions (in progress)	3 years ago
SNUserDefaults.swift	Finished off a few remaining bits and pieces	2 years ago
SessionId.swift	Removed unneeded imports of libraries to understand usage	2 years ago
Set+Utilities.swift	Working on the MediaGallery and ClosedGroup handling	3 years ago
Sodium+Utilities.swift	Further config util logic	2 years ago
String+SSK.swift	Re-organize files	4 years ago
String+Trimming.swift	Got the '/inbox' APIs and encryption/decryption/validation working	3 years ago
String+Utilities.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2 years ago
TimeInterval+Utilities.swift	add a new format for video duration	2 years ago
Timer+MainThread.swift	WIP: timer + main thread	3 years ago
TimestampUtils.swift	ignore call messages over 60s	3 years ago
UICollectionView+ReusableView.swift	Started re-adding media gallery interactions (in progress)	3 years ago
UIDevice+featureSupport.swift	Re-organize files	4 years ago
UIEdgeInsets.swift	Implement multi device UI	4 years ago
UITableView+ReusableView.swift	Cleared out some of the legacy serialisation logic, further UI binding	3 years ago
UIView+OWS.h	Made a few optimisations and fixes	2 years ago
UIView+OWS.m	Made a few optimisations and fixes	2 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