Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Peter fogg/remove video xml #132

Merged
merged 38 commits into from
Jun 20, 2013
Merged

Peter fogg/remove video xml #132

merged 38 commits into from
Jun 20, 2013

Commits on Jun 6, 2013

  1. Started removing XML from video editor. 

    TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
    Peter Fogg committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    4415fb4 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2013

  1. Fixed .75 and 1.5 speeds playing at 1.0 speed.

    Peter Fogg committed Jun 10, 2013
    Configuration menu
    Copy the full SHA
    ee64d8c View commit details
    Browse the repository at this point in the history

  2. Changed description of source and track fields.

    Peter Fogg committed Jun 10, 2013
    Configuration menu
    Copy the full SHA
    115ae42 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2013

  1. Fix failing acceptance tests and allow videos to be imported from XML.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    f9b825f View commit details
    Browse the repository at this point in the history

  2. Enable exporting video to XML for backwards compatibility.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    5b9e88e View commit details
    Browse the repository at this point in the history

  3. Merge peter-fogg/fix-video-captions-setting.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    dbb1275 View commit details
    Browse the repository at this point in the history

  4. Update acceptance tests for captions to use metadata settings editor.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    3159c94 View commit details
    Browse the repository at this point in the history

  5. Convert Floats to StringyFloats.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    716da9c View commit details
    Browse the repository at this point in the history

  6. Remove data attribute from templates/video/default.yaml.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    872bf71 View commit details
    Browse the repository at this point in the history

  7. Prevent showing video speeds that aren't set by course author.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    94ac7fb View commit details
    Browse the repository at this point in the history

  8. Convert show_captions to StringyBoolean.

    Peter Fogg committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    1ff72e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2013

  1. Update and fix acceptance to show captions when correct.

    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    008c769 View commit details
    Browse the repository at this point in the history

  2. Fix failing test bug.

    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    63e376d View commit details
    Browse the repository at this point in the history

  3. Set Youtube ID defaults to the empty string.

    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    52bf82a View commit details
    Browse the repository at this point in the history

  4. Update display names and help text for video metadata.

    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    681e96b View commit details
    Browse the repository at this point in the history

  5. Fix times not being parse from HH:MM:SS format into floats and update… 

    … video module logic tests.
    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    4e2c4f0 View commit details
    Browse the repository at this point in the history

  6. Update failing Jasmine tests for video.

    Peter Fogg committed Jun 12, 2013
    Configuration menu
    Copy the full SHA
    8da102c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2013

  1. Remove outdated unit test for VideoModule constructor.

    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    66ab659 View commit details
    Browse the repository at this point in the history

  2. Update XML in old video tests. This change tags like <video youtube="… 

    …1.0:abcdefg"> to <video youtube_id_1_0="abcdefg".
    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    ef56c49 View commit details
    Browse the repository at this point in the history

  3. Update XML in old video tests. This change tags like <video youtube="… 

    …1.0:abcdefg"> to <video youtube_id_1_0="abcdefg".
    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    5cee351 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'peter-fogg/remove-video-xml' of github.com:edx/edx-plat… 

    …form into peter-fogg/remove-video-xml
    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    a831990 View commit details
    Browse the repository at this point in the history

  5. Add unit tests for creating VideoDescriptor from old XML. Brings test… 

    … coverage for video_module.py to 91%.
    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    fa84abc View commit details
    Browse the repository at this point in the history

  6. Update failing metadata settings acceptance test.

    Peter Fogg committed Jun 13, 2013
    Configuration menu
    Copy the full SHA
    bea83c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2013

  1. Fix merge conflict in common/test/data/full/sequential/Administrivia_… 

    …and_Circuit_Elements.xml.
    Peter Fogg committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    206f582 View commit details
    Browse the repository at this point in the history

  2. Addresses latest comments on pull request #132. In particular: 

    - Make 1.0x speed default Youtube ID Lyla's introduction video.
- Add acceptance tests for toggling captions on/off.
- Move captions settings acceptance tests into video-editor.feature.
- Rename acceptance test methods to reflect their function.
- Remove undefined variable from video Jasmine tests.
- Test VideoDescriptor.from_xml when no attributes are set.
- Convert Stringy* to non-Stringy equivalents.
- Test parsing of Youtube ID strings and times in more cases.
- Remove some commented-out code.
    Peter Fogg committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    6035d0a View commit details
    Browse the repository at this point in the history

  3. Update acceptance test.

    Peter Fogg committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    e004549 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into peter-fogg/remove-video-xml

    Peter Fogg committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    d8f307a View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2013

  1. Many changes to finish up PR. To wit: 

    -- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
    Peter Fogg committed Jun 17, 2013
    Configuration menu
    Copy the full SHA
    8159e86 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.rst; move acceptance test methods into more appropri… 

    …ate files; docstring cleaning.
    Peter Fogg committed Jun 17, 2013
    Configuration menu
    Copy the full SHA
    56015e4 View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict.

    Peter Fogg committed Jun 17, 2013
    Configuration menu
    Copy the full SHA
    5cb456b View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2013

  1. Fix merge conflict in CHANGELOG.rst.

    Peter Fogg committed Jun 18, 2013
    Configuration menu
    Copy the full SHA
    8ae22cf View commit details
    Browse the repository at this point in the history

  2. Fix merge conflict in CHANGELOG.rst.

    Peter Fogg committed Jun 18, 2013
    Configuration menu
    Copy the full SHA
    a403252 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into peter-fogg/remove-video-xml

    Peter Fogg committed Jun 18, 2013
    Configuration menu
    Copy the full SHA
    7633968 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2013

  1. Fix merge conflict in CHANGELOG.rst.

    Peter Fogg committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    9c7be8b View commit details
    Browse the repository at this point in the history

  2. Fix VideoAlpha acceptance test step definitions to not clash with Vid… 

    …eo module.
    Peter Fogg committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    c77eb4f View commit details
    Browse the repository at this point in the history

  3. Make sure we can handle empty youtube attributes.

    Peter Fogg committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    ea56a0c View commit details
    Browse the repository at this point in the history

  4. Merge in master (again).

    Peter Fogg committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    1d8d507 View commit details
    Browse the repository at this point in the history

  5. Actually fix merge conflicts.

    Peter Fogg committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    83d84e2 View commit details
    Browse the repository at this point in the history