Commit Graph

25 Commits (79b98994fef18d7fcc24f99b86b060fcc19267e1)

Author SHA1 Message Date
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
Ryan ZHAO 7764f7f3f6 clean with constants 1 year ago
Morgan Pretty ce01f128f3 Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
Ryan ZHAO 003816117f Merge branch 'dev' into standardised-strings 1 year ago
Morgan Pretty ed472f44c5 Merge remote-tracking branch 'upstream/dev' into release/2.6.3
# Conflicts:
#	Session/Meta/AppDelegate.swift
#	Session/Onboarding/LandingVC.swift
#	Session/Onboarding/LinkDeviceVC.swift
#	Session/Onboarding/RegisterVC.swift
#	Session/Onboarding/RestoreVC.swift
1 year ago
Morgan Pretty 3dada9e58a Updated mention styling and added back path "recovery" logic 1 year ago
Ryan ZHAO ecb1b83a8e upgrade to minimum iOS 15.0 support 1 year ago
Ryan ZHAO 96832484b3 minor refactor on getting app name 2 years ago
Ryan ZHAO f4a979f55f Merge branch 'onboarding' into standardised-strings 2 years ago
Ryan ZHAO 6d297dc2a9 update strings 2 years ago
Ryan ZHAO cdb9282313 replace more localized string 2 years ago
Ryan ZHAO de0a3b0ee0 Merge branch 'dev' into onboarding 2 years ago
Ryan ZHAO d1fa40c52e fix the document message in message info screen 2 years ago
Ryan ZHAO 408c889926 fix an issue where voice messages in message info screen won't show the duration 2 years ago
Ryan ZHAO bd9941fcc8 make the name in quoted messages wraps to infinite lines in the message info screen 2 years ago
Ryan ZHAO f1822c10d0 minor change of swiftui preview syntax for CI 2 years ago
Ryan ZHAO 20db5a48a3 minor refactor on background 2 years ago
Ryan ZHAO f28467a039 minor fix document view 2 years ago
Ryan ZHAO 4353f16694 implement quote view in message info screen 2 years ago
Ryan ZHAO 0d27bbed00 refactor quote view into SwiftUI and clean up UIKit quote view 2 years ago
Ryan ZHAO 2b42ffd6d4 minor refactor 2 years ago
Ryan ZHAO d138dbd73d minor fix for open group invitation view 2 years ago
Ryan Zhao 74b62e9857 fix link preview with swift ui 2 years ago
Ryan Zhao a826fcb061 fix document view swift ui 2 years ago
ryanzhao 2a10ab208a clean up and implementation in message info screen 2 years ago