Commit Graph

676 Commits (fc94d24ddfff250473d553db6901250a6f9a9d76)

Author SHA1 Message Date
Morgan Pretty 77b6faccb3 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionUtilitiesKit/Database/Models/Job.swift
#	SessionUtilitiesKit/Database/Models/JobDependencies.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
1 year ago
Morgan Pretty 03d879804f Increased build and version numbers 1 year ago
Morgan Pretty 11b4c82bc3 Updated permission descriptions to appease Apple 1 year ago
Morgan Pretty 6832b788d9 Increase build number 1 year ago
Morgan Pretty 27e494dcb5 Increased build and version numbers 1 year ago
Morgan Pretty b5004f38df Increased build and version numbers 1 year ago
ryanzhao 73f5608f16 Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao 6699e7ea0d Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty 2a693df4c1 Updated the seed node certificates and removed the workaround 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 cac8d22e0b Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty fbdb033365 Increased build & version numbers 1 year ago
ryanzhao 06172777a5 Merge branch 'dev' into message-and-image-info 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 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 26ca3541ce Merge branch 'dev' into message-and-image-info 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
ryanzhao 620d69ada9 Merge branch 'dev' into conversation-swipe-actions 1 year ago
Morgan Pretty 65e7009b0a Updated build and version numbers 1 year ago
ryanzhao 2e7325ce9a minor fix 1 year ago
ryanzhao 75d60f9d85 Merge branch 'dev' into conversation-swipe-actions 1 year ago
ryanzhao 723d8a79e1 bump up build number 1 year ago
ryanzhao 6f5052c0da WIP: make group leaving a job 1 year ago
ryanzhao 4c3a9e8cc1 fix FTS table and global search 1 year ago
ryanzhao 34d41d7d40 Merge branch 'dev' into conversation-swipe-actions 1 year ago
ryanzhao 4af96fb841 update build number 1 year ago
Ryan Zhao b0cdce8acf Merge branch 'dev' into conversation-swipe-actions 1 year ago
Ryan Zhao 2f909fbb55 Merge branch 'dev' into message-and-image-info 1 year ago
Ryan Zhao 37962fa071 update build number 1 year ago
Ryan Zhao 779e199d7d update build number 1 year ago
Ryan Zhao 2aee7b8c05 Merge branch 'dev' into conversation-swap-action 1 year ago
Ryan Zhao 9d11cf87e0 update build number 1 year ago
Ryan Zhao 9112231f66 WIP 1 year ago
Ryan Zhao bf5f927ad0 Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao b3378992ed WIP: feat: modify conversation swap actions 1 year ago
Ryan Zhao 52ba016b80 bump up version & build number 1 year ago
Morgan Pretty e4d6400375 Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities
# Conflicts:
#	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
1 year ago
Morgan Pretty 08b1e9a131 Started caching pending ReadReceipt messages to resolve an edge-case
Fixed an issue where read receipts could be sent for already read messages
Fixed an issue where the read state change might not update the UI
1 year ago
ryanzhao efc9790a9a Merge branch 'dev' into message-and-image-info 1 year ago
Ryan Zhao 2f8ac7deaf update build & version number 1 year ago
ryanzhao 092864f918 Merge branch 'dev' into message-and-image-info 1 year ago
Morgan Pretty 617eae6858 Increased build and version numbers 1 year ago
ryanzhao 78cea3ac29 implement carousel view delegate 1 year ago
ryanzhao 723beed101 Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao 54ef07402b update the build number 1 year ago
Ryan Zhao 838969efa6 WIP: encapsulate carousel view 1 year ago
Ryan Zhao d1aacf24c2 Merge branch 'dev' into message-and-image-info 1 year ago
ryanzhao 41f1b14066 bump up version & build number 1 year ago
ryanzhao 3f33caf91a wip: carousel view 1 year ago
ryanzhao 8a2264e95f wip: add media preview view 1 year ago