Merge branch 'master' into EDUCATOR-926
Showing
- cms/djangoapps/contentstore/views/item.py 1 addition, 0 deletionscms/djangoapps/contentstore/views/item.py
- cms/envs/test.py 1 addition, 0 deletionscms/envs/test.py
- cms/templates/js/timed-examination-preference-editor.underscore 12 additions, 1 deletion...mplates/js/timed-examination-preference-editor.underscore
- common/djangoapps/third_party_auth/saml.py 80 additions, 12 deletionscommon/djangoapps/third_party_auth/saml.py
- common/djangoapps/third_party_auth/tests/specs/base.py 3 additions, 1 deletioncommon/djangoapps/third_party_auth/tests/specs/base.py
- common/djangoapps/third_party_auth/tests/specs/test_testshib.py 105 additions, 8 deletions.../djangoapps/third_party_auth/tests/specs/test_testshib.py
- common/test/acceptance/pages/lms/learner_profile.py 0 additions, 16 deletionscommon/test/acceptance/pages/lms/learner_profile.py
- common/test/acceptance/tests/lms/test_learner_profile.py 0 additions, 4 deletionscommon/test/acceptance/tests/lms/test_learner_profile.py
- lms/static/js/views/fields.js 22 additions, 6 deletionslms/static/js/views/fields.js
- lms/static/sass/_build-lms-v1.scss 1 addition, 1 deletionlms/static/sass/_build-lms-v1.scss
- lms/static/sass/elements/_pagination.scss 1 addition, 1 deletionlms/static/sass/elements/_pagination.scss
- lms/static/sass/features/_learner-profile.scss 143 additions, 48 deletionslms/static/sass/features/_learner-profile.scss
- lms/static/sass/partials/base/_variables.scss 6 additions, 0 deletionslms/static/sass/partials/base/_variables.scss
- lms/static/sass/shared/_fields.scss 2 additions, 2 deletionslms/static/sass/shared/_fields.scss
- lms/static/sass/shared/_header.scss 1 addition, 1 deletionlms/static/sass/shared/_header.scss
- lms/templates/fields/field_dropdown.underscore 12 additions, 12 deletionslms/templates/fields/field_dropdown.underscore
- lms/templates/fields/field_dropdown_account.underscore 8 additions, 10 deletionslms/templates/fields/field_dropdown_account.underscore
- lms/templates/fields/field_readonly.underscore 2 additions, 1 deletionlms/templates/fields/field_readonly.underscore
- lms/templates/fields/field_textarea.underscore 17 additions, 2 deletionslms/templates/fields/field_textarea.underscore
- openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html 2 additions, 2 deletions...atic/course_experience/fixtures/course-home-fragment.html
Loading
Please register or sign in to comment