Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Showing
- cms/djangoapps/contentstore/views.py 0 additions, 3 deletionscms/djangoapps/contentstore/views.py
- cms/envs/common.py 10 additions, 0 deletionscms/envs/common.py
- common/djangoapps/student/views.py 3 additions, 30 deletionscommon/djangoapps/student/views.py
- common/lib/capa/capa/xqueue_interface.py 5 additions, 10 deletionscommon/lib/capa/capa/xqueue_interface.py
- common/lib/xmodule/xmodule/abtest_module.py 3 additions, 3 deletionscommon/lib/xmodule/xmodule/abtest_module.py
- common/lib/xmodule/xmodule/course_module.py 8 additions, 30 deletionscommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/error_module.py 0 additions, 8 deletionscommon/lib/xmodule/xmodule/error_module.py
- common/lib/xmodule/xmodule/js/src/capa/display.coffee 30 additions, 7 deletionscommon/lib/xmodule/xmodule/js/src/capa/display.coffee
- common/lib/xmodule/xmodule/tests/__init__.py 2 additions, 3 deletionscommon/lib/xmodule/xmodule/tests/__init__.py
- common/lib/xmodule/xmodule/timeparse.py 19 additions, 0 deletionscommon/lib/xmodule/xmodule/timeparse.py
- common/lib/xmodule/xmodule/x_module.py 36 additions, 10 deletionscommon/lib/xmodule/xmodule/x_module.py
- doc/development.md 1 addition, 0 deletionsdoc/development.md
- lms/askbot/skins/mitx/media/images/email-sharing.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/email-sharing.png
- lms/askbot/skins/mitx/media/images/facebook-sharing.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/facebook-sharing.png
- lms/askbot/skins/mitx/media/images/google-plus-sharing.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/google-plus-sharing.png
- lms/askbot/skins/mitx/media/images/lrg/email-sharing.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/lrg/email-sharing.png
- lms/askbot/skins/mitx/media/images/lrg/facebook-sharing.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/lrg/facebook-sharing.png
- lms/askbot/skins/mitx/media/images/lrg/facebook.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/lrg/facebook.png
- lms/askbot/skins/mitx/media/images/lrg/google-plus-sharing.png 0 additions, 0 deletions...skbot/skins/mitx/media/images/lrg/google-plus-sharing.png
- lms/askbot/skins/mitx/media/images/lrg/linkedin.png 0 additions, 0 deletionslms/askbot/skins/mitx/media/images/lrg/linkedin.png
Loading
Please register or sign in to comment