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 72525ae37b Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Podfile
#	Podfile.lock
#	Scripts/build_libSession_util.sh
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Calls/Views & Modals/IncomingCallBanner.swift
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/CallMessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/MediaGalleryViewModel.swift
#	Session/Media Viewing & Editing/MediaInfoVC.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/AppEnvironment.swift
#	Session/Path/PathStatusView.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Jobs/SendReadReceiptsJob.swift
#	SessionMessagingKit/Jobs/Types/GroupLeavingJob.swift
#	SessionMessagingKit/Messages/Message+Destination.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Sending & Receiving/Errors/MessageSenderError.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Utilities/ProfilePictureView+Convenience.swift
#	SessionMessagingKit/Utilities/SessionEnvironment.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionSnodeKit/Types/OnionRequestAPIError.swift
#	SessionSnodeKit/Types/SnodeAPIError.swift
2 years ago
..
AttributedText.swift fix underline for links 2 years ago
BezierPathView.swift Objective-C Refactoring, Removed PureLayout, General Cleanup 2 years ago
ConfirmationModal.swift Objective-C Refactoring, Removed PureLayout, General Cleanup 2 years 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 Objective-C Refactoring, Removed PureLayout, General Cleanup 2 years ago
PlaceholderIcon.swift Objective-C Refactoring, Removed PureLayout, General Cleanup 2 years ago
ProfilePictureView.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
RadioButton.swift Added group message requests, admin message deletion, fixed a few bugs 2 years ago
SearchBar.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Separator.swift Added in missing code changes unrelated to closed groups rebuild 3 years ago
SessionButton.swift Finished invite statuses and toasts 2 years 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 2 years ago
TextField.swift Objective-C Refactoring, Removed PureLayout, General Cleanup 2 years ago
TextView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
ToastController.swift Added bolding to the control messages and unit testing work 2 years ago
TopBannerController.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago