Commit Graph

5192 Commits

Author SHA1 Message Date
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
740123942d a fix when the name param is not passed in the API 2013-01-23 16:43:06 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Gustavo Salazar
c761ef0bf1 generate tail padding when processing audio 2013-01-23 12:44:20 -05:00
Gustavo Salazar
d6a5b78299 accept image extensions in uppercase 2013-01-23 12:40:01 -05:00
Markos Calderon
5348a4892a check if the browser supports websockets 2013-01-23 11:40:12 -05:00
Markos Calderon
e104941d54 Changes for sync users 2013-01-22 17:56:17 -05:00
Markos Calderon
ba40fcca6b Updated license for bigbluebutton-client, bbb-video, and demo 2013-01-21 16:14:55 -05:00
Markos Calderon
3858a5f146 Added license to bbb-voice 2013-01-21 14:12:44 -05:00
Markos Calderon
c639bdbac2 Added license to deskshare 2013-01-21 13:58:37 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Markos Calderon
8a7149b0b2 Added license for bigbluebutton-apps 2013-01-18 17:49:50 -05:00
Markos Calderon
a2a6ea643a Update bigbluebutton-client/locale/en_US/bbbResources.properties 2013-01-18 16:17:22 -05:00
Fred Dixon
08bb37a6c3 Added sample voiceBridge parameter 12345 2013-01-18 15:41:43 -05:00
Fred Dixon
e075e65cbe Changed voiceBridge parameter from optional to required in PHP library in labs 2013-01-18 15:40:18 -05:00
Markos Calderon
efd601c029 accidently, removed the lines for self signed certificate 2013-01-17 12:54:20 -05:00
Markos Calderon
290e8646e5 Sign jar with Certificate using pkcs12 file 2013-01-17 12:19:16 -05:00
Richard Alam
dcf9cc9c40 Merge pull request #86 from kepstin/html5-bridge
Html5 bridge iPad demonstration updates
2013-01-15 10:36:33 -08:00
Markos Calderon
df8c646bea latest change for fix deskshare 2013-01-15 13:36:09 -05:00
Markos Calderon
f658d937e1 added scaled values for region capture 2013-01-15 13:35:53 -05:00
Calvin Walton
07357ce15b Demonstration code for video view 2013-01-15 18:11:05 +00:00
Calvin Walton
9e6de065ad Merge branch 'html5-bridge' of git://github.com/kepstin/bigbluebutton into html5-bridge-ipad
This pulls in the icecast changes

Conflicts:
	labs/bbb-html5-client/README.md
2013-01-15 18:09:39 +00:00
Markos Calderon
241b519d05 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-01-15 09:54:18 -05:00
Richard Alam
f9fca35577 - add API to tell that SWF is ready for external interface calls 2013-01-14 21:06:49 +00:00
Richard Alam
bc80d55b2a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-14 20:29:41 +00:00
Richard Alam
cb3ecd01f3 - add example on how to handle preview and view webcam stream when switching presenter 2013-01-14 20:27:21 +00:00
Richard Alam
1f68306bae - preview or view webcam when switching presenter 2013-01-14 20:26:11 +00:00
Richard Alam
9bcac978e5 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-01-14 19:04:19 +00:00
Richard Alam
027dccbb6e - add sample how to query if user is publishing cam or not 2013-01-14 19:03:51 +00:00
Richard Alam
4ab5371e0f - add js api to query if user is publishing cam or not 2013-01-14 19:02:05 +00:00
Richard Alam
bceec77053 - fit broadcasted video to window 2013-01-14 15:38:37 +00:00
Richard Alam
ebd2423adb - don't show playlist toolbar 2013-01-14 15:35:47 +00:00
Richard Alam
8f6ad6d764 - move timestamp to right 2013-01-14 15:35:31 +00:00
Markos Calderon
ed49bd02ff Merge remote-tracking branch 'rsippl/deskshare-optimizations' 2013-01-14 10:33:57 -05:00
Richard Alam
eaa19d3e98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-11 22:28:09 +00:00
Richard Alam
4e0d1cf787 - sample calls to show how to use the api 2013-01-11 22:27:18 +00:00
Richard Alam
26e07fabb7 - call js interface when link is clicked on chat 2013-01-11 22:26:05 +00:00
Richard Alam
dac9e2e759 Merge branch 'master' into update-webcam-when-switching-presenter 2013-01-11 21:18:52 +00:00
Richard Alam
2fb52d54ee - style mic settings and file upload windows 2013-01-11 21:18:34 +00:00
Richard Alam
97cb0af1a7 - fix problem where JS API isn't called when user becomes viewer 2013-01-11 20:39:29 +00:00
Richard Alam
15aadde67e - remove BigBlueButton text 2013-01-11 18:24:46 +00:00
Richard Alam
d32ccde274 - provide example on how to use get user info api 2013-01-11 16:59:30 +00:00
Richard Alam
fee32ddf7a - provide api to query user info 2013-01-11 16:58:15 +00:00
Richard Alam
c64f6dc740 - dispatch switch layout event when moderator locks the layout and switch 2013-01-11 15:19:55 +00:00
Richard Alam
a290a03474 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-10 22:35:10 +00:00
Markos Calderon
3aacbd2de2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-01-10 17:24:00 -05:00
Markos Calderon
abaaf5da5d Added a checking when scaled values are passed in fullscreen mode 2013-01-10 17:23:05 -05:00
Richard Alam
61b4c174fe - scroll to bottom of notes 2013-01-10 21:56:46 +00:00
Richard Alam
e70d51b258 - fix to send vars to query for saved notes 2013-01-10 20:44:22 +00:00
Richard Alam
61cbcacda2 - make properties for icecast stream configurable 2013-01-10 14:36:19 -05:00