BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,203 Commits 13 Branches 260 Tags 1.1 GiB
7d75843140
Commit Graph

7940 Commits

Author SHA1 Message Date
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
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +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
45f5c8b298 wrapping chat tabs; bigger easel icon on mobile 2015-04-21 15:19:52 +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
5cb3a9bd9c Active button hover states; rm left and right border 2015-04-20 20:57:48 +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
fa4cd71ff4 publishing to redis channel "meeting" instead of handling the event on channel "voice" 2015-04-16 19:06:04 +00:00
Anton Georgiev
df1dc332f0 display "X Users" label only for 5+ users 2015-04-16 18:19:40 +00:00
perroned
5808dba448 Restore functionality to properly detect mobile and choose correct icon 2015-04-16 09:55:56 -07:00
perroned
f4295ace2c Fix comment 2015-04-16 08:59:21 -07:00
perroned
c446a81023 Merge remote-tracking branch 'anton/listen-only-prototype' into hangup-webrtc-call 2015-04-16 08:57:40 -07:00
perroned
f0f28f2f76 Update method we check call status 2015-04-16 08:56:56 -07:00
Anton Georgiev
4e9481ad63 renaming the autoJoin parameter 2015-04-16 15:39:06 +00:00
perroned
db295311a4 Merge remote-tracking branch 'anton/listen-only-prototype' into hangup-webrtc-call 2015-04-16 07:46:02 -07:00
Anton Georgiev
249e83f347 Merge branch 'hangup-webrtc-call' of github.com:perroned/bigbluebutton into listen-only-prototype 2015-04-16 14:26:32 +00:00
Anton Georgiev
a9e4e7ee1c removed the new indicator for listenOnly 2015-04-16 14:14:42 +00:00
Anton Georgiev
53a5df593d update the ionicon ttf and woff 2015-04-16 13:51:59 +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
7e4fbc220e Comments for hangup retry 2015-04-15 05:48:16 -07:00
perroned
99f3b1d55d Beginning work on cancelling a call in progress 2015-04-15 05:02:39 -07:00
perroned
934d36ee8a adding the actual check on startup 2015-04-14 09:25:53 -07:00
perroned
321ba43850 Ability to autojoin listen only on startup 2015-04-14 09:05: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
Maxim Khlobystov
d6383efa74 Added some comments. 2015-04-13 17:26:01 -07:00
Maxim Khlobystov
013ede36be Fixed the bug with a huge cursor appearing on first load. 2015-04-13 17:20:46 -07:00
perroned
69bebce93d Fixed typo 2015-04-13 06:27:41 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Maxim Khlobystov
b8e32da12d Added the fix for the bug with a tiny whiteboard to a portrait view. 2015-04-10 17:53:43 -07:00
Maxim Khlobystov
dc9e8e46d0 Fixed the issue with a tiny whiteboard on initial page load without the whiteboard cookies set (fixed in landscape only). 2015-04-10 17:17:37 -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
Anton Georgiev
2930eb8fff cleaning up 2015-04-10 19:10:42 +00:00
Anton Georgiev
7a13d10b91 improve handling of user_joined_voice_message 2015-04-10 18:01:45 +00:00
Anton Georgiev
5446539929 The upsert check was incorrect, checking for exact structure. Split into findOne + insert 2015-04-06 20:00:44 +00:00
perroned
e468f6c2fd Fix formatting 2015-04-06 07:58:06 -07:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
Anton Georgiev
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00
Anton Georgiev
21a35c6625 Meteor update to the stable 1.1 2015-04-02 21:43:10 +00:00
Anton Georgiev
4520949a28 the updated mongo has a slightly stricter rule regarding cursors. The welcome message was not stored correctly 2015-04-02 21:42:35 +00:00
Anton Georgiev
cdba908eea server side listenOnly. temporarily hooked to raiseHand 2015-04-02 20:11:09 +00:00
perroned
0a887bfbc5 Fix navbar UI when in listen only 2015-04-02 09:19:55 -07:00
perroned
3989a4ecfd Fix UI issues with listen only 2015-04-02 09:04:51 -07:00
perroned
4d9e7ed8e3 Only send listen only request when needed 2015-04-02 08:28:11 -07:00
Anton Georgiev
e1c4ae5f48 Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-04-02 15:27:41 +00:00
Anton Georgiev
1db332572c cleaning up 2015-04-02 15:22:08 +00:00
perroned
4dce91cd32 Added listen only query. Close dialog when audio joined. 2015-04-02 08:11:35 -07:00
perroned
3bfa6d2998 Icon for listen only 2015-04-02 08:10:01 -07:00
perroned
36fdde74d7 Cleaned and added listen only icon 2015-04-02 08:08:30 -07:00
perroned
1efc317fcc public server method for joining as listen only 2015-04-02 08:07:58 -07:00
perroned
4c72b7f2fa Update field in payload 2015-04-02 08:06:39 -07:00
perroned
38fbe35b94 Grant permission for joining listen only 2015-04-02 08:05:43 -07: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
dfa30d2193 Corrected the size of the full screen button. 2015-03-31 16:07:14 -07:00
perroned
adab7347ed Style for listen only dialog 2015-03-31 12:36:45 -07:00
perroned
807f1549d8 UI for listen only 2015-03-31 12:36:29 -07:00
perroned
09341689b6 Handlers for listen only dialog and UI 2015-03-31 12:36:16 -07:00
perroned
61f0f97517 Toggling for listen only 2015-03-31 12:35:37 -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
Anton Georgiev
b47e8f3330 lock settings - handle new_permission_settings, user_locked_message 2015-03-30 17:49:30 +00:00
perroned
1316acba11 Allow HTML5 client to call into conference using listen only 2015-03-30 08:50:51 -07:00
perroned
79d59b2dbc Pass listen only field to BBB.joinVoiceConference 2015-03-30 08:50:10 -07:00
Maxim Khlobystov
915b522cab Removed the unnecessary important declarations. 2015-03-29 13:58:24 -07: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
500d015aad Resized the elements containing the slide image assuming the whiteboard doesn't have navbar in full screen mode. 2015-03-29 13:45:35 -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
Fred Dixon
0a9bf5d9b3 Merge pull request #577 from gthacoder/meteor-client-switching-stylesheets 
HTML5 client: push menu update.
 2015-03-27 14:14:04 -04:00
