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

427 Commits

Author SHA1 Message Date
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
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
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
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
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
Gustavo Salazar
eeca99f294 Get dataPoints for every event of "AddShapeEvent". 2012-08-29 16:05:44 -05: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
63c421abd5 Remove options used by libx264. 2012-08-27 17:34:08 -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
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
Chad Pilkey
f81849ae4f added third party presentation playback controls (acornmediaplayer) 2012-08-21 16:44:54 +00:00
Markos Calderon
d75ca5dca4 finish testing of sanity check 2012-08-20 18:12:58 -05:00
Fred Dixon
ee29a96b6a changed logging for publish/preentation.rb to /var/log/bigbluebutton/presenetation/publish-* 2012-08-19 17:20:15 -04:00
Fred Dixon
f2f75067ec Changed logging for presentation.rb to /var/log/bigbluebutton/presentation/ 2012-08-19 17:17:11 -04:00
Markos Calderon
9d9bf10e81 pending changes in rap-worker 2012-08-15 19:10:29 -05:00
Markos Calderon
7fb265e756 adding sanity check 2012-08-13 15:22:53 -05:00
Chad Pilkey
599f16863d chat, slides, and thumbnails are all accessible now 2012-08-10 19:31:36 +00:00
Chad Pilkey
52371cf10a Merge remote branch 'upstream/master' 2012-08-08 14:22:57 +00:00
Gustavo Salazar
a85e8c144e Use webm for webcam in playback. 2012-08-07 16:36:52 -05:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Gustavo Salazar
a25a5710a1 Change id of video recording. 2012-08-07 13:16:02 -05:00
Markos Calderon
b88fda975e deleting wrong files 2012-08-06 11:36:15 -05:00
Chad Pilkey
4c13535607 starting to make playback accessible 2012-08-03 20:10:54 +00:00
Gustavo Salazar
e523dbf9e6 Merge pull request #55 from mconf/video-playback-into-master 
Video playback
 2012-08-03 09:08:25 -07:00
Markos Calderon
2e8715988b Fix for event urls and support for https 2012-08-01 18:55:50 -05:00
Felipe Cecagno
e8dc780c37 integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success 2012-08-01 17:40:58 -03:00
Chad Pilkey
ad9f9ef560 added simplified chat-timeline popcorn plugin 2012-07-31 21:15:14 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Fred Dixon
65f6318241 Fix playback race condition 2012-07-17 16:07:36 -04:00
Fred Dixon
74a28b285d First implementation of playback of all presentation events (slides, mouse, pan/zoom, and whiteboard) 2012-07-17 15:39:44 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Richard Alam
4ee4eb79cc - strip controls chars from chat messages as it fails the process of recordings 2012-05-12 23:17:38 -07:00
Richard Alam
93b274f4c8 - fix http://code.google.com/p/bigbluebutton/issues/detail?id=1087 2012-05-16 19:11:00 +00:00
Richard Alam
48a6a48773 - add support for IE by installing chrome frame for playing back recording 2012-05-14 15:18:56 +00:00
Gustavo Salazar
cc1435a84c Create .done file. 2012-05-03 20:30:49 -07:00
Gustavo Salazar
df41ce84ac Do not process for Matterhorn if webcam, audio, or desktop are not available to be processed. 2012-05-03 20:23:18 -07:00
Richard Alam
7b1ff2d4bb - add utf-8 encoding magic comment to recording ruby scripts 
http://blog.grayproductions.net/articles/understanding_m17n
 2012-05-03 18:56:01 +00:00
Gustavo Salazar
dd384d5f95 Give size to the window of recorded chat. 2012-04-27 08:33:14 -07:00
Gustavo Salazar
1e14fb69b3 Update popcorn script. 
Change message when playback is not possible.
 2012-04-23 15:10:41 -07:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Fred Dixon
d2a8499719 Merge pull request #25 from gugat/issue1143 
Convert timestamp to float so when dividing the result will contain
 2012-02-27 10:44:25 -08:00
Gustavo Salazar
940f080d60 Create Matterhorn logs in their own directory. 2012-02-27 13:33:22 -05:00
Fred Dixon
24c1c69156 Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree 2012-02-22 17:32:55 -05:00
Gustavo Salazar
6c85a36005 Convert timestamp to float so when dividing the result will contain 
decimals
 2012-02-17 13:02:52 -05:00
