Commit graph

667 commits

Author SHA1 Message Date
Morgan Pretty b5004f38df Increased build and version numbers 2023-04-13 12:09:19 +10:00
ryanzhao 73f5608f16 Merge branch 'dev' into message-and-image-info 2023-04-13 09:15:46 +08:00
ryanzhao 6699e7ea0d Merge branch 'dev' into message-and-image-info 2023-04-13 09:12:03 +08:00
Morgan Pretty 2a693df4c1 Updated the seed node certificates and removed the workaround 2023-04-13 09:41:26 +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 cac8d22e0b Merge branch 'dev' into message-and-image-info 2023-04-11 07:42:57 +08:00
Morgan Pretty fbdb033365 Increased build & version numbers 2023-04-05 17:38:02 +10:00
ryanzhao 06172777a5 Merge branch 'dev' into message-and-image-info 2023-04-05 15:35:39 +08:00
ryanzhao 26ca3541ce Merge branch 'dev' into message-and-image-info 2023-04-05 10:10:23 +08:00
ryanzhao 620d69ada9 Merge branch 'dev' into conversation-swipe-actions 2023-03-17 14:48:52 +11:00
Morgan Pretty 65e7009b0a Updated build and version numbers 2023-03-16 17:35:52 +11:00
ryanzhao 2e7325ce9a minor fix 2023-03-14 13:46:52 +11:00
ryanzhao 75d60f9d85 Merge branch 'dev' into conversation-swipe-actions 2023-03-14 13:42:29 +11:00
ryanzhao 723d8a79e1 bump up build number 2023-03-14 13:33:59 +11:00
ryanzhao 6f5052c0da WIP: make group leaving a job 2023-03-14 13:04:03 +11:00
ryanzhao 4c3a9e8cc1 fix FTS table and global search 2023-03-14 10:44:02 +11:00
ryanzhao 34d41d7d40 Merge branch 'dev' into conversation-swipe-actions 2023-03-08 11:55:53 +11:00
ryanzhao 4af96fb841 update build number 2023-03-08 11:45:33 +11:00
Ryan Zhao b0cdce8acf Merge branch 'dev' into conversation-swipe-actions 2023-03-06 16:44:56 +11:00
Ryan Zhao 2f909fbb55 Merge branch 'dev' into message-and-image-info 2023-03-06 16:13:43 +11:00
Ryan Zhao 37962fa071 update build number 2023-03-06 16:13:08 +11:00
Ryan Zhao 779e199d7d update build number 2023-03-06 15:53:26 +11:00
Ryan Zhao 2aee7b8c05 Merge branch 'dev' into conversation-swap-action 2023-02-27 11:40:49 +11:00
Ryan Zhao 9d11cf87e0 update build number 2023-02-27 11:38:01 +11:00
Ryan Zhao 9112231f66 WIP 2023-02-27 11:37:25 +11:00
Ryan Zhao bf5f927ad0 Merge branch 'dev' into message-and-image-info 2023-02-27 10:03:34 +11:00
ryanzhao b3378992ed WIP: feat: modify conversation swap actions 2023-02-24 17:03:45 +11:00
Ryan Zhao 52ba016b80 bump up version & build number 2023-02-23 15:06:41 +11:00
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
2023-02-20 08:44:56 +11:00
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
2023-02-15 15:11:57 +11:00
ryanzhao efc9790a9a Merge branch 'dev' into message-and-image-info 2023-02-14 09:37:41 +11:00
Ryan Zhao 2f8ac7deaf update build & version number 2023-02-13 16:41:48 +11:00
ryanzhao 092864f918 Merge branch 'dev' into message-and-image-info 2023-02-09 11:17:16 +11:00
Morgan Pretty 617eae6858 Increased build and version numbers 2023-02-06 13:11:20 +11:00
ryanzhao 78cea3ac29 implement carousel view delegate 2023-01-31 11:06:06 +11:00
ryanzhao 723beed101 Merge branch 'dev' into message-and-image-info 2023-01-31 09:56:20 +11:00
ryanzhao 54ef07402b update the build number 2023-01-31 09:56:01 +11:00
Ryan Zhao 838969efa6 WIP: encapsulate carousel view 2023-01-30 14:07:27 +11:00
Ryan Zhao d1aacf24c2 Merge branch 'dev' into message-and-image-info 2023-01-30 09:49:38 +11:00
ryanzhao 41f1b14066 bump up version & build number 2023-01-27 16:09:20 +11:00
ryanzhao 3f33caf91a wip: carousel view 2023-01-25 14:52:44 +11:00
ryanzhao 8a2264e95f wip: add media preview view 2023-01-20 14:12:14 +11:00
Ryan Zhao 0c91f3e258 clean 2023-01-19 11:48:15 +11:00
Ryan Zhao 94456edd2e wrap up media info container view 2023-01-19 10:47:21 +11:00
ryanzhao 107231d5db WIP: media info screen 2023-01-18 16:56:58 +11:00
ryanzhao 7515e81b4b WIP: add message info view to contextMenuVC 2023-01-13 16:54:48 +11:00
Morgan Pretty 8abe2a1d74 Increased the version numbers for release 2022-11-30 12:06:39 +11:00
ryanzhao ff813e4376 update build number 2022-11-16 16:52:49 +11:00
ryanzhao 9d71ae141b bump up build & version number 2022-11-16 15:43:55 +11:00
Morgan Pretty d740fe32c2 Added some copy to explain disabled buttons for message requests 2022-11-08 09:35:27 +11:00