Commit Graph

17681 Commits (e1f5f86743fc14155cf621a68484f9eaed5289ca)
 

Author SHA1 Message Date
Morgan Pretty 7e39ed369f
Merge pull request #782 from RyanRory/message-and-image-info
Media info
1 year ago
ryanzhao 73f5608f16 Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty ce5b1ca9e4
Merge pull request #824 from mpretty-cyro/fix/new-certificates
Updated the seed node certificates
1 year ago
Morgan Pretty 699a8200ae Updated the port being used for the seed nodes 1 year ago
ryanzhao 6699e7ea0d Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty a21839536c Merge remote-tracking branch 'upstream/dev' into fix/new-certificates 1 year ago
Morgan Pretty 7145bac72a
Merge pull request #823 from mpretty-cyro/feature/optimisations
Optimisations and Fixes
1 year ago
Morgan Pretty 5cbb4f632d Fix for PR comment 1 year ago
Morgan Pretty 2a693df4c1 Updated the seed node certificates and removed the workaround 1 year ago
Morgan Pretty cac2831208 Fixed a few issues with albums and attachments
Fixed an issue where the JobRunner could schedule dependent jobs which were already running (eg. uploading attachments multiple times)
Fixed an issue where the image used for quotes might not be the first in an album message
Fixed an issue where sending an album message wouldn't send attachments in the correct order
Fixed an issue where album attachments wouldn't be downloaded in the correct order
1 year ago
Morgan Pretty 70ce967df6 Made a few optimisations and fixes
Made a couple of DB query optimisations for the Home and Conversation screens
Removed some compiler-complex global generic functions
Increased the timeout for file uploads
Fixed a few import issues
Fixed an issue preventing calls on the simulator from working (disable CallKit on the simulator)
Fixed an issue where opening a conversation with a draft would result in a typing indicator notification being sent (if enabled)
Fixed a truncation issue on the CallVC
1 year ago
Morgan Pretty fa1d786ece
Merge pull request #792 from RyanRory/switch-video-view
Swapping video views in call
1 year ago
Morgan Pretty 761ad7016e
Merge pull request #821 from oxen-io/dev
Release 2.2.11
1 year ago
Morgan Pretty 5241327b07
Merge pull request #820 from oxen-io/fix/certificate-issues
Fixed a couple of issues with seed node requests
1 year ago
Morgan Pretty b270133f68 Fixed a couple of issues with seed node requests
Updated the seed node certificates to use the new 10 year ones
Fixed an issue where multiple seed node requests could be triggered at once
Increased the version & build numbers
1 year ago
ryanzhao 93ff94186a fix an issue when quoting messages with multiple attachments, the quoted attachment doesn't stay the same. 1 year ago
ryanzhao e261678d6d Merge branch 'dev' into switch-video-view 1 year ago
ryanzhao cac8d22e0b Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty f4d6babca2 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/HomeVC.swift
#	Session/Home/HomeViewModel.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.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/id-ID.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/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Shared/FullConversationCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Utilities/UIContextualAction+Theming.swift
#	SessionUtilitiesKit/Database/Models/Job.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
1 year ago
Morgan Pretty 9c24e878e9
Merge pull request #817 from oxen-io/dev
Release 2.2.10 Fixes
1 year ago
Morgan Pretty dd0a24894b
Merge pull request #816 from oxen-io/fix/cocoapods-build-issue
Added a workaround for a Cocoapods XCode 14.3 issue
1 year ago
Morgan Pretty eb56d603e5 Added a workaround for a Cocoapods XCode 14.3 issue 1 year ago
Morgan Pretty 4b4eb17a17
Merge pull request #815 from oxen-io/dev
Release 2.2.10
1 year ago
Morgan Pretty fbdb033365 Increased build & version numbers 1 year ago
Morgan Pretty e3f40642d4
Merge pull request #814 from mpretty-cyro/fix/job-runner-issues
JobRunner fixes
1 year ago
ryanzhao 06172777a5 Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty 437ec27d72 JobRunner fixes
Updated the DataExtractionNotification to take a 'sentTimestamp' when created to reduce the chance for duplicates being sent
Fixed an issue where the 'hasPendingOrRunningJob' check didn't actually include running jobs
Fixed some odd behaviours with job dependencies
Fixed an incorrect failure count check
1 year ago
ryanzhao 16d4d0128e add a new format for video duration 1 year ago
Morgan Pretty 4801ebd7c2 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
#	SessionMessagingKit/Jobs/Types/AttachmentUploadJob.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/NotifyPushServerJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
1 year ago
Morgan Pretty 2568d50835
Merge pull request #799 from RyanRory/conversation-swipe-actions
Conversation swipe actions
1 year ago
Morgan Pretty ffdc59b704 Fixed a few issues with the JobRunner
Updated the JobRunner to support dependency injection
Updated the DataExtractionNotification to take a 'sentTimestamp' when created to reduce the chance for duplicates being sent
Fixed an issue where checking current and pending jobs wasn't including blocking jobs
Fixed an issue where the 'hasPendingOrRunningJob' check didn't actually include running jobs
Fixed some odd behaviours with job dependencies
Fixed an incorrect failure count check
1 year ago
ryanzhao 1a672cdd0a Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao 3433399184 Merge branch 'dev' into conversation-swipe-actions 1 year ago
ryanzhao 2ff85ebda1 fix UI issues 1 year ago
Morgan Pretty 744d9c58d4
Merge pull request #812 from mpretty-cyro/fix/pinned-sec-trust-issue
Updated seed node certificate verification logic
1 year ago
Morgan Pretty 81b63075cb Updated the seed node certificate validation to use a specific date 1 year ago
ryanzhao 26ca3541ce Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao c101f61473 clean 1 year ago
ryanzhao 60b931b32a pod update 1 year ago
ryanzhao d2dbace848 clean 1 year ago
ryanzhao 84dd7f1a7f Merge branch 'dev' into conversation-swipe-actions 1 year ago
ryanzhao 36748a81c6 use delete action for group that current user is no longer in 1 year ago
Morgan Pretty ae0d6f2f29
Merge pull request #811 from mpretty-cyro/fix/xcode-14-3-compile-issue
Updated cocoapods and fixed a XCode 14.3 build error
1 year ago
Morgan Pretty cd00975e56 Merge remote-tracking branch 'origin/fix/xcode-14-3-compile-issue' into feature/job-runner-unit-tests 1 year ago
Morgan Pretty 3c526645a0 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 1 year ago
Morgan Pretty d208135433
Merge pull request #810 from mpretty-cyro/fix/reentracy-crash
Fix reentrancy crash
1 year ago
Morgan Pretty e11ba3c95f Updated cocoapods and fixed a XCode 14.3 build error 1 year ago
Morgan Pretty dcae781923 Fixed a crash due to database reentrancy when generating the users blinded public key 1 year ago
ryanzhao 7f24097343 update leave group copy in conversation settings view 1 year ago
Morgan Pretty a7af1ca768 Started laying the ground work for unit testing the JobRunnner
Starting injecting dependencies for the JobRunner
Turned the JobRunner into a singleton instance
1 year ago