Commit Graph

29 Commits

Author SHA1 Message Date
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
f30e4ce634 Comments 2015-05-21 07:41:58 -07:00
Oleksandr Zhurbenko
2e9e17bd6c Linked userlist to a private chat 2015-05-14 15:47:31 -07:00
perroned
938b0b1a8e Use correct listen only icon in userlist and navbar 2015-05-14 09:56:41 -07:00
perroned
6b24647e7e Display label for presenter 2015-05-13 13:07:24 -07:00
perroned
6091fc4ece Underline meeting title 2015-05-13 12:10:42 -07:00
perroned
efca225a83 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/views/users/users_list.html
2015-05-13 12:05:34 -07:00
perroned
0bd69867b0 Major clean up 2015-05-13 11:55:15 -07:00
Maxim Khlobystov
437f12c1b7 Synced the landscape and portrait userlist menus. 2015-05-13 10:49:09 -07:00
perroned
617e34cd62 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications
Conflicts:
	bigbluebutton-html5/app/client/views/sharedTemplates.html
2015-05-12 12:31:38 -07:00
perroned
bdccd98130 Listen only icon 2015-05-12 10:18:07 -07:00
Oleksandr Zhurbenko
d2b933a73c Added event for userlist 2015-05-07 19:52:36 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
perroned
029b90f2b1 Using Ion icons for user list audio 2015-05-06 21:53:29 -07:00
perroned
a241c75093 Use foundation icons for users list 2015-05-06 21:14:17 -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
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
4d5184c30a put a lock icon in place when relevant 2015-04-23 18:02:56 +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
7171c47656 cleaning up 2015-04-21 21:42:34 +00:00
Anton Georgiev
f74115c9f2 fixed spacing in userslist; Users:X with same behav as in the Flash player 2015-04-21 15:14:49 +00:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Anton Georgiev
df1dc332f0 display "X Users" label only for 5+ users 2015-04-16 18:19:40 +00:00
Anton Georgiev
de6a312cb5 remove the labels for Participants, Presentation, Chat 2015-04-15 21:21:44 +00:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
perroned
3989a4ecfd Fix UI issues with listen only 2015-04-02 09:04:51 -07:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00