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/SessionUIKit/Components
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
8 months ago
..
SwiftUI Merge branch 'onboarding' into standardised-strings 10 months ago
ConfirmationModal.swift Merge branch 'onboarding' into standardised-strings 12 months ago
GradientView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
HighlightMentionBackgroundView.swift Fixed a number of issues found during internal testing 2 years ago
Modal.swift Updated the profile picture management UI 2 years ago
PlaceholderIcon.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
ProfilePictureView.swift Merge branch 'dev' into standardised-strings 1 year ago
RadioButton.swift add accessibility id for radio buttons 2 years ago
SearchBar.swift Merge branch 'onboarding' into standardised-strings 12 months ago
Separator.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
SessionButton.swift Merge branch 'dev' into onboarding 1 year ago
StyledNavigationController.swift Fixed most of the styling issues raised during QA 3 years ago
TabBar.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
TappableLabel.swift Fixed a few issues around jumping between messages 1 year ago
TextField.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TextView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TopBannerController.swift Minor tweaks 8 months ago