Maxim Khlobystov
55090b7995 Added toast notifications appearing when user joins the audio. 2015-03-21 19:14:06 -07:00
Maxim Khlobystov
a61d945389 Disabled the tooltips on mobile devices. 2015-03-19 14:57:50 -07:00
Maxim Khlobystov
1c2865e426 Rearranged the push menu icons so that they are in the same order as the vertically displayed list of panels. 2015-03-19 14:46:46 -07:00
Maxim Khlobystov
e905f561c5 Removed the unused Handlebars helper. 2015-03-19 14:38:37 -07:00
Maxim Khlobystov
7f833dda82 Made sure the push menu element is always created on mobile devices regardless of the orientation user chooses to enter the client in (to prevent the situations when the menu can't be opened because it doesn't exist). 2015-03-19 14:36:03 -07:00
Anton Georgiev
ac55b05a06 meteor update to 1.0.4.1 2015-03-19 15:07:16 +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
Fred Dixon
ef274f1f22 Merge pull request #569 from gthacoder/meteor-client-notifications 
HTML5 client: fix for WebRTC browser support notifications.
 2015-03-18 19:53:34 -04:00
Anton Georgiev
8743ec75b1 clean tab height 2015-03-17 22:12:04 +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
Oleksandr Zhurbenko
cbaa112f79 Improved code reuse 2015-03-16 19:13:55 +00:00
Maxim Khlobystov
f6de805f26 Fixed the issue with Firefox notified as not supporting WebRTC. 2015-03-15 19:03:31 -07:00
Maxim Khlobystov
8e81f00155 Fixed the issue with blocked scrolling after zooming with the push menu opened. 2015-03-14 19:37:43 -07:00
Maxim Khlobystov
daf158c127 Cleaning up and adding some comments. 2015-03-14 19:31:01 -07:00
Maxim Khlobystov
da77337567 Made the content of the WebRTC-related notifications custom depending on the browser that is being used. 2015-03-14 19:25:49 -07:00
Maxim Khlobystov
792c88cf2a Created notifications for the browsers that don't support WebRTC. 2015-03-14 19:08:34 -07:00
Anton Georgiev
948fb5e35d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-logouturl 2015-03-13 21:32:35 +00:00
Fred Dixon
2bf6d05ca1 Merge pull request #565 from antobinary/meteor-endpoint 
meteor endpoint /html5client/check. update BigBlueButton.html
 2015-03-13 17:31:06 -04:00
Anton Georgiev
a58bfd1349 fix for the logoutURL - the string had different spellings 2015-03-13 21:01:54 +00:00
Anton Georgiev
238f1e56ff meteor endpoint /html5client/check. update BigBlueButton.html 2015-03-13 20:43:32 +00:00
Fred Dixon
946e3bd147 Merge pull request #564 from perroned/overflowing-chat-box 
Fixed issue of overflowing chatbox
 2015-03-13 16:22:40 -04:00
