BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,277 Commits 13 Branches 260 Tags 1.1 GiB
f5adeb34d8
Commit Graph

204 Commits

Author SHA1 Message Date
Maxim Khlobystov
1fa46ab6dd Made the whiteboard's height flexible depending on the presence of the slide navigation controllers. 2015-05-27 10:29:59 -07:00
Maxim Khlobystov
0b7749ec3c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-right-hand-menu 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-26 14:15:12 -07:00
Chad Pilkey
3ce0fcc0e5 Merge pull request #644 from OZhurbenko/meteor-ui 
Private chat
 2015-05-26 17:09:39 -04:00
Maxim Khlobystov
531ada09df Moved the inline CSS related to the Settings modal window to the LESS file. 2015-05-26 12:45:48 -07:00
Maxim Khlobystov
934edd5a75 Made sure the presentation progress label never contains an undefined slide number, thus becoming too long and making the scrollbar appear. 2015-05-25 15:30:57 -07:00
Maxim Khlobystov
6ca9bb1465 Got back the label indicating the current slide's number. 2015-05-25 15:27:06 -07:00
Maxim Khlobystov
b8e32bf316 Added the presenter's slide navigation to the new UI. 2015-05-25 14:36:43 -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
perroned
5a11416022 Reverting most of whiteboard 2015-05-19 08:35:12 -07:00
perroned
c68693e5fb Elements are now sized properly through CSS 2015-05-15 13:17:33 -07:00
Oleksandr Zhurbenko
2e9e17bd6c Linked userlist to a private chat 2015-05-14 15:47:31 -07:00
Oleksandr Zhurbenko
84bf3c17ca Got rid of OPTIONS 2015-05-14 15:45:27 -07:00
perroned
74a96b45db Fix whiteboard vertical centering 2015-05-14 11:09:14 -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
56ed1deb7d Logout modal. Fixed settings 2015-05-13 07:24:21 -07:00
perroned
f26fdb8c41 Fix button maker 2015-05-12 12:47:58 -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
Maxim Khlobystov
928e856107 Added the buttons to the right-hand side menu. 2015-05-12 11:07:30 -07:00
perroned
6ff3106860 Joining audio notification 2015-05-12 10:56:20 -07:00
perroned
bdccd98130 Listen only icon 2015-05-12 10:18:07 -07:00
perroned
807d36c2e1 Navbar audio icon 2015-05-12 10:05:06 -07:00
perroned
472e32cca2 Closing dialog reverts changes 2015-05-12 08:48:43 -07:00
perroned
8049038213 Prevent background closing of settings dialog 2015-05-12 08:06:05 -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
Oleksandr Zhurbenko
d2b933a73c Added event for userlist 2015-05-07 19:52:36 -07:00
Maxim Khlobystov
e1cad84bd5 Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 
Conflicts:
	bigbluebutton-html5/app/client/main.coffee
 2015-05-07 19:04:51 -04:00
Maxim Khlobystov
9b4b896245 Made the buttons template uniform to be able to use both Ionicons and Foundation icons. 2015-05-07 18:48:14 -04:00
perroned
e762dd49a4 Hide presenter functionality 2015-05-06 23:26:55 -07:00
perroned
f47c69c314 Update BBB settings information 2015-05-06 23:26:40 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
Anton Georgiev
f93eac1bb9 Merge branch 'presenter-switch-slide' of github.com:antobinary/bigbluebutton into presenter-switch-slide 2015-05-07 16:34:20 +00:00
Anton Georgiev
ff7166bf45 add tooltips for slides navigation 2015-05-07 12:17:52 -04:00
Richard Alam
6a9bf94c2c Merge pull request #635 from perroned/bridge-construction 
Moving functionality into BBB bridge
 2015-05-07 11:42:08 -04:00
perroned
840c4965a5 Restyled chatbar 2015-05-06 22:33:13 -07:00
perroned
029b90f2b1 Using Ion icons for user list audio 2015-05-06 21:53:29 -07:00
perroned
539fda349e Removed title for chat and whiteboard 2015-05-06 21:17:59 -07:00
perroned
a241c75093 Use foundation icons for users list 2015-05-06 21:14:17 -07:00
perroned
bbbcc3061c save/cancel changes from settings dialog, more UI 2015-05-06 19:41:58 -07:00
perroned
6a5bddef5e Modal menu's for Foundation 2015-05-06 16:11:59 -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
Oleksandr Zhurbenko
9dff47ef02 Moved a whiteboard's document name from the whiteboard-navbar to the main navbar 2015-05-06 14:22:48 -07:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04:00
Lucas Zawacki
6b04a86e7e Prevent slowdown on firefox when deleting lots of shape messages 
By creating a new collection called WhiteboardCleanStatus which
is used to alert the clients that the server is cleaning shapes.

When shapes are being cleaned they are not drawn and so things don't slow down on firefox or chrome
 2015-05-05 18:33:08 -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
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
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
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
ebe8e8627f Merge branch 'icon-and-label-modifications' into apr2015-ui-changes 2015-04-20 18:53:34 +00:00
Anton Georgiev
285b8c0e44 removed Send tooltip + blue border on chat tab 2015-04-20 17:50:05 +00:00
Anton Georgiev
df1dc332f0 display "X Users" label only for 5+ users 2015-04-16 18:19:40 +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
de6a312cb5 remove the labels for Participants, Presentation, Chat 2015-04-15 21:21:44 +00:00
Anton Georgiev
b650bd2381 changing the presentation icon to easel 2015-04-15 20:41:23 +00:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Maxim Khlobystov
21be913ff1 Went back to using the height of the whole whiteboard area when calculating slide dimensions (fixed the issue with missing whiteboard on client load). 2015-04-10 15:15:58 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-04-10 19:21:40 +00: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
1db332572c cleaning up 2015-04-02 15:22:08 +00:00
Fred Dixon
33e9041972 Merge pull request #593 from gthacoder/meteor-client-fullscreen-whiteboard 
Whiteboard in full screen mode.
 2015-03-31 19:51:20 -04:00
Maxim Khlobystov
c08b23fec2 Limited the support for the full screen mode to Chrome and Firefox. 2015-03-31 16:44:16 -07:00
Maxim Khlobystov
91be2f4da8 Fixed the issue with the full screen button jumping to new line in Firefox. 2015-03-31 12:04:29 -07: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
Maxim Khlobystov
ed2ecf1cef Centered the slide vertically in full screen mode. 2015-03-30 16:03:41 -07:00
Anton Georgiev
7b3d6497c2 locking for public chat 2015-03-30 22:48:25 +00:00
Maxim Khlobystov
659b86cde9 Modified the calculation of the slide image dimensions to eliminate the dependency on the whiteboard navbar height (allowed the slide to use all of the available space in full screen mode). 2015-03-29 13:51:18 -07:00
Maxim Khlobystov
a7b511ce97 Added the ability to open the whiteboard in full screen mode. 2015-03-27 17:59:56 -07:00
Fred Dixon
9270d01984 Merge pull request #576 from antobinary/options-rearrange-fix 
html5client:chat options fix + Meteor update
 2015-03-27 14:14:19 -04:00
Maxim Khlobystov
a61d945389 Disabled the tooltips on mobile devices. 2015-03-19 14:57:50 -07: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