Commit Graph

209 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
698ccf5c4f Getting rid of a footer 2015-05-06 12:08:57 -07:00
perroned
7c6436def6 Added foundation icons package 2015-05-06 09:07:40 -07:00
perroned
c64c6112c2 Removed boostrap leftovers 2015-05-06 09:05:22 -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
a76ce00fd3 remove bootstrap package 2015-05-05 16:25:18 -07:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Maxim Khlobystov
cabaf10283 Moved the navbar from Bootstrap to Foundation. 2015-05-05 10:30:38 -04:00
Maxim Khlobystov
d1f1a89ce5 Added Foundation package. 2015-05-05 09:48:52 -04:00
Anton Georgiev
44f180033f update welcome message url 2015-04-30 19:18:54 +00:00
Richard Alam
85d3bca1d1 Merge pull request #625 from antobinary/lock-settings
html5client:Lock settings implementation
2015-04-27 10:47:24 -04:00
Anton Georgiev
888b8c6ecc check if null to prevent error 2015-04-27 14:42:03 +00:00
Maxim Khlobystov
9c5242ff1a Fixed the bug with missing audio buttons on the sliding menu and made the menu work correctly with audio. 2015-04-24 11:51:13 -07:00
Anton Georgiev
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
81762d5395 disallow unmuteSelf on lock;single user lock->mute 2015-04-23 20:53:07 +00:00
Anton Georgiev
eea695b326 when enabling disableMic the voice sharing viewers are now muted 2015-04-23 19:55:38 +00:00
Anton Georgiev
4d5184c30a put a lock icon in place when relevant 2015-04-23 18:02:56 +00:00
Anton Georgiev
7a0a1dae60 revert server side permission change 2015-04-23 15:46:52 +00:00
Anton Georgiev
c38cc9f109 identify when the mic is locked & skip the dialog 2015-04-22 21:16:30 +00:00
Anton Georgiev
073977a92a reorganize the joinAudio button handle; add fields for the permissions for joinAudioWithMic 2015-04-22 19:53:05 +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
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