perroned
41ee26f99d Fixed issue of overflowing chatbox 2015-03-13 13:18:50 -07:00
Anton Georgiev
0aa5e2473b Merge branch 'master' into ip-independent-logouturl 2015-03-12 20:04:09 +00:00
Anton Georgiev
1c6e3c7d70 Merge branch 'master' into font-fix 2015-03-12 16:04:51 +00:00
Anton Georgiev
f92e592edd fix for firefox - would not display the ionicons 2015-03-12 16:02:56 +00:00
perroned
c02b177bf9 Fixed issue where the entire panel was scrolling 2015-03-12 08:45:40 -07:00
Anton Georgiev
f8b8451057 cleaning up 2015-03-10 21:03:16 +00:00
Anton Georgiev
5d1844f00b obtain the logoutURL from the enter api. Store it on the client side 2015-03-10 20:58:51 +00:00
Anton Georgiev
2dcc67873b Merge branch 'master' into ip-independent-logouturl 2015-03-10 19:19:18 +00:00
Fred Dixon
d738f09110 Merge pull request #553 from antobinary/temp-revert 
Display the filename of the presentation (partial revert of #548)
 2015-03-10 11:32:53 -04:00
Anton Georgiev
743a213ece Merge branch 'master' into flash-redirect 2015-03-10 15:19:11 +00:00
Anton Georgiev
94766d2aa4 (revrt) Display the filename of the presentation 2015-03-10 14:41:14 +00:00
perroned
493c7701fd Fixed issue where you can chat with yourself 2015-03-10 07:07:23 -07:00
Fred Dixon
4f023dd91c Merge pull request #548 from OZhurbenko/meteor-ui 
Mobile View's changes
 2015-03-10 01:25:02 -04:00
Maxim Khlobystov
0e2559a15a Cleaning up. 2015-03-09 18:20:29 -07:00
Maxim Khlobystov
bda1db32a9 Got rid of the unwanted calls for the push menu when user clicks navbar buttons. 2015-03-09 18:13:16 -07:00
Maxim Khlobystov
9a00fbf418 Increased the size of Logout dialog box for mobile devices in landscape mode to make it easier to click Yes/No. 2015-03-09 17:59:01 -07:00
Maxim Khlobystov
41b2727adb Allowed users to close the Logout dialog box by clicking outside on mobile devices. 2015-03-09 14:30:25 -07:00
Anton Georgiev
ce79fb0cdc make the [default] logoutURL for the html5 client IP independent 2015-03-09 21:25:30 +00:00
Maxim Khlobystov
c54caa3f3d Tied the font sizes inside the Logout dialog box on mobile devices in landscape to the page height and thus made the dialog box look consistent across devices with different aspect ratios. 2015-03-09 13:43:39 -07:00
Maxim Khlobystov
c36afdeb47 Made the Logout dialog box bigger in landscape orientation for the mobile devices only. 2015-03-09 13:31:19 -07:00
Maxim Khlobystov
f1623a143c Replaced the push menu collapse button's chevron icons with the hamburger menu icon. 2015-03-08 01:30:44 -05:00
Maxim Khlobystov
52be0c0751 Positioned every element under the shield correctly when the push menu is opened. 2015-03-07 21:58:26 -05:00
Maxim Khlobystov
093382d3ff Made it impossible for the main content of the page to be shifted in landscape orientation, prevented problems on switching between views. 2015-03-06 22:05:00 -05:00
Maxim Khlobystov
ba80d03b07 Saved the navbar from being disabled when the sliding menu is opened. 2015-03-06 22:04:40 -05:00
Maxim Khlobystov
96c1a3fc4a Added some opacity to the rest of the page when the sliding menu is opened. 2015-03-06 22:04:18 -05:00
Maxim Khlobystov
716cb56830 Added the transparent shield over the view with sliding menu opened to detect the user's click. 2015-03-06 22:04:00 -05:00
Maxim Khlobystov
a105b2b6b5 Made the sliding menu push the rest of the page right instead of covering it. 2015-03-06 22:03:25 -05:00
Maxim Khlobystov
165ee6e753 Got rid of the darkened screen appearing along with the sliding menu. 2015-03-06 22:02:28 -05:00
Anton Georgiev
5ebb2f5f3c Allow moderators to use the html5 client. 
Temporarily they will have exactly the same permissions as viewers do.
This commit's goal is to facilitate the redirect to the html5 client in the event that Flash is not detected on the system
 2015-03-06 20:53:13 +00:00
Oleksandr Zhurbenko
7ef15d846f Whiteboard's name is changed to static and the name of the presentation file is not displayed anymore 2015-03-06 08:57:11 -08:00
Oleksandr Zhurbenko
84351383f2 Merge branch 'master' into meteor-ui 2015-03-06 08:40:09 -08:00
Fred Dixon
8d8ed43985 Update start.sh 
Added definition for HOME to start.sh help meteor start from within upstart job.
 2015-03-05 16:52:04 -05:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00