Richard Alam
|
48976c86db
|
Merge branch 'master' into merge-master-with-upgrading-red5-r4406
|
2012-09-12 17:19:30 +00:00 |
|
Richard Alam
|
10189eccf9
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-12 16:05:20 +00:00 |
|
Richard Alam
|
870bd93013
|
- move bbb-api-bridge into it's onwn js file
- rename the api method names
- cleanup
|
2012-09-12 16:00:38 +00:00 |
|
Richard Alam
|
8ac96a7a3c
|
- change config.xml template to have full URL of SWF files
|
2012-09-12 15:33:03 +00:00 |
|
Richard Alam
|
781a03a149
|
Merge branch 'master' into merge-master-into-embedding-client
|
2012-09-12 15:19:30 +00:00 |
|
Gustavo Salazar
|
9b03ac4292
|
Use playerglobal 11.2 instead of 10.3 when setting development environment
|
2012-09-12 09:19:48 -05:00 |
|
Fred Dixon
|
f39eed5dfe
|
reverted changes to bbb-conf
|
2012-09-11 18:45:16 -04:00 |
|
Fred Dixon
|
7bad4ffab8
|
Also delete sanity recordings in bbb-record --deleteall
|
2012-09-11 18:41:32 -04:00 |
|
Richard Alam
|
886f62337b
|
- qeury for server name so we can determine where to load locales.xml, config.xml, etc.
|
2012-09-11 21:51:27 +00:00 |
|
Richard Alam
|
17dc1fbde4
|
- cut down amount of whiteboard data by 2/3
|
2012-09-11 19:29:26 +00:00 |
|
Richard Alam
|
8825dc71ab
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-11 17:50:46 +00:00 |
|
Richard Alam
|
705ac86d2b
|
- throttle mouse cursor updates in presentation window
|
2012-09-11 17:50:16 +00:00 |
|
gustavo salazar
|
2eef1f4664
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-10 16:12:49 -05:00 |
|
gustavo salazar
|
6d90e31b85
|
Set playback_host in bigbluebutton.yml
|
2012-09-10 16:12:10 -05:00 |
|
Fred Dixon
|
c57e7de14d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-10 16:22:58 -04:00 |
|
Fred Dixon
|
abce700f11
|
Merge pull request #62 from ryanseys/master
Add bbb-html5-client to labs
|
2012-09-10 13:21:47 -07:00 |
|
gustavo salazar
|
140376e084
|
"Audio" tag created in html.
|
2012-09-10 14:40:51 -05:00 |
|
Gustavo Salazar
|
6a8319ba9e
|
Show chat when audio is played.
|
2012-09-07 17:21:00 -05:00 |
|
Fred Dixon
|
d3b694167f
|
Modified bbb-conf to not require slides.yml
|
2012-09-07 16:45:31 -04:00 |
|
Ryan Seys
|
69e27955b3
|
Add bbb-html5-client to labs not as submodule
|
2012-09-07 15:02:21 -04:00 |
|
Ryan Seys
|
1288b0b1cc
|
Remove submodule
|
2012-09-07 15:00:13 -04:00 |
|
Ryan Seys
|
9a8283951f
|
Add bbb-html5-client to labs
|
2012-09-07 14:48:07 -04:00 |
|
Richard Alam
|
39b591fdf6
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-07 14:29:41 +00:00 |
|
Richard Alam
|
24b5d77de3
|
- align whiteboard icons
|
2012-09-07 14:29:22 +00:00 |
|
Gustavo Salazar
|
2b48e2e4cb
|
Increase count of text shapes.
|
2012-09-06 16:19:51 -05:00 |
|
Gustavo Salazar
|
91960e5d3f
|
Increase size of chat window when playing audio.
|
2012-09-06 15:36:25 -05:00 |
|
Gustavo Salazar
|
4a492c214a
|
Process and draw straight lines for plaback.
|
2012-09-06 14:21:55 -05:00 |
|
Gustavo Salazar
|
2517405692
|
Load writing.js after that audio or video are chosen.
|
2012-09-05 15:35:23 -05:00 |
|
Richard Alam
|
046e4aa9d8
|
Merge branch 'master' into upgrading-red5-r4406
|
2012-09-05 14:43:03 +00:00 |
|
Richard Alam
|
5b551761d7
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-04 22:11:48 +00:00 |
|
Richard Alam
|
957948ae79
|
- fix stream names for video
|
2012-09-04 22:11:31 +00:00 |
|
Gustavo Salazar
|
f5ee8b6cbf
|
Update license.
|
2012-09-04 16:42:13 -05:00 |
|
Gustavo Salazar
|
a96fbc82bc
|
Remove processed files for matterhorn.
|
2012-09-04 16:20:09 -05:00 |
|
Gustavo Salazar
|
803be3b3be
|
Play audio file if video was not recorded.
|
2012-09-04 16:14:07 -05:00 |
|
Richard Alam
|
2c67f67e9c
|
- make deskshare and voice work with latest red5 (r4406)
|
2012-09-04 20:20:29 +00:00 |
|
Gustavo Salazar
|
6920db9123
|
Accept updates when drawing a shape.
|
2012-09-03 21:10:09 -05:00 |
|
Gustavo Salazar
|
baaac401d6
|
Process triangles.
|
2012-09-03 20:14:29 -05:00 |
|
Markos Calderon
|
eb44c168c0
|
Update bbb-api-demo/src/main/webapp/bbb_api.jsp
|
2012-09-03 16:38:21 -05:00 |
|
Richard Alam
|
420d5f13dd
|
- try to fix why it's not working properly
|
2012-09-03 18:39:51 +00:00 |
|
Richard Alam
|
808588cb5d
|
- try upgrading to red5 r4406
|
2012-09-03 17:15:46 +00:00 |
|
Gustavo Salazar
|
20c6bb3722
|
Resize font of text events.
|
2012-08-30 18:55:15 -05:00 |
|
Gustavo Salazar
|
f5c2b9cdc5
|
Remove processed and published files.
|
2012-08-30 03:42:11 -05:00 |
|
Gustavo Salazar
|
4a0c27d6ca
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-08-30 03:28:18 -05:00 |
|
Fred Dixon
|
e98d29e4b8
|
Added 'S' column in bbb-record --watch for Sanity check
|
2012-08-30 18:00:26 -04:00 |
|
Markos Calderon
|
5bb870b385
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-sanity-check
|
2012-08-30 16:13:44 -05:00 |
|
Gustavo Salazar
|
85d66d5203
|
Use the event "ModifyTextEvent" to draw text.
|
2012-08-29 23:29:11 -05:00 |
|
Markos Calderon
|
60854bc7fa
|
added a temporary change for text tool in presentation
|
2012-08-29 16:35:16 -05:00 |
|
Gustavo Salazar
|
eeca99f294
|
Get dataPoints for every event of "AddShapeEvent".
|
2012-08-29 16:05:44 -05:00 |
|
Fred Dixon
|
5feed6046f
|
Applied Taigo's update for issue #1246
|
2012-08-29 14:45:37 -04:00 |
|
Gustavo Salazar
|
a8fae3bbf9
|
Ask if duration of video is 0.
|
2012-08-28 14:38:23 -05:00 |
|