Permalink
Commits on May 19, 2011
Commits on May 18, 2011
  1. updated data-timeline-sources in unit.html [#530]

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  2. Merge remote branch 'dseif/t524' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  3. Merge remote branch 'dseif/t442' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  4. Accidentally deletedf a line

    dseif committed May 18, 2011
  5. Merge remote branch 'rick/t331' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
    Conflicts:
    	plugins/index.html
  6. [#331] Style cleanups

    rwaldron committed May 18, 2011
  7. Merge remote branch 'edsfault/ticket399' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  8. Resolved Conflict

    rwaldron committed May 18, 2011
  9. Merge remote branch 'mo/t485' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  10. Merge remote branch 'humph/t355' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  11. Merge remote branch 'chris/t529' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  12. Merge remote branch 'chris/subtitle' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  13. #485 fixed titles

    mbuttu committed May 18, 2011
  14. Merge remote branch 'scott/t421' into 0.6

    Anna Sobiepanek
    Anna Sobiepanek committed May 18, 2011
  15. Remove stub function, use comment only.

    David Humphrey
    David Humphrey committed May 18, 2011
  16. #332 Fixed number of unit tests

    mbuttu committed May 18, 2011
  17. Merge branch '0.6' of git://github.com/annasob/popcorn-js into t485

    mbuttu committed May 18, 2011
    Conflicts:
    	plugins/image/popcorn.image.js
    	plugins/image/popcorn.image.unit.js
  18. Updated positioning of completes dependencies, putting update first, …

    dseif committed May 18, 2011
    …also made setup depend on update
  19. Updated positioning of completes dependencies, putting update first, …

    dseif committed May 18, 2011
    …also made setup depend on update
  20. Also stub out players/ and parsers/.

    David Humphrey
    David Humphrey committed May 18, 2011
  21. #332 Added unit tests

    mbuttu committed May 18, 2011
  22. tests should work now

    cadecairos committed May 18, 2011
  23. #332 Fixed styling and a typos. Added _teardown function. Made a uni…

    mbuttu committed May 18, 2011
    …t test for _teardown. Changed timing of videos in demo and added more information in the page comments
  24. Don't copy .git dir into testing-mirror.

    David Humphrey
    David Humphrey committed May 18, 2011