1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-10 23:30:03 +02:00
Commit Graph

1983 Commits

Author SHA1 Message Date
heff
fd50bd0921 Update travis yml for Savage pull request testing 2015-05-12 12:39:57 -07:00
Gary Katsevman
b65bad8f20 @gkatsev added get and set global options methods. closes #2115 2015-05-06 14:12:17 -04:00
eXon
e5595b1e38 @eXon began Tech 2.0 work, improved how tech events are handled by the player. closes #2057
closes #1485
2015-05-06 14:02:01 -04:00
Brandon
de843affb7 v5.0.0-11 2015-05-06 16:12:56 +00:00
Brandon Bay
9c99def186 @bc-bbay fixed instance where progress bars would go passed 100%. closes #2040 2015-05-06 12:10:57 -04:00
Matthew
793da0979a v5.0.0-10 2015-05-04 18:38:30 +00:00
Matthew McClure
540258181c Merge pull request #2116 from gkatsev/flash-globals
Get the flash tech working again
2015-05-04 11:36:42 -07:00
Gary Katsevman
1480018cfb Get the flash tech working again 2015-05-01 15:51:55 -07:00
Gary
9b71d6b7d8 v5.0.0-9 2015-05-01 21:18:08 +00:00
Gary Katsevman
102c6fb197 @gkatsev added a sensible toJSON function. closes #2114 2015-05-01 14:16:19 -07:00
Gary
aa7f7709b1 v5.0.0-8 2015-05-01 21:01:43 +00:00
Gary Katsevman
fd7b997ecd @gkatsev added error logging for bad JSON formatting. closes #2113 2015-05-01 13:59:52 -07:00
Gary Katsevman
90b2f5d6ac build: @gkatsev updated the Gruntfile to use ES6. closes #2106 2015-05-01 12:54:31 -07:00
Gary
87b8f8ec77 v5.0.0-7 2015-05-01 19:50:46 +00:00
Gary Katsevman
43a14291fa @gkatsev updated the component.js styles to match the new style guide. closes #2105 2015-05-01 12:48:28 -07:00
Matthew
75aa65ebae v5.0.0-6 2015-05-01 19:45:17 +00:00
Matthew McClure
a392d6c933 @mmcc added back the captions settings styles. closes #2112 2015-05-01 12:43:37 -07:00
heff
a6f4fb8ca7 build: Made prerelease task clearer and ignore build changes 2015-05-01 11:53:23 -07:00
Gary
90702a4f3e v5.0.0-5 2015-05-01 18:30:14 +00:00
Gary Katsevman
0b8bcbfba4 We want to call global setInterval not our own
When we changed to concise methods, we ended up creating a new function
that shadowed the global setInterval, setTimeout, clearInterval, and
clearTimeout methods. A recent change in babel exposed this bug.
2015-05-01 11:09:48 -07:00
heff
d05967c561 Added a prerelease command for automatic prereleases 2015-05-01 09:24:35 -07:00
Deirdre
3e1b76c9fb v5.0.0-4 2015-04-30 21:54:23 +00:00
Deirdre
b72f651a59 v5.0.0-3 2015-04-30 21:51:09 +00:00
Deirdre Connolly
f84632e057 @dconnolly exported the missing videojs.plugin function. closes #2103 2015-04-30 14:49:22 -07:00
heff
cc6c3daaed Fixed loading grunt tasks that don't start with 'grunt-' 2015-04-30 14:47:20 -07:00
heff
cba2c54fb6 Fixed prerelease task to update master 2015-04-30 14:27:44 -07:00
heff
ebf0aa1a06 v5.0.0-2 2015-04-30 14:20:13 -07:00
heff
915a6b90f2 Added a prerelease task to contrib.json 2015-04-30 14:17:16 -07:00
heff
c7265e3d9d Merge branch 'master' into review-dmlap-test-and-build-improvements 2015-04-30 12:03:52 -07:00
heff
476b8a4cf8 Merge branch 'master' into review-eXon-feature/watchify
Conflicts:
	Gruntfile.js
2015-04-30 11:44:57 -07:00
heff
a131a00c4c Added a prerelease grunt task. Updated packages to correct version. 2015-04-29 16:21:05 -07:00
David LaPalomento
54519da32c Grunt improvements
Get test/index.html working when loaded directly into a browser. Remove extra browserifying via karma. Add timing info to to grunt output.
2015-04-29 15:02:14 -07:00
David LaPalomento
b5968f13e2 @dmlap added an error message if techOrder is not in options. closes #2097 2015-04-29 14:05:22 -07:00
Steve Heffernan
f7b1492332 Merge pull request #2088 from mmcc/add-scss-to-dist
Added scss files to dist folder
2015-04-29 13:19:40 -07:00
Matthew McClure
9e953a2681 removing scss from dist 2015-04-29 13:18:22 -07:00
Matthew McClure
f21f840afb added scss files to dist folder 2015-04-29 13:16:18 -07:00
Steve Heffernan
a40b0049ed Merge pull request #2096 from mmcc/heff-puts-dist-back-in-a-corner
Removing dist again in favor of some dark git magic
2015-04-29 12:48:18 -07:00
Matthew McClure
dcb24ce744 Removing dist again in favor of some dark git magic 2015-04-29 11:09:17 -07:00
Brandon Bay
bb9fde0f82 @bc-bbay rename onEvent methods to handleEvent. closes #2093 2015-04-29 10:17:46 -07:00
Brandon Bay
4fa6a942d9 @bc-bbay Load plugins before controls. closes #2094 2015-04-29 10:15:15 -07:00
jforbes
013d59db76 @forbesjo added a vjs-button class to button controls. closes #2084 2015-04-28 17:47:42 -07:00
Steve Heffernan
8e84adb612 Merge pull request #2087 from dmlap/minified-doc-updates
Update minified video.js name in guides and examples
2015-04-28 17:25:08 -07:00
David LaPalomento
e234375168 Update minified video.js name
Change the docs to point to the new minified name for video.js. For #1013.
2015-04-28 17:00:10 -07:00
Steve Heffernan
258687fee4 Merge pull request #2086 from mmcc/nobody-puts-dist-in-a-corner
Nobody puts dist in a corner
2015-04-28 16:38:16 -07:00
Matthew McClure
1eae8697e6 Bumping to 5.0 prerelease 2015-04-28 16:04:12 -07:00
Matthew McClure
4cdca881d4 expose the dist file and derequire the bundle 2015-04-28 15:57:13 -07:00
Steve Heffernan
cf25d3a857 Merge pull request #2085 from dfreamon/patch-1
Update the copyright
2015-04-28 15:16:23 -07:00
Darius Freamon
b4fbdc24d5 update copyright 2015-04-28 16:14:05 -06:00
heff
ae0eec312c Switched to box-sizing:border-box for all player elements
This doesn't immediately break anything (I know of) because the controls
were originally designed to work in both border-box and content-box
environments. Extra elements were added to create internally padding.

This does open the door for some simplification of the HTML, though the extra
elements could still be useful for extra skin design options.

closes #2082
closes #1444
2015-04-28 13:45:59 -07:00
jforbes
69738a86dc @forbesjo added the `scrubbing` property. closes #2080 2015-04-28 13:33:55 -07:00