Markos Calderon
45aca72bc4 publish recording without slides 2012-01-30 09:39:03 -08:00
Markos Calderon
2f7a2afe9c fix for video processing in long meetings 2012-01-26 10:30:57 -08:00
Richard Alam
ef85442a1b - trim audio file when they overlap 2012-01-18 17:29:14 +00:00
Richard Alam
3659effee3 Fix http://code.google.com/p/bigbluebutton/issues/detail?id=982 
- if the length from header info is zero (corrupted header http://comments.gmane.org/gmane.comp.audio.sox/2637)
   determine length from file size and then fix the file to have proper length in header info.
 2012-01-16 21:03:04 +00:00
Markos Calderon
4a797ecdc1 Merge remote branch 'gugat/issue1106' 2012-01-06 09:17:06 -08:00
gugat
d685a5456a Return silence with lenght of the recording when there is not audio file. 2012-01-06 11:35:02 -05:00
gugat
ea2c453807 Add info log messages from each method of generators 
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
 2012-01-05 17:07:34 -05:00
Markos Calderon
77f664c6bd checking dirs instead of done files 2011-12-07 13:18:21 -08:00
Markos Calderon
c95a8bc56a adding a checking in rap-worker 2011-12-06 12:22:35 -08:00
Fred Dixon
ae73711cd8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-30 17:08:40 -08:00
Fred Dixon
4ab6c9e63e Removed the creation of index.html for slides (no longer needed for testing) 2011-11-30 17:08:29 -08:00
Markos Calderon
e5d511239a fixed issue 1074 2011-11-22 16:04:08 -08:00
gugat
381e120c65 Use ffmpeg to concatenate videos. Mencoder command hangs with popen. 2011-11-21 09:03:41 -08:00
Fred Dixon
a3849c9a52 Removed old comments from rap-worker.rb 2011-11-20 11:16:11 -08:00
Richard Alam
62c3b220a1 change silence limit from 10 to 60 minutes as some people join the meeting very early 
and thus prevents the recording from being processed.
 2011-11-15 10:19:12 -05:00
Markos Calderon
7b511015e2 fix for jpg images in playback 2011-11-10 08:59:41 -08:00
Fred Dixon
22c90a9ed4 Removed hard-coded URL from playback of slides 2011-10-07 13:27:48 -07:00
Marco Calderon
d91607b1d8 changes to the length 2011-09-28 12:37:26 -05:00
Fred Dixon
ccc87f0831 Temporarily disabled messages 'Skipping ... ' from record and playback scripts as they generate large log files 2011-09-27 08:49:06 -07:00
Marco Calderon
261707478b fixed recording time 2011-09-22 12:50:35 -05:00
gugat
46e6598cc3 Improve quality in images 2011-09-16 10:47:58 -07:00
gugat
175b7de6a1 ow message e when browser is IE 2011-09-12 13:29:23 -07:00
gugat
a1ce36485b Set audio file according to browser 
Copy wav file to publish repository
 2011-09-12 12:55:12 -07:00
Fred Dixon
dc1819b8ca Minor tweaks on the fotter for playback 2011-09-09 16:19:28 -07:00
Marco Calderon
2f3b0be692 fix bottom playback slide 2011-09-09 15:54:32 -05:00
Marco Calderon
423006d308 update to slides playback 2011-09-09 11:35:26 -05:00
Marco Calderon
903a503a2e updates to the slides playback 2011-09-08 19:37:42 -05:00
Richard Alam
5cb7eb6d8a - locate audio files in the process dir not in the original loc (/var/freeswitch/meetings) because 
if the admin cleans up that dir, determining recording length from file will fail.
 2011-09-08 15:43:39 +00:00
Richard Alam
162dd2226f - remove duplicate audio events 2011-09-07 20:51:07 +00:00
gugat
5f075eb9d5 Set chat to go down 2011-09-05 21:43:58 -07:00
Fred Dixon
1d9d646e36 Testing bbb-record-core with the latest version of Ruby. SystemTimer is not needed in 1.9.2 2011-09-05 12:37:34 -07:00
Fred Dixon
bae17db7a6 Small edit to playback.html (removed 'chat' as it's english specific). Keep the playback clean as a basis for customization. 2011-09-04 05:23:52 -07:00
gugat
70c8c92915 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-02 17:05:58 -07:00
gugat
e5849908a8 Remove float property to fix audio bar in the right of slides when doing playback 
Change comparison operator in timeline plugin
 2011-09-02 17:03:13 -07:00
Richard Alam
bf54da8be4 - remove duplicate audio events 2011-09-02 20:12:34 +00:00
Richard Alam
b59fc8d3aa - use start_record_timestamp, file, bridge to compare if 3 start events are eql? 2011-09-02 18:14:44 +00:00
Richard Alam
9921f9ef42 - make playback with chat work 2011-09-02 18:01:45 +00:00
Richard Alam
b95d3166ca - don't process duplicate audio events 2011-09-02 15:20:36 +00:00
Richard Alam
49a97e463b - update slides playback with chat 2011-09-02 13:44:35 +00:00