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

4704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
8012c8f48f Merge branch 'master' into embedding-the-client 2012-08-24 14:09:32 +00:00
Richard Alam
809e16cc61 - fix tooltip 2012-08-23 22:00:20 +00:00
Richard Alam
ebf89cb65f Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid 2012-08-23 21:31:30 +00:00
Richard Alam
62b92a825c - fix font size for late joiner 2012-08-23 21:29:54 +00:00
Richard Alam
17734c404b - size the fonts properly...but problem with late joiner still 2012-08-23 21:12:46 +00:00
Richard Alam
aba57f70bd - fix assigning of presenter 2012-08-23 19:56:57 +00:00
Richard Alam
d9e5c80c6c - try generating userid instead of using red5 connection id as userid 2012-08-23 19:49:31 +00:00
Richard Alam
5895bbc8c6 - try to fix font size for late joiner 2012-08-23 17:40:39 +00:00
Richard Alam
13261976f9 - fix ClassCastException once more 2012-08-23 15:58:50 +00:00
Richard Alam
6f7ba912e6 - cleanup 2012-08-23 13:33:39 +00:00
Richard Alam
da8d48b909 - prototype js to as3 hook 2012-08-22 21:28:03 +00:00
Richard Alam
c90ae01f09 - take layout.xml from resources dir 2012-08-22 21:27:27 +00:00
tdj-br
138fe678fa Merge pull request #58 from iMDT/master 
Added a configurable timeout to detection of RTMP/RTMPT.
 2012-08-22 03:20:22 -07:00
tdj-br
3a0552a2b6 Changed the template of config file. 2012-08-22 10:18:40 +00:00
imdt
472a6f325e Created timeout on RTMP/RTMPT tests. 2012-08-22 10:04:48 +00:00
Fred Dixon
9fa7cf3da6 Added bbb-record --clean to clean out process and publish log files for recordings 2012-08-21 21:05:22 -04:00
Fred Dixon
bcafbc6d48 Filter our ffmpeg output to stderror when looking for errors in /var/log/bigbluebutton/presentation/* and /var/log/bigbluebutton/slides/* 2012-08-21 20:51:24 -04:00
Fred Dixon
83006b0426 removed 'set -e' that was preventing bbb-record --debug from processing more log files 2012-08-21 20:43:31 -04:00
Fred Dixon
fe78f961bc Fixed error that was not searching /var/log/bigbluebutton/prentation log files for errors when doing bbb-record --debug 2012-08-21 20:13:50 -04:00
Fred Dixon
b2767aaf68 Output settings in red5 video for capture video (true/false) 2012-08-21 19:17:14 -04:00
Fred Dixon
3c70cf500b Fixed syntax error for path to presenttion folder 2012-08-21 19:08:48 -04:00
Fred Dixon
bd16b27667 Removed execute permissions from slides.yml 2012-08-21 19:04:29 -04:00
Markos Calderon
0c9e45682e added failed status 2012-08-21 16:55:41 -05:00
Richard Alam
67f316b525 - cleanup 2012-08-21 20:46:23 +00:00
Richard Alam
888e3d9a2f - cleanup 2012-08-21 20:07:17 +00:00
Richard Alam
9749a80026 - fix annotation history when user joins late 2012-08-21 19:42:53 +00:00
Richard Alam
44b2e55d52 - try and fix synching of annotations for late joiners 2012-08-21 16:00:41 +00:00
Markos Calderon
d75ca5dca4 finish testing of sanity check 2012-08-20 18:12:58 -05:00
Richard Alam
ace0e438f9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-08-20 20:25:31 +00:00
Richard Alam
0dacb217b0 - fix exception popup on Flash debug 2012-08-20 20:25:06 +00:00
Fred Dixon
fef6d0e2b1 Remove reference to Melomel 2012-08-20 16:16:48 -04:00
Richard Alam
edf56cacb3 - minimize logging 2012-08-20 15:54:37 +00:00