Commit Graph

11146 Commits

Author SHA1 Message Date
perroned
6d123220bd Cleaning up 2015-10-16 09:32:34 -07:00
perroned
c57065348e Vertically center and scale whiteboard/paper after displaying 2015-10-16 09:10:24 -07:00
perroned
60d7e45607 Deskshare preview start/stop. Video sizing 2015-10-16 09:08:10 -07:00
perroned
70ac1fadd0 Only display deskshare UI for presenters 2015-10-13 13:12:35 -07:00
perroned
10302d3a36 Detect for existence of desk sharing extension 2015-10-13 12:35:30 -07:00
perroned
6b593016b6 Simplify verto call parameter configuration 2015-10-08 13:34:38 -07:00
perroned
d7bdb316ee Show error if html5 video element is not supported 2015-10-08 13:22:05 -07:00
perroned
7d99df33ec Conditional for menu button 2015-10-08 13:21:48 -07:00
perroned
53562590f1 conditional for showing button 2015-10-08 13:21:16 -07:00
perroned
7e0e68c434 Remove jquery hiding methods 2015-10-08 13:20:38 -07:00
perroned
083d575d8d Use reactive conditionals to hide the button, no longer need CSS 2015-10-08 13:20:15 -07:00
perroned
6b7d70fa93 Made resolution menu slightly larger 2015-10-08 13:19:32 -07:00
perroned
060b901459 Populate resolution menu when it has rendered 2015-10-08 13:19:05 -07:00
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
Richard Alam
f7f3177e0a Merge pull request #2827 from antobinary/audio-fix
html5client: Fix recent audio issues
2015-10-07 11:33:48 -04: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
Anton Georgiev
0f5c19e13b reset userAgent and callerIdName so we can switch between audio joining modes 2015-10-07 15:09:08 +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
Richard Alam
e44056cd5d Merge pull request #2825 from ritzalam/add-external-userid-in-log
- log external user id
2015-10-06 18:27:45 -04:00
Richard Alam
894b59b687 - log external user id 2015-10-06 22:26:47 +00:00
Richard Alam
5b0facd058 Merge pull request #2824 from perroned/html5-client-https-audio
Load JS libraries over HTTPS. Only allow exiting of audio while in call.
2015-10-06 17:06:46 -04: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
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example
- convert all external ids in js api into internal user ids as using…
2015-10-06 15:00:33 -04:00
Richard Alam
9260705ab9 - add js lib that parses chat messages and converts urls (fixes issue 2692) 2015-10-06 18:58:54 +00:00
Richard Alam
5e034a2b1f Merge pull request #2820 from capilkey/add-dots-to-reconnect
Added scrolling dots to the reconnect popup
2015-10-06 14:00:01 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when
a user joins twice into the meeting
2015-10-06 17:57:39 +00:00
Richard Alam
885a39fac5 Merge pull request #2821 from gthacoder/meteor-client-userlist-emojis
Emojis for HTML5 client.
2015-10-06 11:44:03 -04: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
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -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
Richard Alam
85de6a9844 Merge pull request #2819 from ritzalam/update-locales-oct-5-2015
- update to latest locales (oct 5, 2015)
2015-10-05 12:01:09 -04:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Fred Dixon
c9c107014d Update index.html 2015-10-05 11:44:47 -04:00
Richard Alam
f20b919ec2 Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround
Workaround Firefox 41.0.1 hang on Windows
2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810
Fix 2810
2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
2015-10-05 11:26:31 -04:00