Morgan Pretty
b5004f38df
Increased build and version numbers
2023-04-13 12:09:19 +10:00
Morgan Pretty
7e39ed369f
Merge pull request #782 from RyanRory/message-and-image-info
...
Media info
2023-04-13 12:07:22 +10:00
ryanzhao
73f5608f16
Merge branch 'dev' into message-and-image-info
2023-04-13 09:15:46 +08:00
Morgan Pretty
ce5b1ca9e4
Merge pull request #824 from mpretty-cyro/fix/new-certificates
...
Updated the seed node certificates
2023-04-13 11:13:56 +10:00
Morgan Pretty
699a8200ae
Updated the port being used for the seed nodes
2023-04-13 11:12:14 +10:00
ryanzhao
6699e7ea0d
Merge branch 'dev' into message-and-image-info
2023-04-13 09:12:03 +08:00
Morgan Pretty
a21839536c
Merge remote-tracking branch 'upstream/dev' into fix/new-certificates
2023-04-13 11:09:09 +10:00
Morgan Pretty
7145bac72a
Merge pull request #823 from mpretty-cyro/feature/optimisations
...
Optimisations and Fixes
2023-04-13 11:05:29 +10:00
Morgan Pretty
5cbb4f632d
Fix for PR comment
2023-04-13 11:03:47 +10:00
Morgan Pretty
2a693df4c1
Updated the seed node certificates and removed the workaround
2023-04-13 09:41:26 +10:00
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
2023-04-13 09:26:34 +10:00
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
2023-04-12 16:50:35 +10:00
Morgan Pretty
fa1d786ece
Merge pull request #792 from RyanRory/switch-video-view
...
Swapping video views in call
2023-04-12 14:15:39 +10:00
Morgan Pretty
761ad7016e
Merge pull request #821 from oxen-io/dev
...
Release 2.2.11
2023-04-11 14:06:00 +10:00
Morgan Pretty
5241327b07
Merge pull request #820 from oxen-io/fix/certificate-issues
...
Fixed a couple of issues with seed node requests
2023-04-11 14:05:11 +10:00
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
2023-04-11 13:10:11 +10:00
ryanzhao
93ff94186a
fix an issue when quoting messages with multiple attachments, the quoted attachment doesn't stay the same.
2023-04-11 11:01:40 +08:00
ryanzhao
e261678d6d
Merge branch 'dev' into switch-video-view
2023-04-11 07:43:26 +08:00
ryanzhao
cac8d22e0b
Merge branch 'dev' into message-and-image-info
2023-04-11 07:42:57 +08:00
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
2023-04-06 18:09:26 +10:00
Morgan Pretty
9c24e878e9
Merge pull request #817 from oxen-io/dev
...
Release 2.2.10 Fixes
2023-04-05 18:12:20 +10:00
Morgan Pretty
dd0a24894b
Merge pull request #816 from oxen-io/fix/cocoapods-build-issue
...
Added a workaround for a Cocoapods XCode 14.3 issue
2023-04-05 18:10:56 +10:00
Morgan Pretty
eb56d603e5
Added a workaround for a Cocoapods XCode 14.3 issue
2023-04-05 18:09:48 +10:00
Morgan Pretty
4b4eb17a17
Merge pull request #815 from oxen-io/dev
...
Release 2.2.10
2023-04-05 17:38:52 +10:00
Morgan Pretty
fbdb033365
Increased build & version numbers
2023-04-05 17:38:02 +10:00
Morgan Pretty
e3f40642d4
Merge pull request #814 from mpretty-cyro/fix/job-runner-issues
...
JobRunner fixes
2023-04-05 17:36:14 +10:00
ryanzhao
06172777a5
Merge branch 'dev' into message-and-image-info
2023-04-05 15:35:39 +08:00
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
2023-04-05 17:19:21 +10:00
ryanzhao
16d4d0128e
add a new format for video duration
2023-04-05 14:57:25 +08:00
Morgan Pretty
2568d50835
Merge pull request #799 from RyanRory/conversation-swipe-actions
...
Conversation swipe actions
2023-04-05 16:50:11 +10:00
ryanzhao
1a672cdd0a
Merge branch 'dev' into message-and-image-info
2023-04-05 14:37:00 +08:00
ryanzhao
3433399184
Merge branch 'dev' into conversation-swipe-actions
2023-04-05 14:36:40 +08:00
ryanzhao
2ff85ebda1
fix UI issues
2023-04-05 14:36:20 +08:00
Morgan Pretty
744d9c58d4
Merge pull request #812 from mpretty-cyro/fix/pinned-sec-trust-issue
...
Updated seed node certificate verification logic
2023-04-05 15:24:40 +10:00
Morgan Pretty
81b63075cb
Updated the seed node certificate validation to use a specific date
2023-04-05 15:07:45 +10:00
ryanzhao
26ca3541ce
Merge branch 'dev' into message-and-image-info
2023-04-05 10:10:23 +08:00
ryanzhao
c101f61473
clean
2023-04-04 13:53:39 +08:00
ryanzhao
60b931b32a
pod update
2023-04-04 12:27:39 +08:00
ryanzhao
d2dbace848
clean
2023-04-04 12:00:02 +08:00
ryanzhao
84dd7f1a7f
Merge branch 'dev' into conversation-swipe-actions
2023-04-04 11:38:37 +08:00
ryanzhao
36748a81c6
use delete action for group that current user is no longer in
2023-04-04 11:38:04 +08:00
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
2023-04-04 12:59:20 +10:00
Morgan Pretty
d208135433
Merge pull request #810 from mpretty-cyro/fix/reentracy-crash
...
Fix reentrancy crash
2023-04-04 12:09:16 +10:00
Morgan Pretty
e11ba3c95f
Updated cocoapods and fixed a XCode 14.3 build error
2023-04-04 12:07:06 +10:00
Morgan Pretty
dcae781923
Fixed a crash due to database reentrancy when generating the users blinded public key
2023-04-04 10:18:43 +10:00
ryanzhao
7f24097343
update leave group copy in conversation settings view
2023-04-03 15:41:17 +08:00
ryanzhao
6302170e4d
remove mark as read/unread action
2023-04-03 15:26:40 +08:00
ryanzhao
27cfe6b8b8
make the swipe actions always right & correct the copy for delete a covnersation
2023-04-03 15:22:36 +08:00
ryanzhao
63f49615b5
fix an issue where info action will show when there is no attachments
2023-04-03 09:22:31 +08:00
ryanzhao
53293fbb25
add localised string for message info title
2023-04-03 09:04:27 +08:00
