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 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Home/HomeVC.swift # Session/Home/Message Requests/MessageRequestsViewController.swift # Session/Media Viewing & Editing/MediaTileViewController.swift # Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift # SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift		3 years ago
..
AppSetup.swift	Progressing on theming functionality	3 years ago
AppVersion.h	Re-organize files	4 years ago
AppVersion.m	Redesign conversation screen part 1	4 years ago
Bench.swift	Ditch unused Signal code	4 years ago
ByteParser.h	Ditch unused Signal code	4 years ago
ByteParser.m	Redesign conversation screen part 1	4 years ago
Collection+OWS.swift	Ditch unused Signal code	4 years ago
CommonStrings.swift	Merge branch 'database-refactor' into add-documents-section	3 years ago
Differentiable+Utilities.swift	Further work on migrations and message pipeline refactoring	3 years ago
DirectionalPanGestureRecognizer.swift	Re-organize files	4 years ago
FeatureFlags.swift	Added global search back	3 years ago
FunctionalUtil.h	Remove more Signal code	4 years ago
FunctionalUtil.m	Redesign conversation screen part 1	4 years ago
ImageCache.swift	Re-organize files	4 years ago
NSAttributedString+OWS.h	Make messages show up again	4 years ago
NSAttributedString+OWS.m	Implement attachment downloading	4 years ago
NSURLSessionDataTask+StatusCode.h	Ditch unused Signal code	4 years ago
NSURLSessionDataTask+StatusCode.m	Ditch unused Signal code	4 years ago
NoopNotificationsManager.swift	Merge branch 'various-bugs-and-optimisations' into emoji-reacts	3 years ago
Notification+Loki.swift	Fixed a large number of bugs and added a setting to control open group message deletion	3 years ago
OWSAlerts.swift	Added linting for the localized strings, updated the quote & mention behaviour for the current user	3 years ago
OWSDispatch.h	Re-organize files	4 years ago
OWSDispatch.m	Re-organize files	4 years ago
OWSError.h	Finished off the MediaGallery logic	3 years ago
OWSError.m	Finished off the MediaGallery logic	3 years ago
OWSFormat.h	Ditch unused Signal code	4 years ago
OWSFormat.m	add size label for file type attachment	3 years ago
OWSOperation.h	Re-organize files	4 years ago
OWSOperation.m	Redesign conversation screen part 1	4 years ago
OWSSignalAddress.swift	Re-organize files	4 years ago
OrderedDictionary.swift	wip: emoji reacts message cell ui	3 years ago
OutageDetection.swift	Re-organize files	4 years ago
ParamParser.swift	Remove more Signal code	4 years ago
ReachabilityManager.swift	Re-organize files	4 years ago
ReverseDispatchQueue.swift	Ditch unused Signal code	4 years ago
SSKAsserts.h	Implement attachment downloading	4 years ago
Searcher.swift	Re-organize files	4 years ago
ShareViewDelegate.swift	Refactored SessionShareExtension code to Swift	3 years ago
SignalIOS.pb.swift	Re-organize files	4 years ago
SignalIOSProto.swift	Re-organize files	4 years ago
SwiftSingletons.swift	Remove more Signal code	4 years ago
TSConstants.h	Re-organize files	4 years ago
TSConstants.m	Re-organize files	4 years ago
UIAlertController+OWS.swift	Ditch unused Signal code	4 years ago
UIColor+Extensions.swift	Updated the colours to source from direct theme values (instead of individual)	3 years ago
UIColor+OWS.h	Re-organize files	4 years ago
UIColor+OWS.m	Re-organize files	4 years ago
UIFont+OWS.h	Re-organize files	4 years ago
UIFont+OWS.m	Re-organize files	4 years ago
UIGestureRecognizer+OWS.swift	Finished of the Conversation screen and JobQueue concurrency	3 years ago
UIImage+OWS.swift	Re-organize files	4 years ago
UIUtil.h	Re-organize files	4 years ago
UIUtil.m	Removed a bunch of unused code	3 years ago
UIView+OWS.swift	Fixed search performance, started styling in-conversaiton settings	3 years ago
UIView+Utilities.swift	Updated the conversation creation screens	3 years ago
UIViewController+OWS.h	Re-organize files	4 years ago
UIViewController+OWS.m	Updated the SessionShareExtension to work with GRDB	3 years ago
UIViewController+Utilities.swift	Progressing on theming functionality	3 years ago
WeakTimer.swift	Ditch unused Signal code	4 years ago