Steve Heffernan
a7dd81f82f
Merge branch 'stable'
2013-05-22 18:36:12 -07:00
Steve Heffernan
d4168cd2b6
Adding line to CHANGELOG
2013-05-22 18:34:50 -07:00
Steve Heffernan
36c92404c3
Bump version to 4.0.1
2013-05-22 18:16:13 -07:00
Steve Heffernan
1f23529cf0
Merge branch 'stable'
2013-05-22 17:25:12 -07:00
Steve Heffernan
68d5cb996a
Close GH-532: Added ie fix to font loading..
2013-05-22 17:01:55 -07:00
Steve Heffernan
fe36ae172d
Updated contrib.json to have org and project names.
2013-05-20 16:34:57 -07:00
Steve Heffernan
a6a443bac3
Updated contrib.json to use new videojs org
2013-05-20 16:02:31 -07:00
Steve Heffernan
b3d4ed6459
Added date to changelog
2013-05-20 15:02:26 -07:00
Steve Heffernan
f4ac570297
Updated to new changelog layout. Deleted changelog2 test file.
2013-05-20 14:57:48 -07:00
Steve Heffernan
8c31278c2f
Merge branch 'master' into stable
2013-05-20 13:27:47 -07:00
Steve Heffernan
623ea7bb0f
Merge pull request #506 from martinduparc/patch-1
...
"addEvent" and "removeEvent" were replaced by "on" and "off"
2013-05-11 09:42:52 -07:00
Martin D.
9e65eb3618
"addEvent" and "removeEvent" were replaced by "on" and "off"
2013-05-11 08:18:16 -03:00
Steve Heffernan
0e4f3cfa08
Merge pull request #504 from dblandin/master
...
Update uncompressed default skin url
2013-05-10 10:41:29 -07:00
Devon Blandin
c6c8cd1bd2
Update uncompressed default skin url
2013-05-10 12:34:36 -05:00
Steve Heffernan
07000db77d
Updated swf location from /c to /4.0
2013-05-09 09:28:14 -07:00
Steve Heffernan
94c07756dc
Updated docs. Changed _V_ to videojs.
2013-05-09 09:23:32 -07:00
Steve Heffernan
18c3853039
Merge pull request #495 from heff/feature/deploy
...
Feature/deploy
2013-05-08 22:37:07 -07:00
Steve Heffernan
c59275583c
Created a new deploy process for the new version
2013-05-08 22:30:52 -07:00
Steve Heffernan
65f4f1da96
Updated the font names to be shorter for the cdn.
2013-05-08 14:27:57 -07:00
Steve Heffernan
3acdb497d1
Updated version back to 4.0
2013-05-08 14:15:41 -07:00
Steve Heffernan
6c75c5ea34
Merge branch 'master' of git://github.com/videojs/video.js into feature/deploy
...
Conflicts:
package.json
src/css/video-js.css
2013-05-08 14:15:19 -07:00
Steve Heffernan
d40bcc617d
Updated deploy process and font icons.
2013-05-08 14:12:22 -07:00
Steve Heffernan
32519181c8
Merge pull request #493 from sh1ps/theme-changes
...
Style updates and updated license link in package.json
2013-05-08 14:11:39 -07:00
Matthew McClure
6eac0a44c4
added font files
2013-05-08 14:01:39 -07:00
Matthew McClure
55e2c99899
removed styles from pseudo elements to make broad styling possible. updated copyright link in package.json
2013-05-08 13:29:02 -07:00
Steve Heffernan
199b8f29da
Bumped package version to 4.0.0
2013-05-06 11:45:42 -07:00
Steve Heffernan
c02e1a4a99
Merge pull request #491 from heff/feature/fullscreen-fix
...
Triggering fullscreenchange again to fix fullscreen button status. fixes #388
2013-05-06 10:48:19 -07:00
Steve Heffernan
d1def0bcca
Triggering fullscreenchange again to fix fullscreen button status. fixes #388
2013-05-06 10:44:59 -07:00
Steve Heffernan
90ac799d57
Testing new changelog options
2013-05-06 10:24:18 -07:00
Steve Heffernan
7cc733a8df
Rotating CHANGELOG
2013-05-03 23:05:33 -07:00
Steve Heffernan
a799a506f4
Merge pull request #489 from heff/feature/position-fix
...
Fixed vjs.findPosition. fixes #488
2013-05-03 12:51:24 -07:00
Steve Heffernan
d395f6e684
Fixed vjs.findPosition. fixes #488
2013-05-03 12:49:55 -07:00
Steve Heffernan
886d555a47
Merge pull request #487 from heff/feature/clean-files
...
Broke up controls.js into multiple files.
2013-05-02 19:06:54 -07:00
Steve Heffernan
05ab972a1a
Broke up controls.js into multiple files.
...
Cleaned up media.js files also.
2013-05-02 19:03:29 -07:00
Steve Heffernan
997b327fcd
Merge pull request #486 from heff/feature/no-controls
...
Make controls = false work as expected
2013-05-02 18:39:51 -07:00
Steve Heffernan
64f7729b72
Added a disable method on components.
...
Used it to hide the controls when player.controls is false.
Also hiding big play button and poster if controls are false.
2013-05-02 18:35:32 -07:00
Steve Heffernan
d54f473670
Wrote a test for controls changes.
2013-05-02 17:15:37 -07:00
Steve Heffernan
4f319a2174
Fixed muted errors in tests from previous pull request. Removed error captureing that was preventing test breakage.
2013-05-02 17:07:05 -07:00
Steve Heffernan
0f115df0b6
Merge pull request #485 from heff/feature/swf
...
Updated to latest version of the swf. closes #390 closes #435
2013-05-02 15:54:29 -07:00
Steve Heffernan
6d1afd059f
Updated to latest version of the swf. closes #390 closes #435
2013-05-02 15:52:15 -07:00
Steve Heffernan
78ec7f0f16
Merge pull request #482 from gkatsev/verticalVolumeMenu
...
Make Volume Menu Button default to vertical.
2013-05-02 15:20:44 -07:00
Gary Katsevman
5dc9c0f2ae
Make volumeBar return 0% when muted.
2013-05-02 18:14:11 -04:00
Gary Katsevman
89b6f42e99
Make Volume Menu Button default to vertical.
...
This can be configured by giving the volumeMenuButton, an option like
`{volumeBar: {vertical: false}}`. This can also be used to pass other
options to the volumeBar.
2013-05-02 16:54:09 -04:00
Steve Heffernan
b2539cb1ea
Merge pull request #472 from drench/351-localStorage-catch
...
Catch localStorage security exceptions. Fixes #351
2013-05-01 16:33:07 -07:00
Steve Heffernan
beb3a94135
Merge pull request #471 from sh1ps/master
...
Switched license from LGPLv3 to Apache2.0
2013-05-01 16:29:10 -07:00
Steve Heffernan
f42c96e012
Updated to use vjs.USER_AGENT string.
2013-05-01 16:20:41 -07:00
Steve Heffernan
9c6dbea344
Merge pull request #469 from dmlap/android-fullscreen-pr
...
Android browsers support video element fullscreen
2013-05-01 16:18:19 -07:00
Steve Heffernan
fa79564802
Merge pull request #477 from gkatsev/verticalSlider
...
Vertical slider
2013-05-01 16:13:00 -07:00
Steve Heffernan
e21dd3649c
Merge pull request #481 from heff/feature/skin
...
Updated to new skin design
2013-05-01 15:59:51 -07:00
Steve Heffernan
c2f8930e99
Updated controls to not show by default.
2013-05-01 15:35:59 -07:00
