BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,445 Commits 13 Branches 260 Tags 1.1 GiB
2216bf89a0
Commit Graph

11445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
d59aa415cd Merge pull request #2858 from antobinary/audio-fix 
html5client: lock settings fixes
 2015-10-27 17:14:10 -04:00
Anton Georgiev
940dd4b9b2 hide joinAudio with mic icon if permissions prohibit mic 2015-10-27 20:58:41 +00:00
Anton Georgiev
1a7d91dcf2 adapt to the restructured lock settings message format 2015-10-27 20:34:03 +00:00
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
Oleksandr Zhurbenko
2f9a990663 Moving options' template to modal 2015-10-23 16:29:24 -07: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
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Anton Georgiev
e5d6bb2b0e remove shared object 2015-10-22 20:35:39 +00:00
Anton Georgiev
8448296829 display presenter preview when the stream is available, not earlier 2015-10-21 19:48:08 +00:00
Anton Georgiev
44cb8a28c3 use event for ds stop, move out js calls 2015-10-21 19:31:27 +00:00
Anton Georgiev
082be725be end ds on <close> in preview 2015-10-21 18:12:38 +00:00
Anton Georgiev
8785fafb91 remove cursor code. now cursor comes embedded in video 2015-10-21 15:57:00 +00:00
Anton Georgiev
c7e0f0211d remove extra buttons on presenter preview 2015-10-21 15:34:51 +00:00
Ghazi Triki
083aeb42c8 Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c with custom update) 2015-10-20 22:31:48 +01:00
Anton Georgiev
08f9cf5b21 change name to startVideo 2015-10-20 19:08:56 +00:00
Anton Georgiev
8a2bc3a420 preview window for presenter displays the stream now 2015-10-20 17:53:10 +00: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
Ghazi Triki
516740bc88 Removed polling shorcuts from ShortcutHelpWindow. 2015-10-19 18:33:33 +01: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
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Ghazi Triki
99f6ab2499 Minor CSS fixes. 2015-10-10 14:30:39 +01:00
Ghazi Triki
eb5371d90c Improved presentation backButton and forwardButton buttons styles. 2015-10-10 12:37:32 +01: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