Commit Graph

495 Commits

Author SHA1 Message Date
Anton Georgiev
a3e7721db9 update welcome message 2015-10-09 15:36:56 +00:00
Anton Georgiev
8a6c713237 while in audio display exit audio 2015-10-07 15:21:25 +00:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
perroned
99e0b75997 Simplify loading protocol process for libraries 2015-10-06 12:56:50 -07:00
perroned
3a738caa90 Load libraries from same protocl as page was served from 2015-10-06 12:48:34 -07:00
perroned
9f69fc4105 Merge remote-tracking branch 'bbb/master' into html5-client-https-audio 2015-10-06 12:42:37 -07:00
Maxim Khlobystov
4b14abfc9d Slightly changed the color palette for FAB. 2015-10-06 08:15:08 -07:00
Maxim Khlobystov
d5fddab14d Cleaning up. 2015-10-06 08:10:38 -07:00
perroned
9e9002b6bd When in audio only display exit button, remove join for other method 2015-10-05 13:46:54 -07:00
Anton Georgiev
8093ec3a66 adapt to internal userId (same for html5 as externalId) 2015-10-05 19:19:36 +00:00
perroned
343bcf86d0 Load external JS libraries using HTTPS 2015-10-05 12:07:14 -07:00
Maxim Khlobystov
5b97d359b3 Changed the color palette for the floating action button to use the existing colors. 2015-10-05 11:45:35 -07:00
Maxim Khlobystov
426adee719 Prevented the FAB from triggering on clicking invisible buttons. 2015-10-05 11:34:10 -07:00
Maxim Khlobystov
4231de1f51 Made FAB disappear smoothly after user clicks one of its buttons. 2015-10-05 10:02:52 -07:00
Maxim Khlobystov
e9f204b681 Added the ability to clear emoji status. 2015-10-02 18:07:28 -07:00
Maxim Khlobystov
65a7ac4b70 Implemented emoji status detection. 2015-10-01 15:24:43 -07:00
Maxim Khlobystov
d8ecfd8e04 Added the ability to set emoji status. 2015-10-01 12:41:43 -07:00
Maxim Khlobystov
da50169319 Updated Meteor. 2015-10-01 11:34:00 -07:00
Chad Pilkey
ad03486971 Merge pull request #2804 from OZhurbenko/whiteboard-modifications
Polling shape correction
2015-09-24 13:37:34 -04:00
Oleksandr Zhurbenko
e4277691d4 Corrected Back to Public button in a private chat tab 2015-09-15 10:51:31 -07:00
Anton Georgiev
233707395a limit flooding logs 2015-09-14 19:56:25 +00:00
Anton Georgiev
d7e414fa43 [un]mute message was not going to the correct redis channel 2015-09-14 19:55:04 +00:00
Oleksandr Zhurbenko
cfccc3aae2 Added outer whitespace to the poll shape, as in the Flash client 2015-09-11 13:07:50 -07:00
Oleksandr Zhurbenko
41c453c470 cleanup 2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b Fixed a bug with whiteboard's width in case when poll controllers appeared 2015-09-10 14:50:38 -07:00
Oleksandr Zhurbenko
f9b2cdb01c Removed unnecessary Tracker.autorun and cleaned up things 2015-09-09 10:24:57 -07:00
Oleksandr Zhurbenko
db3b95e990 Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed 2015-09-08 16:57:39 -07:00
Oleksandr Zhurbenko
0d00fb786b Prevented a whiteboard from unnecessary redrawing and improved scaling 2015-08-28 20:12:44 -07:00
Oleksandr Zhurbenko
621ebc169d Prevented whiteboard's redrawing when one of the shapes is redrawn 2015-08-27 17:55:28 -07:00
Maxim Khlobystov
89b4bac21a Made the userlist hidden by default on phones. 2015-08-27 17:47:40 -04:00
Maxim Khlobystov
4ecf1ea16a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
2015-08-27 17:19:43 -04:00
Maxim Khlobystov
5be21ee80a Made sure the width and position of the Settings window are set appropriately on any device. 2015-08-27 17:11:59 -04:00
Oleksandr Zhurbenko
ea8fe5d146 Fixed a bug with an endless array which became bigger while cursors' moving and slowed down a whiteboard 2015-08-26 16:12:20 -07:00
Maxim Khlobystov
ec33e1404b Made the notifications look appropriately sized regardless of the device type or screen orientation. 2015-08-26 17:37:27 -04:00
Maxim Khlobystov
b362cb95f3 Polished up the sizing of Settings window. 2015-08-25 14:49:04 -04:00
Oleksandr Zhurbenko
30a1d0d880 Fixed a bug with publishing a custom poll containing just one answer 2015-08-24 15:59:45 -07:00
Oleksandr Zhurbenko
8b6ebe63b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-08-24 15:31:50 -07:00
Oleksandr Zhurbenko
e77c6377be Removed 40px restriction for the width and increased a default font-size for calculations 2015-08-24 15:22:59 -07:00
Maxim Khlobystov
092274e8ef Continued transitioning the mobile views to CSS pixels, corrected the sizes of Settings window's fonts/elements. 2015-08-24 17:20:14 -04:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Maxim Khlobystov
21f1bd6a60 Polishing up the font and element sizes for phones and tablets. 2015-08-21 10:59:09 -04:00
Maxim Khlobystov
81a2ce5827 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/chat.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
2015-08-21 09:55:23 -04:00
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -04:00
Oleksandr Zhurbenko
39e51604a0 Made a raise hand button transparent 2015-08-20 12:21:48 -07:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui
Polling, Sorting and URL Validation
2015-08-19 21:06:45 -04:00
Oleksandr Zhurbenko
5f6bd654d4 Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey 2015-08-19 17:42:38 -07:00
Maxim Khlobystov
8b06d43aec Fixed the mechanism of toggling the chat bar and made sure user is unable to resize the whiteboard when the chat is closed. 2015-08-19 12:47:00 -04:00
Maxim Khlobystov
f5fe166b50 Styling for the side menus. 2015-08-18 20:02:00 -04:00
Maxim Khlobystov
9fb02eae05 Made sure all the side menu elements are clickable. 2015-08-18 19:35:14 -04:00