Commit Graph

11179 Commits

Author SHA1 Message Date
perroned
2498eb9d32 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
2015-10-27 11:45:43 -07:00
Fred Dixon
f89fc562a2 Merge pull request #2857 from antobinary/audio-fix
html5client: leave listenOnly audio when exiting (via redis)
2015-10-27 11:42:52 -04:00
Anton Georgiev
7d624edbb8 leave global audio when exiting 2015-10-26 22:54:49 +00:00
Anton Georgiev
f54fcd9035 improve redis log 2015-10-26 22:53:34 +00:00
Fred Dixon
a2f03d2df2 Merge pull request #2852 from ffdixon/fix-2835
Fixed #2835
2015-10-23 17:51:09 -04:00
Fred Dixon
19c487a5f0 Fixed #2835 2015-10-23 17:46:27 -04:00
Richard Alam
07a95c6702 Merge pull request #2842 from kepstin/long-wav
Recording: Also tell ffmpeg to ignore the length of the intermediate wave file
2015-10-19 14:04:13 -04:00
Chad Pilkey
9da9a8efb2 Merge pull request #2846 from OZhurbenko/master
Chat improvements
2015-10-16 17:59:24 -04:00
Oleksandr Zhurbenko
b53d6454b1 Fixed a bug where horizontal scrolling appeared when users got long chat messages in mobile views 2015-10-16 14:49:06 -07:00
Oleksandr Zhurbenko
f963798952 Resetting resized input box after switching from landscape to portrait on desktop 2015-10-16 14:38:20 -07:00
perroned
184a208387 relocate video element inside the whiteboard 2015-10-16 13:18:26 -07:00
perroned
f3fb4cc0ed Fix race condition where presenter controls weren't ready when logging in 2015-10-16 13:17:48 -07:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar
- new jar signed with cert that expires on oct 30, 2017
2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
perroned
30332602ed Made ahandlers for picking up orientation switching 2015-10-16 12:00:23 -07:00
Oleksandr Zhurbenko
f552f8a4cc Restricted textbox resizing to landscape only 2015-10-16 12:00:16 -07:00
perroned
7bb1cad8fe Made ahandlers for picking up orientation switching 2015-10-16 11:45:25 -07:00
Felipe Cecagno
7069a4a6d7 Recording: Also tell ffmpeg to ignore the length of the intermediate wav file 2015-10-16 14:09:32 -04:00
perroned
53321cfd00 Use config's extension key 2015-10-16 10:42:24 -07:00
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
Calvin Walton
b4e3561fa6 Update Firefox 41 hang workaround for 41.0.2 2015-10-15 14:05:12 -04: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
Fred Dixon
b802076f01 Merge pull request #2831 from antobinary/audio-fix
html5 client - update welcome message for 1.0-beta
2015-10-09 13:07:29 -04:00
Richard Alam
fa72b06500 Merge pull request #2826 from riadvice/presentation-upload-status
Presentation upload returns a 200 HTTP status.
2015-10-09 12:48:57 -04:00
Anton Georgiev
35f3266988 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-09 15:37:04 +00:00
Anton Georgiev
a3e7721db9 update welcome message 2015-10-09 15:36:56 +00: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
Richard Alam
36fe1b0806 Merge pull request #2830 from ritzalam/allow-changing-loglevels
Allow changing loglevels
2015-10-08 15:14:11 -04:00
Richard Alam
e8e8eb8955 - clean up formatting 2015-10-08 19:10:43 +00:00
Richard Alam
197669ebc4 - add a timeout when to expect response to validate token. If we don't get a response,
log it. This might mean that we run into issue where the reply from server isn't
   getting propagated back into the client.
2015-10-08 18:28:25 +00:00
Richard Alam
e5ed0e4713 - add logging to trace messages in order to debug lost messages between server to client 2015-10-08 18:27:33 +00:00
Richard Alam
f4d094adc0 - allow changing the debug level without restarting red5 2015-10-08 18:26:22 +00:00
perroned
035e213b8a Emoji controls remain on top of video 2015-10-08 06:14:23 -07:00
Richard Alam
d2d8d9de21 Merge pull request #2828 from riadvice/fix-max-upload-pages
Fix max upload pages
2015-10-07 18:02:12 -04:00
Ghazi Triki
f969b8c753 Implemented processPresentationConversionError method in PresentationClientMessageSender, this method was accidentally left empty after the messaging refactoring in 1.0. 2015-10-07 22:55:27 +01:00
Ghazi Triki
3078f8ea40 Setting the correct number of builder analysed pages in sendFailedToCountPageMessage of paPdfToSwfSlidesGenerationService, the value should be is set from the CountingPageException not from UploadedPresentation. 2015-10-07 22:12:33 +01:00
perroned
db737adfce Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 2015-10-07 09:25:08 -07:00