BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,695 Commits 13 Branches 260 Tags 1.1 GiB
14b7b5500f
Commit Graph

4695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chad Pilkey
969824d29b Merge remote branch 'upstream/master' 2012-09-07 18:11:18 +00: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
Chad Pilkey
008b3ccf35 Merge remote branch 'upstream/master' 2012-09-06 15:37:12 +00: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
Chad Pilkey
35704cbdb9 Merge remote branch 'upstream/master' 2012-09-03 23:46:13 +00: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
Gustavo Salazar
27dd7da721 Get attributes according to the type of event. 2012-08-28 14:31:14 -05:00
Gustavo Salazar
e404da9614 Disable h264 by default. 2012-08-27 18:08:29 -05:00
Gustavo Salazar
63c421abd5 Remove options used by libx264. 2012-08-27 17:34:08 -05:00
Gustavo Salazar
59ac709833 Set ip address in presentation.yml using bbb-conf --setip. 2012-08-27 15:34:31 -05:00
Felipe Cecagno
96d4037ab0 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-08-27 16:23:59 -03:00
Felipe Cecagno
7be21e5e53 only copies the slides text files if they exist; this is to keep the script compatible with old recordings 2012-08-27 16:23:12 -03:00
Gustavo Salazar
efc52ca936 Merge pull request #60 from mconf/master 
Video file generation for presentation playback format
 2012-08-27 09:18:42 -07:00
Felipe Cecagno
f9d7f11d63 reverted the code used to process the video for the matterhorn integration; many fixes on the video processing for the new playback format "presentation"; now it's possible to set the output video resolution for the presentation playback - it's VGA by default but could be set to HD 2012-08-27 12:41:26 -03:00
Fred Dixon
347f0be656 Display initial slides correctly 2012-08-27 09:10:45 -04:00
Richard Alam
0971eb9a58 - add example wrapper for loading flash client from different server 2012-08-24 21:32:17 +00:00
Richard Alam
75bd9a754f Merge branch 'master' into embedding-the-client 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2012-08-24 21:25:21 +00:00
Richard Alam
0521f347de Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-08-24 20:53:14 +00:00
Richard Alam
26c4077723 - missed one spot to change the userid 2012-08-24 20:52:51 +00:00
Richard Alam
72d97f9faf - load flash from an html on a different server 2012-08-24 19:22:26 +00:00
Fred Dixon
a253171ac8 Fix for issue http://code.google.com/p/bigbluebutton/issues/detail?id=1294 2012-08-24 13:43:01 -04:00
Richard Alam
414d3568f6 - see if we can callback from flash to javascript 2012-08-24 15:06:18 +00:00
Richard Alam
51e7b4a114 - remove typo 2012-08-24 14:45:54 +00:00