Commits · c5e63b381247b61f9d47d2ad2b4d1bdbfcba4713 · brainfood / videojs-contrib-hls

31 Mar, 2014 1 commit
- Merge branch 'master' into withcredentials · c5e63b38 ...
  c5e63b38
```
Conflicts:
	package.json
	test/.jshintrc
```
  Gary Katsevman committed 2014-03-31 11:50:47 -0400
28 Mar, 2014 14 commits
- Merge pull request #37 from videojs/saucytravis3_thefinaldimension · 07c7021e ...
  07c7021e Browse Files
```
Fix package.json and don't use saucelabs.
```
  Gary Katsevman committed 2014-03-28 19:01:59 -0400
- don't use sauce labs · 637ee79e
  637ee79e Browse Files
  
  Gary Katsevman committed 2014-03-28 18:55:58 -0400
- Don't use saucelabs for a bit now · 083e264e
  083e264e Browse Files
  
  Gary Katsevman committed 2014-03-28 18:41:13 -0400
- update sauce config in karma · 6a3fccb1
  6a3fccb1 Browse Files
  
  Gary Katsevman committed 2014-03-28 17:53:01 -0400
- remove the sauce_connect_setup script · c79960ee
  c79960ee Browse Files
  
  Gary Katsevman committed 2014-03-28 17:21:58 -0400
- only run in chrome · f530f7a5
  f530f7a5 Browse Files
  
  Gary Katsevman committed 2014-03-28 17:05:11 -0400
- Use node 0.10 on travis. · e55f0bd6 ...
  e55f0bd6 Browse Files
```
Don't try to update npm anymore.
```
  Gary Katsevman committed 2014-03-28 16:44:26 -0400
- have travis update to a newer npm first · 1bb8391d
  1bb8391d Browse Files
  
  Gary Katsevman committed 2014-03-28 16:32:05 -0400
- fix up package.json · dc3eff8b
  dc3eff8b Browse Files
  
  Gary Katsevman committed 2014-03-28 16:13:10 -0400
- Merge pull request #36 from videojs/saucytravis3_thefinaldimension · b644fa95 ...
  b644fa95 Browse Files
```
Karma and saucelabs integration with travis-ci.
```
  Gary Katsevman committed 2014-03-28 16:02:56 -0400
- Merge branch 'master' into saucytravis3_thefinaldimension · 76b977c7 ...
  76b977c7 Browse Files
```
Conflicts:
	package.json
```
  Gary Katsevman committed 2014-03-28 16:01:58 -0400
- updated with new access token · 56795555
  56795555 Browse Files
  
  Parul Sharma committed 2014-03-28 15:34:04 -0400
- Merge pull request #34 from videojs/feature/live-um · 3412f5fc ...
  3412f5fc Browse Files
```
Experimental Live HLS support
```
  Gary Katsevman committed 2014-03-28 14:41:12 -0400
- Update video.js dependency constraints · 59139145 ...
  59139145 Browse Files
```
Use the carat operator to specify the video.js compatibility range, which means the HLS plugin is compatible with 4.x video.js releases.
```
  David LaPalomento committed 2014-03-28 10:39:16 -0400
26 Mar, 2014 3 commits
- 0.3.2 · 38fc46b8
  38fc46b8 Browse Files
  
  David LaPalomento committed 2014-03-26 17:13:05 -0400
- Merge pull request #33 from videojs/hotfix/peer-deps · 45bfb9fc ...
  45bfb9fc Browse Files
```
Try using peerDependencies for video.js
```
  Tom Johnson committed 2014-03-26 10:34:55 -0700
- update vjs SWF reference in example.html · d9b8b6cc
  d9b8b6cc Browse Files
  
  Tom Johnson committed 2014-03-26 10:32:51 -0700
24 Mar, 2014 2 commits
- Try using peerDependencies for video.js · d9dab301 ...
  d9dab301 Browse Files
```
Clean up deps in package.json. Having video.js as a peer dependency seems like the right way of expressing the relationship so give that a shot.
```
  David LaPalomento committed 2014-03-24 21:23:54 -0400
