BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,339 Commits 13 Branches 260 Tags 1.1 GiB
013ba50137
Commit Graph

15020 Commits

Author SHA1 Message Date
Maxim Khlobystov
73838c7e78 Allowed users to mute/unmute themselves by clicking a userlist icon. 2015-06-04 15:25:07 -07:00
Maxim Khlobystov
d0b76d9c31 Made sure mute/unmute icon changes when hovered. 2015-06-04 14:31:59 -07:00
Maxim Khlobystov
2f3a777944 Eliminated some code duplication. 2015-06-03 16:13:18 -07:00
Maxim Khlobystov
fd018ca29e Changed the icon of Exit Fullscreen button. 2015-06-03 16:03:02 -07:00
Maxim Khlobystov
b47bc010ad Fixed the size of Exit Fullscreen icon in Firefox. 2015-06-03 15:54:39 -07:00
Maxim Khlobystov
1a532f9dd3 Cleaning up. 2015-06-03 15:34:40 -07:00
Maxim Khlobystov
f03fa56734 Adjusted the size of Exit Fullscreen button to the mobile screen. 2015-06-03 15:27:22 -07:00
Maxim Khlobystov
80183dda34 Vertically centered the whiteboard slide in full screen mode. 2015-06-03 14:54:52 -07:00
Maxim Khlobystov
4b9c76dcd9 Added the ability to exit the full screen mode by clicking a button. 2015-06-03 14:49:26 -07:00
Maxim Khlobystov
b5e0f6b856 Limited the full screen button to mobile devices. 2015-06-03 14:26:52 -07:00
Maxim Khlobystov
f6fc8d13f7 Corrected the size of buttons on mobile devices. 2015-06-03 13:50:39 -07:00
Maxim Khlobystov
f29c63e25b Replaced the button's inline CSS with the proper LESS declaration. 2015-06-03 11:38:56 -07:00
Maxim Khlobystov
bb86817a44 Added the full screen button. 2015-06-03 11:20:59 -07:00
Maxim Khlobystov
8ec8ad3072 Restored the ability to request the full-screen whiteboard mode. 2015-06-02 14:44:06 -07:00
perroned
f357942eed Shrink notification area to contents 2015-06-02 07:02:54 -07:00
Oleksandr Zhurbenko
8cf7328373 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-ui 2015-05-28 14:28:58 -07:00
Oleksandr Zhurbenko
fe9cc6e31f Fixed private tab's height 2015-05-28 14:19:51 -07:00
Maxim Khlobystov
a53b88f5e7 Made the whiteboard properly resize when the slide navigation controllers appear/disapper. 2015-05-28 10:06:57 -07:00
Maxim Khlobystov
cb140cce99 Repaired the styling of slide navigation buttons. 2015-05-27 10:48:25 -07:00
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
71fe855fa7 Prevented the slide from going beyond the whiteboard's top border. 2015-05-27 09:58:06 -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
Maxim Khlobystov
74b85b56fc Made the Toggle Chat button work. 2015-05-26 14:09:54 -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
d9f8b95680 Corrected the size of the Logout dialog in portrait mode. 2015-05-26 13:38:00 -07:00
Maxim Khlobystov
db15a173bb Made the Logout dialog work in portrait orientation. 2015-05-26 13:27:41 -07:00
Maxim Khlobystov
60ad8ab631 Adjusted the size of the Settings modal window in mobile view. 2015-05-26 13:21:56 -07: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
06496b4835 Made the Settings button functional in portrait orientation. 2015-05-26 11:05:19 -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
42515fd477 Private chat styling 2015-05-24 20:24:21 -07:00
Oleksandr Zhurbenko
0571237619 Search for a username to display on the private chat tab 2015-05-24 20:19:57 -07:00
Maxim Khlobystov
1487a0e28c Removed the userlist's X button from the portrait view. 2015-05-21 09:37:21 -07:00
Maxim Khlobystov
ef88685536 Changed the colour of a menu toggle button when its menu is opened. 2015-05-21 09:33:27 -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
8dab326bd5 Added a helper which retreives a username for a private chat tab from the database 2015-05-20 17:49:13 -07:00
Oleksandr Zhurbenko
9cbff3547e Switching back to public chat 2015-05-20 17:47:25 -07:00
Maxim Khlobystov
9731fcd8d1 Made the cursor a hand when hovering the darkened screen pushed by the menu. 2015-05-20 17:03:06 -07:00
Maxim Khlobystov
8dbd263f00 Made sure there's no white space between slide and chat in portrait orientation. 2015-05-20 16:01:25 -07:00
Maxim Khlobystov
4939f53ed8 Corrected the proportion between whiteboard and chat in landscape mode. 2015-05-20 15:49:53 -07:00
Maxim Khlobystov
e83e765f45 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-new-ui 2015-05-20 15:01:39 -07:00
perroned
d83891c49a Remove traces of options pane 2015-05-19 09:06:42 -07:00
perroned
97ebd8cc81 Remove unused code 2015-05-19 08:53:33 -07:00
perroned
bd79b2c4db Fix ordering of panels 2015-05-19 08:53:17 -07:00
perroned
5a11416022 Reverting most of whiteboard 2015-05-19 08:35:12 -07:00
perroned
102cbef168 shrink notification area's height 2015-05-19 07:07:05 -07:00
perroned
c68693e5fb Elements are now sized properly through CSS 2015-05-15 13:17:33 -07:00
Maxim Khlobystov
a1bf92d6c7 Beginning work on the right-hand side menu styling. 2015-05-15 11:02:51 -07:00
Maxim Khlobystov
e4989a43a6 Fixed the process of closing the right-hand side menu after user clicks one of the buttons. 2015-05-15 10:32:02 -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
Maxim Khlobystov
ccf8b7372b Limited the translucent shield to the portrait orientation. 2015-05-14 14:14:19 -07:00
Maxim Khlobystov
7cddc861fa Made sure clicking to the translucent area closes push menus. 2015-05-14 13:58:34 -07:00
Maxim Khlobystov
afad44d7b2 Corrected the position of the translucent shield on mobile devices. 2015-05-14 13:50:43 -07:00
Maxim Khlobystov
a96301d8ef Added a translucent shield atop the main page content when one of the sliding menus is open. 2015-05-14 13:47:29 -07:00
Maxim Khlobystov
6553e1dabf Made the tooltip for the right hamburger button change when the menu is toggled. 2015-05-14 12:30:07 -07:00
Maxim Khlobystov
156017ffa2 Made the right-hand side menu only visible in portrait orientation. 2015-05-14 12:17:07 -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
1c4ac495b5 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications 2015-05-13 12:28:20 -07:00
perroned
ce0962e112 Shrink settings menu 2015-05-13 12:28:16 -07:00
Maxim Khlobystov
36552d6d61 Got rid of the code that is left unused after the latest UI changes. 2015-05-13 12:23:44 -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
16da9e1d60 Removed the code that is not used anymore after restructuring of the sliding menu. 2015-05-13 11:40:02 -07:00
Maxim Khlobystov
592d22f31e Started using Handlebars helper instead of a separate template to position the main content of the page based on the sliding menu visibility. 2015-05-13 11:31:07 -07:00
Maxim Khlobystov
e305c4c2e8 Cleaning up. 2015-05-13 11:15:59 -07:00
Maxim Khlobystov
7569d86248 Put the main container into a separate template. 2015-05-13 11:03:08 -07:00
Maxim Khlobystov
437f12c1b7 Synced the landscape and portrait userlist menus. 2015-05-13 10:49:09 -07:00
Maxim Khlobystov
5dc0dfc21e Let the client decide if the landscape userlist is open or closed by default based on the initial screen orientation. 2015-05-13 10:13:40 -07:00
Maxim Khlobystov
7008d2eb14 Merge branch 'foundation-notifications' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 2015-05-13 09:22:49 -07:00
perroned
98b063d199 Fix panel heights to be even and use the entire window 2015-05-13 07:39:22 -07:00
perroned
56ed1deb7d Logout modal. Fixed settings 2015-05-13 07:24:21 -07:00
Maxim Khlobystov
738f1d5ea7 Removed the unnecessary code inside the function that toggles the userlist. 2015-05-12 12:59:42 -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
perroned
20d653fdc7 Made notifications bigger for mobile use 2015-05-12 12:20:54 -07:00
perroned
ba227a8914 Proper height for notifications on mobile and portrait oreintations/views 2015-05-12 12:11:07 -07:00
perroned
3ee8db8dea Attach notification to viewport, not page 2015-05-12 12:10:26 -07:00
Maxim Khlobystov
8ef9adba94 Made the Logout button work in landscape mode. 2015-05-12 11:57:07 -07:00
Maxim Khlobystov
c41180fa05 Made sure a click to the sliding menu button closes the menu. 2015-05-12 11:10:30 -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
Maxim Khlobystov
299984ac0e Put the right-hand side sliding menu into a template. 2015-05-12 10:05:22 -07:00
perroned
807d36c2e1 Navbar audio icon 2015-05-12 10:05:06 -07:00
Maxim Khlobystov
ad923ab1ad Added the layout for the right-hand side sliding menu. 2015-05-12 09:51:06 -07:00
perroned
3833b600ee Exit audio notification. Fixed issue with icon not showing. 2015-05-12 09:15:01 -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
Maxim Khlobystov
2883b6e72c Got rid of the animation effects associated with the sliding menu. 2015-05-11 14:42:18 -07:00
Maxim Khlobystov
4a464b0e3f Started using the landscape mode's userlist for the sliding menu. 2015-05-11 14:34:53 -07:00
perroned
0b910cfd00 Notification manager 2015-05-11 13:02: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
perroned
9490e5971a 2 lines does not induce scrolling in chat input box 2015-05-08 11:12:41 -07:00
perroned
f75250ba59 Merge remote-tracking branch 'perroned/summit-desktop-settings' into foundation-notifications 2015-05-08 11:08:50 -07:00
perroned
cad805f77a Fix conflict 2015-05-08 11:06:33 -07:00
perroned
ade07c0d15 chat only scrolls when needed 2015-05-08 10:13:21 -07:00
Maxim Khlobystov
f4418f6109 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-client-new-ui 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-08 12:07:07 -04:00
Oleksandr Zhurbenko
1e3bdb380d Corrected icons 2015-05-08 09:02:15 -07:00
Maxim Khlobystov
e46ef7afa3 Added the toggle button for the right-hand side menu and made sure the landscape/portrait navbar only shows the appropriate buttons. 2015-05-08 11:58:51 -04:00
Oleksandr Zhurbenko
6d2a4414a7 Fixed settings and userlist icons' positioning 2015-05-08 08:53:37 -07:00
Oleksandr Zhurbenko
43b5027838 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-08 07:47:58 -07:00
Maxim Khlobystov
8103bb2903 Fixed the position of the navbar buttons. 2015-05-08 10:27:52 -04:00
Maxim Khlobystov
4940568456 Fixed the navbar icons. 2015-05-08 10:16:42 -04:00
Oleksandr Zhurbenko
40324d9306 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 2015-05-07 19:53:12 -07:00
Oleksandr Zhurbenko
d2b933a73c Added event for userlist 2015-05-07 19:52:36 -07:00
Maxim Khlobystov
0c478393f3 Recovered the styling of presenter's slides control. 2015-05-07 22:17:26 -04:00
Oleksandr Zhurbenko
7951a848fc Fixed whiteboard positioning 2015-05-07 16:14: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
Maxim Khlobystov
7829adfa3c Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 2015-05-07 18:29:52 -04:00
Maxim Khlobystov
e2909d6304 Added the left-hand sliding menu in portrait mode. 2015-05-07 18:16:43 -04:00
Maxim Khlobystov
8cf52eeb9a Got rid of the whiteboard and chat title bars. 2015-05-07 14:27:01 -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
c832240aa5 Fix webpage title 2015-05-06 23:26:13 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
Anton Georgiev
a66548d709 we still need the bbb build num 2015-05-07 20:20:51 +00:00
Anton Georgiev
518df01d78 format footer - add client build 2015-05-07 20:15:38 +00:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
Anton Georgiev
1d69f9a137 prevent redirect to <ip>/undefined 2015-05-07 16:35:13 +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
cdc8408cb5 Removing spacing from modules 2015-05-06 21:27:17 -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
bae564901e make buttons appear 2015-05-06 16:05:56 -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
eae2f7dbf3 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-06 14:42:01 -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
Maxim Khlobystov
7897f01a82 Positioned the whiteboard and chat vertically in portrait mode. 2015-05-06 16:32:25 -04:00
Anton Georgiev
c66ffcd817 incorrectly displaying that users are sharing webcams 2015-05-06 20:12:48 +00:00
Oleksandr Zhurbenko
642c28dc1d Got rid of the second body tag, fixed a whitespace under userlist 2015-05-06 12:59:00 -07:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Anton Georgiev
7110866925 presentation slide switch-permissions 2015-05-06 19:58:25 +00:00
Anton Georgiev
e8351d274e presentation slide switch-basics 2015-05-06 19:58:12 +00:00
Oleksandr Zhurbenko
10851cf521 Merge 2015-05-06 12:50:16 -07:00
Maxim Khlobystov
b4ed87cbd7 Eliminated the gap above the portrait navbar by changing the way we set the page title. 2015-05-06 15:41:46 -04:00
Oleksandr Zhurbenko
04724c2a24 Removed scrolling in landscape and fixed whiteboard's poitioning 2015-05-06 12:33:15 -07:00
Maxim Khlobystov
1fec37c2c8 Made sure the standard userlist doesn't show up in portrait orientation. 2015-05-06 15:28:30 -04:00
Oleksandr Zhurbenko
3851b95f15 Fixed the positioning of chat input textarea 2015-05-06 12:15:27 -07:00
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
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
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
perroned
8e2ce8c82c resolve merge conflicts 2015-04-27 09:55:20 -07:00
perroned
c57730ca1e Fix typo 2015-04-27 08:19:53 -07:00
perroned
c51d4a9633 modularize notification code. Notification helpers. Some redesigned CSS 2015-04-27 08:12:12 -07:00
perroned
489f63d93f Class for managing notifications 2015-04-27 08:11:35 -07: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
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