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 |
|
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
|
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 |
|
Chad Pilkey
|
ba26a3697a
|
fixed the firefox fullscreen bug from Issue 1345
|
2012-10-22 17:01:07 +00: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 |
|
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 |
|
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
|
5067940818
|
Validate bounds before drawing cursor
|
2012-09-15 20:40:23 -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 |
|
Gustavo Salazar
|
91960e5d3f
|
Increase size of chat window when playing audio.
|
2012-09-06 15:36:25 -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
|
803be3b3be
|
Play audio file if video was not recorded.
|
2012-09-04 16:14:07 -05:00 |
|
Chad Pilkey
|
35704cbdb9
|
Merge remote branch 'upstream/master'
|
2012-09-03 23:46:13 +00:00 |
|
Fred Dixon
|
347f0be656
|
Display initial slides correctly
|
2012-08-27 09:10:45 -04:00 |
|
Chad Pilkey
|
f81849ae4f
|
added third party presentation playback controls (acornmediaplayer)
|
2012-08-21 16:44:54 +00:00 |
|
Chad Pilkey
|
599f16863d
|
chat, slides, and thumbnails are all accessible now
|
2012-08-10 19:31:36 +00:00 |
|
Gustavo Salazar
|
a85e8c144e
|
Use webm for webcam in playback.
|
2012-08-07 16:36:52 -05:00 |
|
Gustavo Salazar
|
a25a5710a1
|
Change id of video recording.
|
2012-08-07 13:16:02 -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 |
|
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 |
|