Commit Graph

526 Commits

Author SHA1 Message Date
perroned
8078cddc4b Add callbacks for desksharing 2015-10-08 13:16:13 -07:00
perroned
859c1f2965 Tidy up resolution menu 2015-10-08 13:14:49 -07:00
perroned
6b1cc6549d Hide video element when in an audio-only call 2015-10-08 13:14:13 -07:00
perroned
035e213b8a Emoji controls remain on top of video 2015-10-08 06:14:23 -07:00
perroned
db737adfce Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 2015-10-07 09:25:08 -07: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
543cc7f7e1 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition
Conflicts:
	bigbluebutton-html5/app/client/main.coffee
2015-10-07 06:38:00 -07: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
perroned
5478e37b5b merge conflicts 2015-10-06 12:11:43 -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
perroned
87ae47e95c Resolve issues with SIP compatability 2015-09-30 12:41:59 -07:00
perroned
6109b40171 Remove comment structure altering code views 2015-09-30 11:08:45 -07:00
perroned
f7df2964c5 Autosubscribe to deskshare watch-only stream on join 2015-09-30 11:04:01 -07:00
perroned
3ea085ea07 Trigger deskshare start and stop 2015-09-30 09:57:44 -07:00
Chad Pilkey
ad03486971 Merge pull request #2804 from OZhurbenko/whiteboard-modifications
Polling shape correction
2015-09-24 13:37:34 -04:00
perroned
bc1c86ba52 listen only, microphone, watch only 2015-09-22 09:09:29 -07:00
perroned
576acf0902 Listen only 2015-09-17 10:55:35 -07:00
perroned
484ce4fb38 Fix UI issues with modals. Resize webcam video 2015-09-15 12:06:18 -07:00
Oleksandr Zhurbenko
e4277691d4 Corrected Back to Public button in a private chat tab 2015-09-15 10:51:31 -07:00
perroned
0378b2e723 modularize modals 2015-09-15 09:36:49 -07:00
perroned
ee49bf9e0f Verto UI, listen only 2015-09-15 09:34:59 -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
perroned
95bbe10ca7 Fixed a bug where you could not restart Chrome deskshare 2015-09-14 08:40:07 -07:00
perroned
6a2b4c972a Added flag for audio choosing 2015-09-14 07:19:41 -07:00
perroned
24279cae36 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 2015-09-14 07:08:40 -07:00
perroned
f631664028 Not required (as of yet) 2015-09-14 07:08:05 -07:00
perroned
36e4c2d0d9 Hooking up UI components 2015-09-14 07:07:35 -07: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
perroned
7ed87d01c6 Fix issue when screensharing first 2015-09-09 15:41:13 -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
perroned
695d14972f Initialize resolutions for verto 2015-09-04 12:55:03 -07:00