oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
6671 commits 5 branches 83 tags 171 MiB
Commit graph

6671 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent 5fbbdc33c3 Signal branding 2020-01-21 14:59:18 +11:00
Audric Ackermann ee77897a84
Merge pull request #732 from vincentbavitz/brand-redesign 
Settings lock view
 2020-01-21 13:45:39 +11:00
Vincent 062d70a580 formatting; 2020-01-21 13:39:34 +11:00
Vincent ec5001c4a9 Settings lock view 2020-01-21 13:35:47 +11:00
Audric Ackermann 9f98e74baf
refresh contacts list on conversation change (using props) (#731) 
refresh contacts list on conversation change (using props)
 2020-01-21 13:34:56 +11:00
Vincent 79aa9c65a2 Merge branch 'brand-redesign' of https://github.com/loki-project/loki-messenger into brand-redesign 2020-01-21 13:23:28 +11:00
Audric Ackermann 440d5a95f4 refresh contacts list on conversation change (using props) 2020-01-21 13:22:25 +11:00
Vincent d24da33234 Conflicts management 2020-01-21 13:17:38 +11:00
Vince 989f09e472
Merge branch 'brand-redesign' into brand-redesign 2020-01-21 12:12:14 +10:00
Audric Ackermann 36e404f8f1
fix link in registration page and show back last message in conv… (#729) 
fix link in registration page and show back last message in conversationlistitem
 2020-01-21 13:06:39 +11:00
Vincent 617e136063 Placeholder amend 2020-01-21 13:01:49 +11:00
Vincent 6ab89a801b Settings lock completion 2020-01-21 12:58:49 +11:00
Audric Ackermann 26813666fc show timestamp and last message in conversationlistitem 2020-01-21 11:51:47 +11:00
Audric Ackermann 77227eaa2a fix password toast display 2020-01-21 11:23:12 +11:00
Audric Ackermann cf6b09e7ef add same link for terms and conditions than privacy policy 2020-01-21 11:22:13 +11:00
Vincent 14d3d32532 Merge branch 'brand-redesign' of https://github.com/vincentbavitz/loki-messenger into brand-redesign 2020-01-21 11:19:20 +11:00
Vincent 69dc15ad70 Settings lock view; logic WIP 2020-01-21 11:17:45 +11:00
Audric Ackermann e653ed4dad
fix lint (#727) 
fix lint
 2020-01-21 10:57:15 +11:00
Audric Ackermann 0f4f5847ed fix lint 2020-01-21 10:56:32 +11:00
Audric Ackermann 1c78443c56
Settings: add pairing and unpairing feature back (#725) 
Settings: add pairing and unpairing feature back
 2020-01-21 10:54:11 +11:00
Audric Ackermann 25d0fff95f fix build 2020-01-21 10:51:32 +11:00
Audric Ackermann 64b067dfe1 fix lint 2020-01-21 10:34:11 +11:00
Audric Ackermann 37e3a1898f fix session unlock with password screen with session colors 2020-01-21 10:34:11 +11:00
Audric Ackermann c69219ebe4 resolve conversations 2020-01-21 10:33:29 +11:00
Audric Ackermann d08a14e711 fixed the bug flickering on hover in modals 2020-01-21 10:33:29 +11:00
Audric Ackermann 93a4b9f9db fix button brand hover and disabled state 2020-01-21 10:33:29 +11:00
Audric Ackermann e4a4a333ba do not show friends with conversation.activeAt undeifned 2020-01-21 10:32:27 +11:00
Audric Ackermann 2765b6c146 pairing device modal: display errors if any 2020-01-21 10:32:27 +11:00
Audric Ackermann 14561d33f5 disable addLinkedDevice button if already one linked device 2020-01-21 10:32:27 +11:00
Audric Ackermann 411b343e6a add unpairing of device from settings 2020-01-21 10:32:27 +11:00
Audric Ackermann 34458406fd Use SessionSettingListItem to display linkedDevice 2020-01-21 10:29:23 +11:00
Audric Ackermann 805ccef7a1 fix default name for linked device 2020-01-21 10:13:10 +11:00
Audric Ackermann e4def110f5 display linked device in settings 2020-01-21 10:13:10 +11:00
Audric Ackermann 4d950f859b add back link device in settings in a dialog 2020-01-21 10:11:50 +11:00
Audric Ackermann 29da7c2d53 remove enabled props from SessionButton. Use disabled instead 2020-01-21 10:06:17 +11:00
Audric Ackermann 68e4f318f3 hide edit button on leftpane 2020-01-21 10:06:17 +11:00
Audric Ackermann 5207e00063 fix blurred dialog 2020-01-21 10:06:17 +11:00
Audric Ackermann a27106d3a3 disable search in settings for now 2020-01-21 10:06:17 +11:00
Audric Ackermann 5de6014513 make the no-network alert a bit more session-like 2020-01-21 10:03:38 +11:00
Audric Ackermann b2f80fbd7f center spinner between conversation loading 2020-01-21 10:00:54 +11:00
Audric Ackermann 8bfab92213 add regex url check before joining channel 2020-01-21 10:00:54 +11:00
Audric Ackermann 85235dd461 remove file which was added by mistake during merge 2020-01-21 10:00:54 +11:00
Audric Ackermann 956349a964 UserDetailsDialog show pubkey in a nice format 2020-01-21 10:00:54 +11:00
Audric Ackermann bfe7d63ee0 fix crown position for moderator user in conversationView 2020-01-21 10:00:54 +11:00
Audric Ackermann 02a9748f02 fix minor ui details 2020-01-21 10:00:54 +11:00
Audric Ackermann 5b04aecbd3 make channel and contact section show conversationView onload 2020-01-21 09:59:51 +11:00
Audric Ackermann 396c2fa0d6 remove scss file which should not be here after merge 2020-01-21 09:59:51 +11:00
Vince adae5b6bf0
Merge pull request #726 from vincentbavitz/brand-redesign 
Password [set, change, remove] and ContextMenu addition to Main View.
 2020-01-21 08:52:48 +10:00
Vince 7d75a76b55
Delete yarn-error.log 2020-01-21 09:34:20 +11:00
Vincent f7548fc6ef Finalising pr 2020-01-21 09:30:53 +11:00