Commit graph

2708 commits

Author SHA1 Message Date
Brice-W 6bbabce8e3 fix async issue 2021-07-22 15:21:52 +10:00
Brice-W e5615357f7 call setToExpire when expire timer is started to set expire_at property of message 2021-07-22 14:58:00 +10:00
Brice-W 18f15615d4 don't render messages that are already expired 2021-07-20 17:09:17 +10:00
Audric Ackermann 6df84fbd1e
Merge pull request #1778 from Brice-W/focus-issue
Fix for focus issue
2021-07-20 15:20:09 +10:00
Warrick Corfe-Tan 4cdc852ea3 cherry-pick conflicts. 2021-07-20 10:55:13 +10:00
Brice-W 829fd1c199 menu fixes 2021-07-19 10:23:20 +10:00
Brice-W e9f70d8c82 fix issue 2021-07-19 09:31:24 +10:00
Brice-W 9a420f85ce fixes 2021-07-16 16:20:34 +10:00
Brice-W 74147d8c3d Merge branch 'clearnet' of https://github.com/oxen-io/session-desktop into focus-issue 2021-07-16 15:53:46 +10:00
Brice-W 4f98917eaf clean 2021-07-16 13:49:32 +10:00
Brice-W 1397107dff fix issues 2021-07-16 13:48:08 +10:00
Brice-W db46c2960b update in marking read message 2021-07-16 13:32:58 +10:00
Audric Ackermann 3c0ea2b900
Merge pull request #1781 from Bilb/fix-link-device
fix link device. start polling for our pubkey
2021-07-16 10:50:54 +10:00
audric 41c2ce67a7 fix link device. start polling for our pubkey 2021-07-16 10:33:06 +10:00
Brice-W c38d2a5ea7 revert prev changes + marking read now based on received_at 2021-07-15 16:48:54 +10:00
Brice-W 46dc6c6275 pin conversations added to header menu 2021-07-13 15:38:59 +10:00
Brice-W 5d7d58fe05 move NotificationForConvoOption declaration + getConversationNotificationSettingType created as used twice 2021-07-13 15:34:56 +10:00
Brice-W adab2b4506 add Notifications in conversations context menu 2021-07-13 15:14:43 +10:00
Brice-W 14ef4cd39a adding lastReadTimestamp property 2021-07-13 13:08:46 +10:00
Brice-W 151fc758c0 format 2021-07-12 16:44:31 +10:00
Brice-W c98fdec10e adding new files 2021-07-12 15:03:30 +10:00
Brice-W 2af9d9e15d use of a custom hook to detect focus 2021-07-12 14:35:43 +10:00
Brice-W 936f9a3efc don't mark message as read if app isn't focused 2021-07-08 15:03:27 +10:00
Audric Ackermann bf76abacee
Merge pull request #1770 from Brice-W/pin-conversations
Pin conversations
2021-07-07 14:03:01 +10:00
Brice-W 5252dd40e3 fixes 2021-07-07 13:43:33 +10:00
Brice-W f1e4cbaabf clean 2021-07-07 11:16:12 +10:00
Brice-W 14cecb1216 menu item creation moved to getPinConversationMenuItem 2021-07-07 10:37:35 +10:00
Brice-W ff7f201e04 add feature flag 2021-07-07 10:19:35 +10:00
Brice-W 03891a9438 revert last commit 2021-07-07 09:29:04 +10:00
Brice-W 21b8b9f35b memory optimization 2021-07-06 17:21:43 +10:00
Brice-W c3bf2a4e96 fixes and tests 2021-07-06 17:16:05 +10:00
Brice-W b2deeb39be clean 2021-07-06 15:05:04 +10:00
Brice-W 75a20e5de7 simplification by using derived data 2021-07-06 15:02:29 +10:00
Brice-W e3aa500ba0 i18n labels for pin conversations limit 2021-07-06 14:01:29 +10:00
Brice-W 4ddc00c9b6 set a limit numer to pinned conversations 2021-07-06 13:34:39 +10:00
Brice-W dcd8da87ca fix errors 2021-07-02 14:59:09 +10:00
Brice-W 6b8a4ffc6c display link preview popup only time 2021-07-02 14:35:28 +10:00
Warrick Corfe-Tan 4decda9cff Merge branch 'clearnet' into pin-conversations 2021-06-30 15:39:30 +10:00
Warrick Corfe-Tan 535a66b879 minor tidying 2021-06-30 15:36:19 +10:00
Warrick Corfe-Tan cf6ac09300 Refactor to functional components 2021-06-30 15:19:37 +10:00
Audric Ackermann e5a60af93f
Merge pull request #1751 from Bilb/fix-expire-without-seeing
do not start expire timer before seing message
2021-06-30 15:09:44 +10:00
Audric Ackermann e9714f8db8
Merge pull request #1734 from Bilb/fix-clear-all-data
add loading for leaving opengroup dialog
2021-06-30 15:09:23 +10:00
Audric Ackermann a0811b699c
Merge pull request #1744 from Bilb/use-retrieve-status-for-isOnline
use our retrieve status as isOnline status
2021-06-30 15:08:49 +10:00
audric 9cb69cf8fd do not start expire timer before seing message 2021-06-30 15:02:22 +10:00
Warrick Corfe-Tan 563dff64ae yarn linting and formatting, 2021-06-30 13:12:25 +10:00
Warrick Corfe-Tan 36cf05db1b Switched conversation pin state. 2021-06-30 13:09:09 +10:00
Audric Ackermann 52293d6787
fix trust do not trigger redownload of already dl medias 2021-06-29 16:37:49 +10:00
Warrick Corfe-Tan 08db057ad9 Merge branch 'clearnet' into pin-conversations 2021-06-29 16:27:22 +10:00
Warrick Corfe-Tan 49415e3bf0 Yarn formatting and linting. 2021-06-29 16:21:45 +10:00
Warrick Corfe-Tan 264f97663e Persisting conversation pin statuses. 2021-06-29 15:57:37 +10:00