Commit Graph

13 Commits (9f9d3d4455b1cfeafbb6df5908cc22b052242ba2)

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
Morgan Pretty bef27ee0c7 Fixed build issues resulting from rebase after Onboarding 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
Ryan ZHAO 19b4055a2e Merge branch 'onboarding' into standardised-strings 1 year ago
Ryan ZHAO 572e5ceb7d fix an issue where 100 bytes string won't pass the display name length test 1 year ago
Ryan ZHAO ecb1b83a8e upgrade to minimum iOS 15.0 support 1 year ago
Ryan ZHAO 0d6ed3fa1f fix display name screen title 1 year ago
Ryan ZHAO bcc1d436bc WIP: update strings for onboarding changes 1 year ago
Ryan ZHAO 72fa1ae52a WIP: add accessibility ids 2 years ago
Ryan ZHAO e85df4efd3 update string 2 years ago
Ryan ZHAO 0fc40edb71 update the text input to support multiple lines 2 years ago
Ryan ZHAO 5eca31aaa2 refactor & clean 2 years ago