- Add test for withCredentials option · fb85d65a
  fb85d65a Browse Files
  
  Gary Katsevman committed 2014-03-24 11:22:42 -0400
22 Mar, 2014 4 commits
- move sinon to dev deps · d04a92c9
  d04a92c9 Browse Files
  
  Gary Katsevman committed 2014-03-22 15:14:12 -0400
- Merge branch 'feature/live-um' into withcredentials · 588576a1 ...
  588576a1
```
Conflicts:
	package.json
```
  Gary Katsevman committed 2014-03-22 15:13:00 -0400
- Switch to use npm sinon · 599fb470
  599fb470 Browse Files
  
  Gary Katsevman committed 2014-03-22 15:07:06 -0400
- code review comments · bf3cf7b6
  bf3cf7b6 Browse Files
  
  Gary Katsevman committed 2014-03-22 14:58:23 -0400
21 Mar, 2014 3 commits
- Add sinon to jshintrc. Fix jshint errors. · b2f8fdc9 ...
  b2f8fdc9 Browse Files
```
Also, remove resetting setTimeout as it's already being done in
setup/teardown.
```
  Gary Katsevman committed 2014-03-22 00:49:04 -0400
- Use sinon fakeXmlHttpRequest. · 2a6b1234 ...
  2a6b1234 Browse Files
```
Change out the custom synchronous XHR to use sinon's fake XHR.
This allows to decide exactly when to respond to XHRs.
```
  Gary Katsevman committed 2014-03-22 00:40:01 -0400
- make sure that options is an object · 9cd0cc95
  9cd0cc95 Browse Files
  
  Gary Katsevman committed 2014-03-21 23:43:29 -0400
18 Mar, 2014 2 commits
- Merge branch 'master' into feature/live-um · ae60f03a
  ae60f03a Browse Files
  
  David LaPalomento committed 2014-03-18 19:21:32 -0400
- Revert "fix 'selects a playlist after segment downloads'" · 34cde14a ...
  34cde14a Browse Files
```
This reverts commit 3bccfa73.
```
  Gary Katsevman committed 2014-03-18 14:14:54 -0400
17 Mar, 2014 2 commits
- fix 'moves to next segment if network error' · 8d78a902
  8d78a902 Browse Files
  
  Gary Katsevman committed 2014-03-17 15:24:05 -0400
- fix 'selects a playlist after segment downloads' · 3bccfa73
  3bccfa73 Browse Files
  
  Gary Katsevman committed 2014-03-17 15:22:34 -0400
14 Mar, 2014 9 commits
- move startTime before xhr call · 088ba0d0
  088ba0d0 Browse Files
  
  Gary Katsevman committed 2014-03-14 17:33:53 -0400
- Options object may not contain a url. · cbb726a0
  cbb726a0 Browse Files
  
  Gary Katsevman committed 2014-03-14 17:16:08 -0400
- convert segmentXHR to use xhr helper · c0d2ed06
  c0d2ed06 Browse Files
  
  Gary Katsevman committed 2014-03-14 16:15:55 -0400
- add responseType option to xhr helper · 64547ed3
  64547ed3 Browse Files
  
  Gary Katsevman committed 2014-03-14 16:13:30 -0400
- Make plugin options accessible by xhr helper · d18e7c0b
  d18e7c0b Browse Files
  
  Gary Katsevman committed 2014-03-14 16:05:10 -0400
- adding more browsers · a08c8ddf
  a08c8ddf Browse Files
  
  Parul Sharma committed 2014-03-14 11:22:57 -0400
- change grunt task to karma:saucelabs and remove qunit · ac6c5fe5
  ac6c5fe5 Browse Files
  
  Parul Sharma committed 2014-03-14 10:33:38 -0400
- added command line functionality- can now specify which local browser to run tests · 98f98dfd
  98f98dfd Browse Files
  
  Parul Sharma committed 2014-03-14 10:10:30 -0400
- grunt karma:dev now runs local browsers grunt karma:saucelabs runs saucelabs browsers · 9de9ca8d
  9de9ca8d Browse Files
  
  Parul Sharma committed 2014-03-14 10:10:30 -0400