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
Ryan ZHAO
7764f7f3f6
clean with constants
8 months ago
Ryan ZHAO
1e1d71f788
deep clean
8 months ago
Morgan Pretty
bef27ee0c7
Fixed build issues resulting from rebase after Onboarding
8 months ago
Ryan ZHAO
003816117f
Merge branch 'dev' into standardised-strings
8 months ago
Morgan Pretty
3676f63cb0
Fixed some bugs found during QA
...
• Fixed a bug where the onboarding wouldn't be considered complete after successfully retrieving a displayName when restoring an account
• Fixed a couple of libSession networking bugs
• Tweaked some logging
• Removed some legacy code
9 months 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
9 months ago
Ryan ZHAO
ecb1b83a8e
upgrade to minimum iOS 15.0 support
11 months ago
Ryan ZHAO
1d01eb91ae
Merge branch 'onboarding' into standardised-strings
11 months ago
Ryan ZHAO
431c024354
update accessibility ids
11 months ago
Ryan ZHAO
688ab805d7
UI fix for onboarding merge
12 months ago
Ryan ZHAO
96832484b3
minor refactor on getting app name
12 months ago
Ryan ZHAO
bcc1d436bc
WIP: update strings for onboarding changes
12 months ago
Ryan ZHAO
a967b4dfd0
fix an issue where not the whole area of PN mode option is tappable
1 year ago
Ryan ZHAO
72fa1ae52a
WIP: add accessibility ids
1 year ago
Ryan ZHAO
e85df4efd3
update string
1 year ago
Ryan ZHAO
5eca31aaa2
refactor & clean
1 year ago