Merge pull request #5107 from edx/adam/resolve-merge-conflicts (58e6dcf7) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

58e6dcf7

Commit 58e6dcf7 authored 10 years ago by Adam

Downloads
- Plain Diff

Merge pull request #5107 from edx/adam/resolve-merge-conflicts

Adam/resolve merge conflicts

parents 3f8ea64d 0bd9bc62

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/views/course.py 1 addition, 1 deletion

cms/djangoapps/contentstore/views/course.py
common/lib/xmodule/xmodule/modulestore/__init__.py 8 additions, 0 deletions

common/lib/xmodule/xmodule/modulestore/__init__.py
common/lib/xmodule/xmodule/modulestore/search.py 2 additions, 1 deletion

common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py 1 addition, 1 deletion

...odule/xmodule/modulestore/tests/test_mixed_modulestore.py
common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee 26 additions, 0 deletions

...e/spec/discussion/view/discussion_thread_view_spec.coffee
common/static/coffee/src/discussion/views/discussion_thread_view.coffee 2 additions, 2 deletions

...coffee/src/discussion/views/discussion_thread_view.coffee
lms/djangoapps/courseware/model_data.py 2 additions, 1 deletion

lms/djangoapps/courseware/model_data.py
lms/djangoapps/courseware/tests/test_module_render.py 2 additions, 2 deletions

lms/djangoapps/courseware/tests/test_module_render.py
lms/templates/instructor/instructor_dashboard_2/e-commerce.html 0 additions, 2 deletions

...mplates/instructor/instructor_dashboard_2/e-commerce.html
lms/templates/shoppingcart/receipt.html 2 additions, 1 deletion

lms/templates/shoppingcart/receipt.html

with 46 additions and 11 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