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

2f84e0ca

Commit 2f84e0ca authored 12 years ago by Arjun Singh

Downloads
- Plain Diff

Merge master

parents 99e7d007 926763a3

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/xmodule_modifiers.py 1 addition, 1 deletion

common/djangoapps/xmodule_modifiers.py
common/lib/capa/capa/responsetypes.py 5 additions, 5 deletions

common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/textbox.html 2 additions, 1 deletion

common/lib/capa/capa/templates/textbox.html
common/lib/capa/capa/xqueue_interface.py 21 additions, 13 deletions

common/lib/capa/capa/xqueue_interface.py
common/lib/xmodule/xmodule/js/src/capa/display.coffee 4 additions, 3 deletions

common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/x_module.py 5 additions, 4 deletions

common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/module_render.py 9 additions, 2 deletions

lms/djangoapps/courseware/module_render.py

with 47 additions and 29 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