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 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
2 years ago
..
BaseVC.swift clean up 2 years ago
CaptionView.swift Re-organize files 4 years ago
ConversationCell.swift Merge branch 'remove-OWSBlockingManager' into voice-calls-2 2 years ago
DismissableTextField.swift Removed a bunch of unused code 2 years ago
LoadingViewController.swift Redesign conversation screen part 1 3 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 3 years ago
ReminderView.swift Removed a bunch of unused code 2 years ago
ScanQRCodeWrapperVC.swift fix a crash when scanning false QR code to link a device 3 years ago
UserCell.swift Swapped a number of areas to use the built-in tintColor instead of the custom asTintedImage 2 years ago
UserSelectionVC.swift Started adding logic for the outbox endpoint 2 years ago