Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy.
No related branches found
No related tags found
Showing
- cms/djangoapps/contentstore/views/item.py 3 additions, 0 deletionscms/djangoapps/contentstore/views/item.py
- cms/djangoapps/contentstore/views/tests/test_item.py 3 additions, 3 deletionscms/djangoapps/contentstore/views/tests/test_item.py
- common/djangoapps/edxmako/shortcuts.py 10 additions, 0 deletionscommon/djangoapps/edxmako/shortcuts.py
- common/lib/xmodule/xmodule/imageannotation_module.py 6 additions, 3 deletionscommon/lib/xmodule/xmodule/imageannotation_module.py
- common/lib/xmodule/xmodule/modulestore/mongo/draft.py 1 addition, 0 deletionscommon/lib/xmodule/xmodule/modulestore/mongo/draft.py
- common/lib/xmodule/xmodule/textannotation_module.py 4 additions, 1 deletioncommon/lib/xmodule/xmodule/textannotation_module.py
- common/lib/xmodule/xmodule/videoannotation_module.py 4 additions, 1 deletioncommon/lib/xmodule/xmodule/videoannotation_module.py
- lms/djangoapps/certificates/tests/tests.py 2 additions, 1 deletionlms/djangoapps/certificates/tests/tests.py
- lms/djangoapps/instructor_analytics/tests/test_basic.py 3 additions, 2 deletionslms/djangoapps/instructor_analytics/tests/test_basic.py
- lms/djangoapps/notification_prefs/tests.py 0 additions, 5 deletionslms/djangoapps/notification_prefs/tests.py
- lms/djangoapps/oauth2_handler/__init__.py 1 addition, 0 deletionslms/djangoapps/oauth2_handler/__init__.py
- lms/djangoapps/oauth2_handler/handlers.py 174 additions, 0 deletionslms/djangoapps/oauth2_handler/handlers.py
- lms/djangoapps/oauth2_handler/tests.py 148 additions, 0 deletionslms/djangoapps/oauth2_handler/tests.py
- lms/envs/aws.py 4 additions, 1 deletionlms/envs/aws.py
- lms/envs/common.py 33 additions, 0 deletionslms/envs/common.py
- lms/envs/dev.py 3 additions, 0 deletionslms/envs/dev.py
- lms/envs/test.py 3 additions, 0 deletionslms/envs/test.py
- lms/templates/main_django.html 5 additions, 3 deletionslms/templates/main_django.html
- lms/urls.py 6 additions, 0 deletionslms/urls.py
- requirements/edx/github.txt 2 additions, 0 deletionsrequirements/edx/github.txt
Loading
Please register or sign in to comment