Commit Graph

122 Commits

Author SHA1 Message Date
Iuri Matias 971d65c9bc remove unused method 2018-12-19 19:17:34 -05:00
Iuri Matias 7a4eefe707 use murmur 0.1.4 2018-12-19 13:53:55 -05:00
Iuri Matias 2ee6852657 uncomment previously commented code 2018-12-18 23:00:48 -05:00
Iuri Matias 7b98144c17 add an ipc proxy and integrate with the murmur provider 2018-12-18 23:00:48 -05:00
Iuri Matias cd3302aa7e downgrade packge updated accidentaly 2018-12-18 22:58:38 -05:00
Iuri Matias 28a1a663ed connect to network using murmur 2018-12-18 22:58:38 -05:00
Jonathan Rainville 821b4fa6d1
Merge pull request #12 from samthomson/emoji-fix
update regexp
2018-12-17 08:26:03 -05:00
Sam Thomson d86fd5f7f0 remove literal OR operator 2018-12-05 05:18:27 +07:00
Barry Gitarts 24f708eda2 remove window frame 2018-12-04 11:55:48 -05:00
Barry G b1fa0d2ea0
Merge pull request #11 from samthomson/add-icon
add icon file and update window instantiation code
2018-12-04 11:42:33 -05:00
Barry G d5b74435d1
Merge pull request #4 from status-im/toggle-sidebar
Toggle sidebar
2018-12-04 11:30:07 -05:00
Barry Gitarts 9f2db1969b update sorting to match master 2018-12-04 11:28:51 -05:00
Barry G f229dd248d
Merge branch 'master' into toggle-sidebar 2018-12-04 11:17:20 -05:00
Sam Thomson acdee32ab1 update regexp 2018-12-04 20:49:12 +07:00
Sam Thomson a0fa0c7062 add icon file and update window instantiation code 2018-12-04 20:05:22 +07:00
Barry Gitarts aefb5daf3d add warning label to readme 2018-11-28 12:19:02 -05:00
Barry Gitarts 9a3a68c49c remove package-lock.json 2018-11-28 11:58:19 -05:00
Richard Ramos d05a0e0e69
Merge pull request #6 from status-im/update-readme
update readme
2018-11-26 14:53:07 -04:00
Barry Gitarts 574d6d6a13 update readme 2018-11-26 13:47:35 -05:00
Barry Gitarts 3237ae310d sort users in side panel 2018-11-25 17:30:54 -05:00
Barry Gitarts 3addf6a11b fix emojis 2018-11-25 16:48:03 -05:00
Barry Gitarts 0fd4988728 use CSS for calculation instead of JS 2018-11-25 15:53:32 -05:00
Barry Gitarts 8779073d15 ensure chatbox layout using dynamic calculation
While this does work, I believe the more performant
solution will be using CSS
2018-11-25 14:38:16 -05:00
Iuri Matias a55b607d03
Merge pull request #3 from status-im/fix_user_order
fix user ordering
2018-11-25 13:16:08 -05:00
Barry Gitarts 0dd1637923 add scrolling to sidebar 2018-11-25 07:23:11 -05:00
Barry Gitarts ce48536a1a move sidebar toggle close to sidebar
apply border only to left
2018-11-25 07:10:34 -05:00
Barry Gitarts cc017096ef update user component to use round icons for online/offline 2018-11-25 06:58:11 -05:00
Barry Gitarts d08e4f21a6 display who is typing directly under chat input 2018-11-25 06:27:53 -05:00
Barry Gitarts a37cc6441c replace secondary text with tooltip 2018-11-25 06:06:35 -05:00
Barry Gitarts f6cde44caa add back upload button 2018-11-25 05:50:02 -05:00
Iuri Matias dc59dfca52 fix user ordering 2018-11-24 12:42:55 -05:00
Barry Gitarts c24f638d34 stop assignment to this on each render 2018-11-24 12:41:34 -05:00
Barry Gitarts 1b1ee2a2d9 add toggle sidebar 2018-11-24 12:39:26 -05:00
Iuri Matias a15650d61e fix chat box height 2018-11-24 11:54:44 -05:00
Iuri Matias 09822c5cf1 Merge branch 'master' of github.com:status-im/status-js-desktop 2018-11-24 11:49:25 -05:00
Iuri Matias 6b6340ec66 fix styling of sidebar user list 2018-11-24 11:47:34 -05:00
Barry Gitarts 2876d886b8 Merge branch 'master' of https://github.com/status-im/status-js-desktop 2018-11-24 11:43:04 -05:00
Barry Gitarts 599dcabd0e chatroom cleanup 2018-11-24 11:42:46 -05:00
Iuri Matias efd2bf9510 Merge branch 'master' of github.com:status-im/status-js-desktop 2018-11-24 11:38:56 -05:00
Iuri Matias 6475fdc448 fix bug in which joining other channels other than the default one would not send pings 2018-11-24 11:30:21 -05:00
Barry Gitarts 97db3eb112 chatroom cleanup 2018-11-24 11:23:54 -05:00
Barry Gitarts 4641be9ddb Merge branch 'master' of https://github.com/status-im/status-js-desktop 2018-11-24 11:19:04 -05:00
Barry Gitarts 3975c73bb7 Contain userlist to not break chat header
use new user components
2018-11-24 11:09:10 -05:00
Iuri Matias 64cfacea4e make upload button work; limit max-width for images 2018-11-24 11:00:18 -05:00
Iuri Matias 0ace315d7d add upload button; fix autofocus of text field after inserting an emoji 2018-11-24 10:32:46 -05:00
Iuri Matias a0601c0047 add icon for emoji picker 2018-11-24 10:04:37 -05:00
Iuri Matias 4ea5ec0765 update loading animation 2018-11-24 09:21:52 -05:00
Iuri Matias 20692d45a8 add border to userlist 2018-11-24 09:04:00 -05:00
Iuri Matias 760ac15d35 display image previews 2018-11-23 19:30:07 -05:00
Iuri Matias 5c92e7bf2e fix online/offline display; sort users by online state + username 2018-11-23 18:49:35 -05:00