BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,007 Commits 13 Branches 260 Tags 1.1 GiB
6a9bf94c2c
Commit Graph

48 Commits

Author SHA1 Message Date
Richard Alam
6a9bf94c2c Merge pull request #635 from perroned/bridge-construction 
Moving functionality into BBB bridge
 2015-05-07 11:42:08 -04:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00: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