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.
session-ios/Session/Shared
Morgan Pretty 9216506847 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session/Calls/Views & Modals/CallVideoView.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hr.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/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Utilities/BackgroundPoller.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
3 years ago
..
BaseVC.swift minor fix for conversation screen title position 3 years ago
CaptionView.swift Re-organize files 4 years ago
ConversationCell.swift Merge branch 'remove-OWSBlockingManager' into voice-calls-2 3 years ago
DismissableTextField.swift Removed a bunch of unused code 3 years ago
LoadingViewController.swift Redesign conversation screen part 1 4 years ago
MarqueeLabel.swift Re-organize files 4 years ago
NeverClearView.swift Re-organize files 4 years ago
OWSBezierPathView.h Re-organize files 4 years ago
OWSBezierPathView.m Re-organize files 4 years ago
OWSProgressView.h Re-organize files 4 years ago
OWSProgressView.m Re-organize files 4 years ago
OWSQRCodeScanningViewController.h Re-organize files 4 years ago
OWSQRCodeScanningViewController.m Re-organize files 4 years ago
OWSScreenLockUI.h Re-organize files 4 years ago
OWSScreenLockUI.m handle access to selected photos & optimise the process of request photo library permission 4 years ago
ReminderView.swift Removed a bunch of unused code 3 years ago
ScanQRCodeWrapperVC.swift fix a crash when scanning false QR code to link a device 4 years ago
UserCell.swift Swapped a number of areas to use the built-in tintColor instead of the custom asTintedImage 3 years ago
UserSelectionVC.swift Started adding logic for the outbox endpoint 3 years ago