Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

1e2d5ffe

Commit 1e2d5ffe authored 10 years ago by Calen Pennington

Downloads
- Plain Diff

Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29

Merge hotfix-2014-08-29 to master

parents 27c83d51 fb565880

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/tests/utils.py 12 additions, 6 deletions

cms/djangoapps/contentstore/tests/utils.py
cms/djangoapps/contentstore/views/component.py 1 addition, 0 deletions

cms/djangoapps/contentstore/views/component.py
cms/djangoapps/contentstore/views/item.py 5 additions, 2 deletions

cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/tests/test_item.py 22 additions, 4 deletions

cms/djangoapps/contentstore/views/tests/test_item.py
common/lib/xmodule/xmodule/modulestore/__init__.py 31 additions, 0 deletions

common/lib/xmodule/xmodule/modulestore/__init__.py
common/lib/xmodule/xmodule/modulestore/mongo/draft.py 1 addition, 0 deletions

common/lib/xmodule/xmodule/modulestore/mongo/draft.py
common/lib/xmodule/xmodule/modulestore/tests/django_utils.py 3 additions, 0 deletions

common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py 9 additions, 9 deletions

...odule/xmodule/modulestore/tests/test_mixed_modulestore.py
lms/djangoapps/courseware/tests/test_module_render.py 7 additions, 5 deletions

lms/djangoapps/courseware/tests/test_module_render.py

with 91 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment