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 2bcd8e28ab Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/Content Views/QuoteView.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Database/Models/RecipientState.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/General/String+Utilities.swift
#	SessionUtilitiesKit/Networking/IPv4.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLock.swift
1 year ago
..
Types Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
Views Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
BaseVC.swift
BezierPathView.swift WIP: refactor BezierPathView with swiftUI 3 years ago
CaptionView.swift Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
FullConversationCell.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
LoadingIndicatorView.swift minor change of swiftui preview syntax for CI 2 years ago
LoadingViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
OWSBezierPathView.h Fixed a hang, removed redundant libs, files and code 3 years ago
OWSBezierPathView.m Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
QRCodeScanningViewController.swift workaround for restarting capture after going back from message notification screen 2 years ago
ScanQRCodeScreen.swift clean with constants 1 year ago
ScanQRCodeWrapperVC.swift Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
ScreenLockUI.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
SessionCarouselView+Info.swift
SessionCarouselView+SwiftUI.swift upgrade to minimum iOS 15.0 support 2 years ago
SessionCarouselView.swift
SessionCarouselViewDelegate.swift
SessionHostingViewController.swift Fixed build issues resulting from rebase after Onboarding 1 year ago
SessionTableViewController.swift upgrade to minimum iOS 15.0 support 2 years ago
SessionTableViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
SessionTableViewTitleView.swift Fixed a number of bugs found in the internal release 2 years ago
UserSelectionVC.swift