Merge branch 'master' into private_to_public_319d54e
Showing
- cms/envs/common.py 5 additions, 0 deletionscms/envs/common.py
- cms/static/js/spec/views/textbook_spec.js 23 additions, 0 deletionscms/static/js/spec/views/textbook_spec.js
- cms/static/js/views/edit_textbook.js 1 addition, 2 deletionscms/static/js/views/edit_textbook.js
- cms/static/js/views/list_textbooks.js 3 additions, 2 deletionscms/static/js/views/list_textbooks.js
- cms/static/js/views/show_textbook.js 3 additions, 2 deletionscms/static/js/views/show_textbook.js
- common/djangoapps/microsite_configuration/tests/backends/test_filebased.py 0 additions, 172 deletions.../microsite_configuration/tests/backends/test_filebased.py
- common/djangoapps/student/models.py 20 additions, 0 deletionscommon/djangoapps/student/models.py
- common/lib/xmodule/setup.py 2 additions, 2 deletionscommon/lib/xmodule/setup.py
- common/lib/xmodule/xmodule/modulestore/draft_and_published.py 14 additions, 10 deletions...on/lib/xmodule/xmodule/modulestore/draft_and_published.py
- common/lib/xmodule/xmodule/modulestore/edit_info.py 6 additions, 3 deletionscommon/lib/xmodule/xmodule/modulestore/edit_info.py
- common/lib/xmodule/xmodule/modulestore/mixed.py 20 additions, 17 deletionscommon/lib/xmodule/xmodule/modulestore/mixed.py
- common/lib/xmodule/xmodule/modulestore/modulestore_settings.py 6 additions, 2 deletions...n/lib/xmodule/xmodule/modulestore/modulestore_settings.py
- common/lib/xmodule/xmodule/modulestore/split_migrator.py 13 additions, 8 deletionscommon/lib/xmodule/xmodule/modulestore/split_migrator.py
- common/lib/xmodule/xmodule/tests/xml/__init__.py 6 additions, 4 deletionscommon/lib/xmodule/xmodule/tests/xml/__init__.py
- common/lib/xmodule/xmodule/tests/xml/factories.py 6 additions, 4 deletionscommon/lib/xmodule/xmodule/tests/xml/factories.py
- common/lib/xmodule/xmodule/tests/xml/test_inheritance.py 3 additions, 1 deletioncommon/lib/xmodule/xmodule/tests/xml/test_inheritance.py
- common/lib/xmodule/xmodule/tests/xml/test_policy.py 3 additions, 1 deletioncommon/lib/xmodule/xmodule/tests/xml/test_policy.py
- common/static/data/geoip/GeoLite2-Country.mmdb 0 additions, 0 deletionscommon/static/data/geoip/GeoLite2-Country.mmdb
- common/test/db_cache/bok_choy_data_default.json 1 addition, 1 deletioncommon/test/db_cache/bok_choy_data_default.json
- common/test/db_cache/bok_choy_migrations.sha1 1 addition, 1 deletioncommon/test/db_cache/bok_choy_migrations.sha1
Please register or sign in to comment