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 8109a326cf Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Closed Groups/NewClosedGroupVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Message Cells/CallMessageCell.swift # Session/Conversations/Views & Modals/JoinOpenGroupModal.swift # Session/Home/HomeVC.swift # Session/Home/New Conversation/NewDMVC.swift # Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift # Session/Open Groups/OpenGroupSuggestionGrid.swift # Session/Settings/SettingsVC.swift # Session/Shared/BaseVC.swift # Session/Shared/OWSQRCodeScanningViewController.m # Session/Shared/ScanQRCodeWrapperVC.swift # Session/Shared/UserCell.swift # SessionMessagingKit/Configuration.swift # SessionShareExtension/SAEScreenLockViewController.swift # SessionUIKit/Style Guide/Gradients.swift # SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift # SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m		3 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	Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor	3 years ago
Atomic.swift	Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor	3 years ago
BuildConfiguration.swift	…
CallRingTonePlayer.swift	add ringtone and other UI improvement	4 years ago
Collection+Subscripting.swift	Scroll to last unread message upon opening a conversation	5 years ago
Data+Utilities.swift	Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor	3 years ago
Dependencies.swift	Added fixes and defensive coding for a number of crashes	3 years ago
Dictionary+Utilities.swift	Reduced unneeded DB write operations and fixed a few minor UI bugs	3 years ago
Features.swift	Delete V1 OGS & file server	5 years ago
General.swift	Merge branch 'feature/database-refactor' into emoji-reacts	3 years ago
LRUCache.swift	Fixed a few closed group and job issues	4 years ago
Logging.swift	include more info in logs	4 years ago
NSNotificationCenter+OWS.h	…
NSNotificationCenter+OWS.m	…
NSRegularExpression+SSK.swift	enable CBR	4 years ago
NSString+SSK.h	…
NSString+SSK.m	…
NSTimer+Proxying.h	…
NSTimer+Proxying.m	…
NSUserDefaults+OWS.h	…
NSUserDefaults+OWS.m	…
OWSMath.h	…
ReusableView.swift	Started re-adding media gallery interactions (in progress)	4 years ago
SNUserDefaults.swift	Fixed a bunch more bugs around push notifications and avatars	3 years ago
SessionId.swift	Fixed an edge-case crash, a couple of minor bugs and made future-proofing tweaks	3 years ago
Set+Utilities.swift	Working on the MediaGallery and ClosedGroup handling	4 years ago
Sodium+Utilities.swift	Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes	3 years ago
String+SSK.swift	…
String+Trimming.swift	Got the '/inbox' APIs and encryption/decryption/validation working	4 years ago
String+Utilities.swift	ui: new conversation screen contacts table	3 years ago
Timer+MainThread.swift	WIP: timer + main thread	4 years ago
TimestampUtils.swift	ignore call messages over 60s	4 years ago
UICollectionView+ReusableView.swift	Started re-adding media gallery interactions (in progress)	4 years ago
UIDevice+featureSupport.swift	…
UIEdgeInsets.swift	Implement multi device UI	5 years ago
UITableView+ReusableView.swift	Cleared out some of the legacy serialisation logic, further UI binding	4 years ago
UIView+OWS.h	Finished removing usages to non-theme colour variables	3 years ago
UIView+OWS.m	Finished removing usages to non-theme colour variables	3 years ago
UnicodeScalar+Utilities.swift	Updated the JobRunner to have multiple job queues (needs more testing)	3 years ago
Weak.swift	…