Merge remote-tracking branch 'origin/release/1.0'
Showing
- cms/djangoapps/contentstore/tests/tests.py 7 additions, 2 deletionscms/djangoapps/contentstore/tests/tests.py
- cms/djangoapps/contentstore/views.py 13 additions, 7 deletionscms/djangoapps/contentstore/views.py
- cms/templates/emails/activation_email.txt 4 additions, 5 deletionscms/templates/emails/activation_email.txt
- cms/templates/emails/activation_email_subject.txt 1 addition, 1 deletioncms/templates/emails/activation_email_subject.txt
- cms/templates/registration/activation_complete.html 30 additions, 0 deletionscms/templates/registration/activation_complete.html
- common/djangoapps/student/views.py 5 additions, 5 deletionscommon/djangoapps/student/views.py
- lms/djangoapps/courseware/courses.py 1 addition, 1 deletionlms/djangoapps/courseware/courses.py
- lms/static/sass/base/_base.scss 2 additions, 1 deletionlms/static/sass/base/_base.scss
- lms/static/sass/multicourse/_about_pages.scss 8 additions, 9 deletionslms/static/sass/multicourse/_about_pages.scss
- lms/static/sass/multicourse/_home.scss 5 additions, 4 deletionslms/static/sass/multicourse/_home.scss
- lms/static/sass/multicourse/_jobs.scss 4 additions, 4 deletionslms/static/sass/multicourse/_jobs.scss
- lms/static/sass/shared/_modal.scss 4 additions, 26 deletionslms/static/sass/shared/_modal.scss
- lms/templates/contact.html 2 additions, 2 deletionslms/templates/contact.html
- lms/templates/index.html 0 additions, 1 deletionlms/templates/index.html
- lms/templates/signup_modal.html 1 addition, 1 deletionlms/templates/signup_modal.html
- lms/templates/static_templates/contact.html 2 additions, 2 deletionslms/templates/static_templates/contact.html
- lms/templates/static_templates/faq.html 106 additions, 116 deletionslms/templates/static_templates/faq.html
- lms/templates/static_templates/honor.html 14 additions, 42 deletionslms/templates/static_templates/honor.html
- lms/templates/static_templates/privacy.html 31 additions, 169 deletionslms/templates/static_templates/privacy.html
- lms/templates/static_templates/tos.html 44 additions, 263 deletionslms/templates/static_templates/tos.html
Please register or sign in to comment