Commit Graph

21 Commits (ca8344db0642dc004dc7c2b482dd0b1f03fd6e3f)

Author SHA1 Message Date
Ryan ZHAO c4ebdd6d3d fix some strings 8 months ago
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 9 months ago
Ryan ZHAO 003816117f Merge branch 'dev' into standardised-strings 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 77e9a1d29a fix landing screen T&C string 10 months ago
Ryan ZHAO 19b4055a2e Merge branch 'onboarding' into standardised-strings 10 months ago
Ryan ZHAO b2a7e142a3 update onboarding flow when the seed is already stored 10 months ago
Ryan ZHAO 527c921df3 Merge branch 'onboarding' into standardised-strings 11 months ago
Ryan ZHAO 63ca28b002 make the fake chat bubbles in landing screen scrollable 11 months ago
Ryan ZHAO ecb1b83a8e upgrade to minimum iOS 15.0 support 11 months ago
Ryan ZHAO 90de873ea0 add and modify strings 11 months ago
Ryan ZHAO 1d01eb91ae Merge branch 'onboarding' into standardised-strings 12 months ago
Ryan ZHAO 431c024354 update accessibility ids 12 months ago
Ryan ZHAO d8c6692fbc add closed button for Open URL Modal 12 months ago
Ryan ZHAO 96832484b3 minor refactor on getting app name 12 months 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