Commit Graph

43 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
25e164a2b6 Cleanup 2015-06-09 17:02:27 -07:00
Oleksandr Zhurbenko
e44617b581 Adjusting Tyler's corrections 2015-06-08 16:29:49 -07:00
Oleksandr Zhurbenko
933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
2015-05-24 20:32:13 -07:00
Oleksandr Zhurbenko
0571237619 Search for a username to display on the private chat tab 2015-05-24 20:19:57 -07:00
Oleksandr Zhurbenko
f30e4ce634 Comments 2015-05-21 07:41:58 -07:00
Oleksandr Zhurbenko
718c23baaf Private chat implementation 2015-05-20 17:51:29 -07:00
Oleksandr Zhurbenko
9cbff3547e Switching back to public chat 2015-05-20 17:47:25 -07:00
perroned
d83891c49a Remove traces of options pane 2015-05-19 09:06:42 -07:00
Oleksandr Zhurbenko
84bf3c17ca Got rid of OPTIONS 2015-05-14 15:45:27 -07:00
perroned
0bd69867b0 Major clean up 2015-05-13 11:55:15 -07:00
perroned
e8004b6073 Fixed audio notifications 2015-05-12 07:48:11 -07:00
perroned
64bdfe7aa9 Restructuring/moving 2015-05-10 21:43:31 -07:00
perroned
76fbc0eb3e Fixed icons 2015-05-08 11:36:12 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
perroned
840c4965a5 Restyled chatbar 2015-05-06 22:33:13 -07:00
perroned
539fda349e Removed title for chat and whiteboard 2015-05-06 21:17:59 -07:00
perroned
bbbcc3061c save/cancel changes from settings dialog, more UI 2015-05-06 19:41:58 -07:00
perroned
bf67593fa1 Conflicts 2015-05-06 16:05:34 -07:00
perroned
028951d51d Updating UI for Foundation framework 2015-05-06 15:08:49 -07:00
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Anton Georgiev
888b8c6ecc check if null to prevent error 2015-04-27 14:42:03 +00:00
Anton Georgiev
ef2c58eaa9 missed while resolving conflicts 2015-04-22 15:58:37 +00:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
2015-04-22 14:50:30 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
2015-04-22 06:03:46 -07:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Anton Georgiev
285b8c0e44 removed Send tooltip + blue border on chat tab 2015-04-20 17:50:05 +00:00
perroned
30b39fcc26 sync formatting level 2015-04-16 06:48:46 -07:00
perroned
eb2c5fc456 Prevent controls from moving around while clicking 2015-04-16 06:41:53 -07:00
Anton Georgiev
1db332572c cleaning up 2015-04-02 15:22:08 +00:00
Anton Georgiev
06d5087bfb unlock if presenter; completely disable locked chat input 2015-03-31 18:42:42 +00:00
Anton Georgiev
d3b459feec locking for private chat 2015-03-31 17:25:05 +00:00
Anton Georgiev
7b3d6497c2 locking for public chat 2015-03-30 22:48:25 +00:00
Anton Georgiev
144ffcef64 added a default option so that the dropdown event is triggered with even in a 2 people meeting 2015-03-19 14:59:15 +00:00
Anton Georgiev
7ccbb38303 styling Options in portrait 2015-03-17 20:17:50 +00:00
Anton Georgiev
a068f8e470 private chat user pick from dropdown 2015-03-17 19:34:34 +00:00
Anton Georgiev
cb0eea2899 display a sample of the font-size 2015-03-17 14:57:40 +00:00
Anton Georgiev
4e08129191 font size -/+ control 2015-03-17 13:45:49 +00:00
Oleksandr Zhurbenko
8ba30a585a Misprint fixed 2015-03-16 19:14:18 +00:00
Oleksandr Zhurbenko
f0cb2013a8 Fixed a bug when a client didn't set a proper default font size, when a user entered from a mobile device in landscape view 2015-03-16 19:14:06 +00:00
perroned
493c7701fd Fixed issue where you can chat with yourself 2015-03-10 07:07:23 -07:00
Oleksandr Zhurbenko
84351383f2 Merge branch 'master' into meteor-ui 2015-03-06 08:40:09 -08:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00