Commit Graph

5221 Commits

Author SHA1 Message Date
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
Richard Alam
a3e1f320c0 - external icecast protocol property 2013-01-10 14:36:19 -05:00
Richard Alam
c593d94447 - allow broadcasting even if the meeting isn't being recorded 2013-01-10 14:36:19 -05:00
Richard Alam
be9c0e0f05 - provide a way to stream to outcast 2013-01-10 14:36:19 -05:00
Richard Alam
7eb3963951 - change URL to match notes server 2013-01-10 18:36:07 +00:00
Richard Alam
f7943470af - make links in chat clickable 2013-01-10 18:32:22 +00:00
Richard Alam
42f23f5e08 - add a note that user has logged in. 2013-01-10 16:21:37 +00:00
Richard Alam
7b94a1885f - add timestamps on notes 2013-01-10 15:52:35 +00:00
Richard Alam
7d6f26826e - try to switch webcam stream when switching presenter 2013-01-09 22:43:30 +00:00
Richard Alam
92d483eae1 - update events from Flash client 2013-01-09 19:43:56 +00:00
Richard Alam
5d6ffd6ff4 - rename NEW_ROLE event to SWITCHED PRESENTER EVENT 2013-01-09 19:38:52 +00:00
Richard Alam
048e5ba6b4 - send switched layout event 2013-01-08 21:34:22 +00:00
Richard Alam
a78929af0c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-08 20:05:11 +00:00
Richard Alam
6303de3007 - extract webcam control icons 2013-01-08 20:04:03 +00:00
Richard Alam
d015836913 Merge pull request #84 from capilkey/fix-css
fixed some issues with the css related to focus and nofocus
2013-01-08 10:21:08 -08:00
Chad Pilkey
6473135e3f fixed some issues with the css related to focus and nofocus 2013-01-08 13:08:44 -05:00
Richard Alam
9da16e3613 - no need to notify others to play the stream since a user just needs to play the stream 2013-01-07 20:57:02 +00:00
Richard Alam
051c55c37d - modify default config.xml 2013-01-07 15:54:20 +00:00
Richard Alam
2ac2d651aa - add layout with notes and broadcast 2013-01-07 15:39:46 +00:00
Richard Alam
1ef970f15d - save and retrieve notes from a sample play app 2013-01-06 22:43:47 +00:00
Leonardo Crauss Daronco
ff3d00f579 Add video area and hide presenter tools in the html5 client 2013-01-06 17:46:25 -02:00
Leonardo Crauss Daronco
950c7bf8f5 First changes to make the html5 client look good in an iPad
Smaller presentation, chat always visible, user list on top of chat.
2013-01-05 21:40:29 -02:00