Skip to content

E
edx-platform
Commit 80ffc767 by kimth
Options

Merge branch 'master' into kimth/lms-coderesponse

parents 38f1ef83 b6511287
Showing with 2 additions and 1 deletions
common/static/js/vendor/jquery-ui-1.8.16.custom.min.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/js/vendor/jquery-ui.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/envs/common.py
...@@ -304,7 +304,7 @@ PIPELINE_CSS = { ...@@ -304,7 +304,7 @@ PIPELINE_CSS = {
'output_filename': 'css/lms-application.css', 'output_filename': 'css/lms-application.css',
}, },
'course': { 'course': {
'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.16.custom.css', 'css/vendor/jquery.qtip.min.css'], 'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css'],
'output_filename': 'css/lms-course.css', 'output_filename': 'css/lms-course.css',
}, },
'ie-fixes': { 'ie-fixes': {
......
lms/envs/test.py
...@@ -54,6 +54,7 @@ GITHUB_REPO_ROOT = ENV_ROOT / "data" ...@@ -54,6 +54,7 @@ GITHUB_REPO_ROOT = ENV_ROOT / "data"
STATICFILES_DIRS = [ STATICFILES_DIRS = [
COMMON_ROOT / "static", COMMON_ROOT / "static",
PROJECT_ROOT / "static", PROJECT_ROOT / "static",
ASKBOT_ROOT / "askbot" / "skins",
] ]
STATICFILES_DIRS += [ STATICFILES_DIRS += [
(course_dir, COMMON_TEST_DATA_ROOT / course_dir) (course_dir, COMMON_TEST_DATA_ROOT / course_dir)
......
lms/static/js/jquery-ui.min.js deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment