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
256a9dc200 set text file only when it exists 2013-02-13 17:13:55 -05:00
Gustavo Salazar
406e467c8b set audio sample rate according to the recorded audio file 2013-02-13 14:42:23 -05:00
Chad Pilkey
6bf3e1c6e5 fixed my botched playback merge from 3 months ago 2013-02-09 14:13:06 -05:00
Gustavo Salazar
cb07415807 load jquery from server 2013-02-08 16:19:15 -05:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Markos Calderon
16ef060da3 Merge remote-tracking branch 'fcecagno/playback-in-time' 2013-02-04 11:04:19 -05:00
Gustavo Salazar
c761ef0bf1 generate tail padding when processing audio 2013-01-23 12:44:20 -05:00
Gustavo Salazar
d6a5b78299 accept image extensions in uppercase 2013-01-23 12:40:01 -05:00
Chad Pilkey
9df127d339 updated popcorn.js to 1.3 2012-12-08 11:14:38 -05:00
Felipe Cecagno
4ad891293c now you can specify &t=0h0m0s on the playback url so the presentation will start from there just like on youtube; also fixed the generation of thumbnails, that was not working properly 2012-12-06 21:31:48 -02:00
Gustavo Salazar
821e8c823d fix 'clear page' action in playback 2012-11-28 11:42:25 -05:00
Gustavo Salazar
8f973cd1f4 fix playback of whiteboard for slides in 'portrait' mode 2012-11-27 17:41:14 -05:00
Gustavo Salazar
99ef5f4875 Increase z-index of cursor in playback 2012-10-30 10:56:38 -05:00
Chad Pilkey
0c6e5a0632 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
 2012-10-29 16:03:09 -04:00
Gustavo Salazar
93a1f2f2a1 Increase height of text box in playback 2012-10-26 14:15:11 -05:00
Gustavo Salazar
66e8fbbdbb Draw squares properly in the playback 2012-10-26 13:44:06 -05:00
Gustavo Salazar
5d53bdfd4a Send one video stream(webcam OR deskshare) to Matterhorn server 2012-10-24 13:40:41 -05:00
Gustavo Salazar
ac32c59029 Extract pdf page in a temp dir 2012-10-23 13:53:43 -05:00
Gustavo Salazar
033e76f5c4 Detect and draw circles in playback 2012-10-22 13:55:44 -05:00
Chad Pilkey
ba26a3697a fixed the firefox fullscreen bug from Issue 1345 2012-10-22 17:01:07 +00:00
Gustavo Salazar
41b9467c77 Align and wrap text 2012-10-20 15:28:20 -05:00
Gustavo Salazar
1a8d263da4 Set color in played text 2012-10-19 15:06:52 -05:00
Gustavo Salazar
d18a677bef Fix playback of straight line 2012-10-19 13:10:37 -05:00
Gustavo Salazar
46b0f56fe8 Wrap text in playback. 2012-10-19 13:09:16 -05:00
Gustavo Salazar
bc1382cf79 Merge pull request #68 from capilkey/add-seperate-playback-controls 
Add seperate playback controls
 2012-10-18 14:48:00 -07:00
Chad Pilkey
ecd09f1f2b in firefox the media can actually load before the jquery is called to add listeners. I fixed it 2012-10-18 18:42:11 +00:00
Chad Pilkey
a81800f822 alternate control theme 2012-10-16 20:02:30 +00:00
Chad Pilkey
451647baf8 fixed controls not displaying for audio source 2012-10-15 20:23:19 +00:00
Chad Pilkey
39bd72f7ce acorn controls working properly 2012-10-15 19:09:56 +00:00
Chad Pilkey
e82a3efed8 initial implementation of controls 2012-10-15 16:11:10 +00:00
Felipe Cecagno
df37f484d7 insert the scroll bar on the chat automatically instead of grow the div indefinitely; little improvement on the deploy script for the recordings 2012-10-11 13:45:14 -03:00
Chad Pilkey
abad84542d fixed new playback controls 2012-10-09 17:33:59 +00:00
Gustavo Salazar
51fe50a811 Do not play video file according to audio file. 2012-10-02 12:22:14 -05:00
Gustavo Salazar
487cf1b51f Align components in playback. 2012-10-02 09:58:27 -05:00
Chad Pilkey
0a7ab07727 Merge remote branch 'upstream/master' 
Conflicts:
	record-and-playback/presentation/playback/presentation/playback.js
 2012-10-01 21:00:32 +00:00
Gustavo Salazar
f3c8477b27 Fixed frame rate in mpg file 2012-09-28 11:52:35 -05:00
Gustavo Salazar
aa3350115d Ask for ffmpeg version before using loop parameter. 2012-09-25 20:08:52 -05:00
Chad Pilkey
14b7b5500f Merge remote branch 'upstream/master' 2012-09-24 19:01:04 +00:00
Gustavo Salazar
2462802d54 Change ffmpeg commands to support version 0.11.2 2012-09-21 17:27:11 -05:00
Chad Pilkey
97bfcbb068 Merge remote branch 'upstream/master' 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
	record-and-playback/presentation/playback/presentation/playback.js
 2012-09-21 21:27:23 +00:00
Gustavo Salazar
f8510d749b Always set a value to "title" in dublincore.xml 2012-09-21 15:22:23 -05:00
Chad Pilkey
a787c7c2c3 trying to implement accessibility pauses 2012-09-17 16:31:28 +00:00
Gustavo Salazar
b0cb319bf1 Set width to chat container 2012-09-16 14:38:18 -05:00
Gustavo Salazar
e2fbbef7de Remove dependency on slides scripts 2012-09-15 21:27:10 -05:00
Gustavo Salazar
79b9cf1cab Validate bounds in cursor events 2012-09-15 20:42:31 -05:00
Gustavo Salazar
5067940818 Validate bounds before drawing cursor 2012-09-15 20:40:23 -05:00
gustavo salazar
6d90e31b85 Set playback_host in bigbluebutton.yml 2012-09-10 16:12:10 -05: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
Chad Pilkey
969824d29b Merge remote branch 'upstream/master' 2012-09-07 18:11:18 +00:00