Update master with hotfixes from release-2013-10-17.
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- CHANGELOG.rst 5 additions, 0 deletionsCHANGELOG.rst
- cms/envs/common.py 1 addition, 0 deletionscms/envs/common.py
- common/djangoapps/student/middleware.py 37 additions, 0 deletionscommon/djangoapps/student/middleware.py
- common/djangoapps/student/migrations/0028_auto__add_userstanding.py 188 additions, 0 deletions...ngoapps/student/migrations/0028_auto__add_userstanding.py
- common/djangoapps/student/models.py 21 additions, 0 deletionscommon/djangoapps/student/models.py
- common/djangoapps/student/tests/factories.py 9 additions, 1 deletioncommon/djangoapps/student/tests/factories.py
- common/djangoapps/student/tests/test_bulk_email_settings.py 134 additions, 0 deletionscommon/djangoapps/student/tests/test_bulk_email_settings.py
- common/djangoapps/student/tests/test_userstanding.py 115 additions, 0 deletionscommon/djangoapps/student/tests/test_userstanding.py
- common/djangoapps/student/views.py 95 additions, 11 deletionscommon/djangoapps/student/views.py
- common/djangoapps/terrain/course_helpers.py 15 additions, 0 deletionscommon/djangoapps/terrain/course_helpers.py
- common/lib/xmodule/xmodule/css/video/display.scss 4 additions, 0 deletionscommon/lib/xmodule/xmodule/css/video/display.scss
- common/static/css/vendor/font-awesome.css 253 additions, 42 deletionscommon/static/css/vendor/font-awesome.css
- common/static/fonts/OpenSans/OpenSans-Bold-webfont.eot 0 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-Bold-webfont.eot
- common/static/fonts/OpenSans/OpenSans-Bold-webfont.svg 146 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-Bold-webfont.svg
- common/static/fonts/OpenSans/OpenSans-Bold-webfont.ttf 0 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-Bold-webfont.ttf
- common/static/fonts/OpenSans/OpenSans-Bold-webfont.woff 0 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-Bold-webfont.woff
- common/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.eot 0 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.eot
- common/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg 146 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg
- common/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf 0 additions, 0 deletionscommon/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf
Please register or sign in to comment