Commit Graph

153 Commits (master)

Author SHA1 Message Date
Ryan ZHAO b8b8419fdb minor fix on the tool bar theme and bump up build number 7 months ago
Ryan ZHAO fc47cf3961 Merge branch 'standardised-strings' of https://github.com/RyanRory/loki-messenger-ios into standardised-strings 8 months ago
Ryan ZHAO b78a7691af fix an nav bar issue 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 c3b909ae6e fix an UI issue of navigation bar 8 months ago
Morgan Pretty 2032dafc74 Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager
# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m
8 months ago
Morgan Pretty fd8fdb1105 Updated the PrimaryFillButton text colours 8 months ago
Morgan Pretty 0673194079 Minor theme change 8 months ago
Morgan Pretty ce01f128f3 Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
Ryan ZHAO 19b4055a2e Merge branch 'onboarding' into standardised-strings 9 months ago
Ryan ZHAO 16f47d4f87 fix an issue where copy is cut off on small devices 10 months ago
Ryan ZHAO ecb1b83a8e upgrade to minimum iOS 15.0 support 10 months ago
Ryan ZHAO 1d01eb91ae Merge branch 'onboarding' into standardised-strings 11 months ago
Ryan ZHAO de4a367374 fix an issue that the navigation bar won't change as the appearance settings changes 11 months ago
Morgan Pretty d9a64e0148 Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
11 months ago
Morgan Pretty e420ce4e58 Merge remote-tracking branch 'upstream/dev' into onboarding
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Onboarding/PNModeVC.swift
#	SessionUIKit/Style Guide/Values.swift
11 months ago
Ryan ZHAO f4a979f55f Merge branch 'onboarding' into standardised-strings 11 months ago
Morgan Pretty c6c2881338 Reworked the libSession network to be instance based
• Fixed an issue where the DisappearingMessagesJob was getting run for every individual message process instead of just once after processing all messages from a poll
• Tweaked the polling logic to split the user, groups and community pollers into separate queues
• Tweaked the logic to restart the open group poller immediately after joining a community (to avoid an edge-case where there could be a long delay before the initial poll is made)
• Tweaked the logic for checking if PNs are susceptible to failure to only dispatch to the main thread once
• Cleaned up some warnings
• Updated the app versioning to be at the project level instead of target level
• Added the ability to define a unique hash for a job for deduplication
12 months ago
Ryan ZHAO 63658f70d7 Merge branch 'dev' into standardised-strings 12 months ago
Morgan Pretty c065abc584 Cleaned up a bunch of warnings, renamed a couple of folders 1 year ago
Ryan ZHAO 6a04ba5fc2 fix untouched strings 1 year ago
Ryan ZHAO 0ebf0ea365 Merge branch 'dev' into standardised-strings 1 year ago
Ryan ZHAO f5afdae646 Merge branch 'dev' into message-detail-screen 1 year ago
Ryan ZHAO 673170360d Merge branch 'dev' into onboarding 1 year ago
Ryan ZHAO f9ef58c9d3 WIP: add strings 1 year ago
Ryan ZHAO c5eb55d1e8 WIP: implement start new conversation screen with SwiftUI 1 year ago
Ryan ZHAO e47d6cdb1b fix: standardise default display picture 1 year ago
Ryan ZHAO be5418dc4a further refactor on background 1 year ago
Ryan ZHAO 20db5a48a3 minor refactor on background 1 year ago
ryanzhao f603b422b0 Merge branch 'dev' into message-detail-screen
# Conflicts:
#	Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift
1 year ago
Ryan Zhao 45d2964bf1 Merge branch 'dev' into onboarding 1 year ago
ryanzhao 0632514d45 imp: updated recovery password screen 1 year ago
Morgan Pretty 12347c9f2f Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift
1 year ago
Morgan Pretty de7d85f4cb Merge remote-tracking branch 'upstream/dev' into fix/media-interactions 1 year ago
Morgan Pretty a6931bb922 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift
2 years ago
Morgan Pretty bd98db2612 Fixed a few bugs and crashes around media interactions
Fixed a crash when trying to grant permission to access additional photos
Fixed a bug where audio files would incorrectly get recognised as voice messages
Replaced our custom video/audio players with the native ones (which have additional built-in controls)
Updated the errors from SSKKeychainStorage to include useful information
Updated layout for audio attachments
2 years ago
Morgan Pretty 3a9ada581d Fixed an issue where theme changes stopped updating nav styling 2 years ago
ryanzhao dee5e56ccc Merge branch 'dev' into onboarding 2 years ago
ryanzhao c787d2558f Merge branch 'dev' into message-detail-screen 2 years ago
ryanzhao 2d0bbe4455 Merge branch 'dev' into disappearing-message-redesign
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
2 years ago
Morgan Pretty 52836cff91 Fixed a couple more issues
Fixed an issue with the Emoji generation
Fixed the SessionThread 'isPinned' property
Fixed an issue when migrating from a pre 2.3.0 version to the latest version
2 years ago
Ryan Zhao b7940e52ae WIP: loading 2 years ago
Ryan Zhao 9efba621f7 minor refactor and clean up 2 years ago
Ryan Zhao 353abe7089 imp: toast view 2 years ago
Ryan Zhao 6741575f04 adjust horizontal padding of account created view 2 years ago
Ryan Zhao 5f4ecfd4a2 WIP: loading view 2 years ago
ryanzhao e414f17a4d landing screen 2 years ago
ryanzhao c9d97c10d0 WIP: landing screen (attributed text) 2 years ago
ryanzhao c6af2dba54 minor fix on theming 2 years ago
Ryan Zhao 09bece5c10 add custom fonts to SwiftUI 2 years ago