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

Rc/2013 09 04 #857

Merged
merged 23 commits into from
Sep 5, 2013
Merged

Rc/2013 09 04 #857

merged 23 commits into from
Sep 5, 2013

Commits on Aug 28, 2013

  1. Keep comments in capa XML from causing failures 

    Comments (and processing instructions!) are handled oddly in lxml.
This change will keep them from causing failures.  They will be omitted
from the HTML generated, which is fine, since they aren't needed there.
    @nedbat @adampalay
    nedbat authored and adampalay committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    6738a37 View commit details
    Browse the repository at this point in the history

  2. A test that our XML-comments fix works.

    @nedbat @adampalay
    nedbat authored and adampalay committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    e88e04d View commit details
    Browse the repository at this point in the history

  3. Check extension rather than mimetype

    Julian Arni committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    6cb2e0b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #819 from edx/jkarni/hotfix/gzip-mimetype 

    Check extension rather than mimetype
    jkarni committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    fbb6dc0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #816 from edx/hotfix/xml-parsing 

    Hotfix/xml parsing
    @adampalay
    adampalay committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    14708aa View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2013

  1. Skip acceptance test DB migrations if the DB already exists and runni… 

    …ng fasttest_acceptance
    Will Daly committed Sep 2, 2013
    Configuration menu
    Copy the full SHA
    1f2f0bf View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2013

  1. add pyparsing explicitly to sandbox requirements

    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    1ab59a2 View commit details
    Browse the repository at this point in the history

  2. add pyparsing to edx requirements

    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    a7159d8 View commit details
    Browse the repository at this point in the history

  3. Fix for acceptance test static file issue

    Will Daly committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    e94515d View commit details
    Browse the repository at this point in the history

  4. Fix multiple video bug

    @polesye @auraz
    polesye authored and auraz committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    a09e610 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #849 from edx/will/acceptance-test-static-files 

    Fix for acceptance test static file issue
    Will Daly committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    a081746 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #848 from edx/fix/adam/add-edge-reqs 

    Fix/adam/add edge reqs
    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    c7a537e View commit details
    Browse the repository at this point in the history

  7. fix pep8 and pylint errors 

    Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    300f7f1 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #837 from edx/will/faster-acceptance-test-startup 

    Skip migrations if running acceptance in fasttest mode
    Will Daly committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    e284ac6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #851 from edx/hotfix/release-multiple-video-bug 

    Hotfix/release multiple video bug
    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    6787fbb View commit details
    Browse the repository at this point in the history

  10. resolve merge conflict with hotfix branch

    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    67890b3 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #856 from edx/adam/merge-conflicts 

    Adam/merge conflicts
    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    3cc793b View commit details
    Browse the repository at this point in the history

  12. Merge pull request #853 from edx/fix/adam/pylint-pep8 

    fix pep8 and pylint errors
    @adampalay
    adampalay committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    ef042c3 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #855 from edx/sarina/bulkemail-violations 

    Cleanup bulk email app
    @sarina
    sarina committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    51fcb52 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2013

  1. Pass in harvest args to fasttest_acceptance, not the args array

    @wedaly @adampalay
    wedaly authored and adampalay committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    b2b23fa View commit details
    Browse the repository at this point in the history

  2. add nltk to sandbox reqs

    @adampalay
    adampalay committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    fb84541 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2013

  1. Fix selector.

    @polesye @adampalay
    polesye authored and adampalay committed Sep 5, 2013
    Configuration menu
    Copy the full SHA
    961bd4c View commit details
    Browse the repository at this point in the history

  2. Fix test.

    @polesye @adampalay
    polesye authored and adampalay committed Sep 5, 2013
    Configuration menu
    Copy the full SHA
    5d55714 View commit details
    Browse the repository at this point in the history