diff --git a/.gitignore b/.gitignore
index 9c82bb8ea9..05e76c4caa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ Gemfile.lock
conf/locale/en/LC_MESSAGES/*.po
!messages.po
lms/static/sass/*.css
+lms/static/sass/application.scss
cms/static/sass/*.css
lms/lib/comment_client/python
nosetests.xml
diff --git a/.reviewboardrc b/.reviewboardrc
new file mode 100644
index 0000000000..b79235a4a4
--- /dev/null
+++ b/.reviewboardrc
@@ -0,0 +1,2 @@
+REVIEWBOARD_URL = "https://rbcommons.com/s/edx/"
+GUESS_FIELDS = True
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 3d348dc086..277a251065 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -42,7 +42,7 @@ COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video']
OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"]
NOTE_COMPONENT_TYPES = ['notes']
-ADVANCED_COMPONENT_TYPES = ['annotatable' + 'word_cloud'] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES
+ADVANCED_COMPONENT_TYPES = ['annotatable', 'word_cloud'] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES
ADVANCED_COMPONENT_CATEGORY = 'advanced'
ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules'
diff --git a/cms/djangoapps/contentstore/views/public.py b/cms/djangoapps/contentstore/views/public.py
index 0433aa9e9d..0ee228b996 100644
--- a/cms/djangoapps/contentstore/views/public.py
+++ b/cms/djangoapps/contentstore/views/public.py
@@ -8,7 +8,7 @@ from mitxmako.shortcuts import render_to_response
from external_auth.views import ssl_login_shortcut
from .user import index
-__all__ = ['signup', 'old_login_redirect', 'login_page', 'howitworks', 'ux_alerts']
+__all__ = ['signup', 'old_login_redirect', 'login_page', 'howitworks']
"""
Public views
@@ -49,10 +49,3 @@ def howitworks(request):
return index(request)
else:
return render_to_response('howitworks.html', {})
-
-
-def ux_alerts(request):
- """
- static/proof-of-concept views
- """
- return render_to_response('ux-alerts.html', {})
diff --git a/cms/djangoapps/contentstore/views/requests.py b/cms/djangoapps/contentstore/views/requests.py
index b02a13fe3f..c493441c77 100644
--- a/cms/djangoapps/contentstore/views/requests.py
+++ b/cms/djangoapps/contentstore/views/requests.py
@@ -21,7 +21,7 @@ def event(request):
A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at
console logs don't get distracted :-)
'''
- return HttpResponse(True)
+ return HttpResponse(status=204)
def get_request_method(request):
diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index 0fe3d950cd..36616ab257 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -2,6 +2,11 @@
This config file extends the test environment configuration
so that we can run the lettuce acceptance tests.
"""
+
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
from .test import *
# You need to start the server in debug mode,
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 3cd70826da..9fabb3b9e8 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -1,6 +1,11 @@
"""
This is the default template for our main set of AWS servers.
"""
+
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
import json
from .common import *
diff --git a/cms/envs/common.py b/cms/envs/common.py
index bb4b0591e8..3c323f5090 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -19,6 +19,10 @@ Longer TODO:
multiple sites, but we do need a way to map their data assets.
"""
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
import sys
import lms.envs.common
from path import path
@@ -217,7 +221,10 @@ PIPELINE_JS = {
'source_filenames': sorted(
rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') +
rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js')
- ) + ['js/hesitate.js', 'js/base.js', 'js/models/metadata_model.js'],
+ ) + ['js/hesitate.js', 'js/base.js',
+ 'js/models/feedback.js', 'js/views/feedback.js',
+ 'js/models/section.js', 'js/views/section.js',
+ 'js/models/metadata_model.js'],
'output_filename': 'js/cms-application.js',
'test_order': 0
},
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index f3080c356f..203e4bd909 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -1,6 +1,10 @@
"""
This config file runs the simplest dev environment"""
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
from .common import *
from logsettings import get_logger_config
diff --git a/cms/envs/dev_ike.py b/cms/envs/dev_ike.py
index 1ebf219d44..0c798b68aa 100644
--- a/cms/envs/dev_ike.py
+++ b/cms/envs/dev_ike.py
@@ -1,3 +1,7 @@
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
# dev environment for ichuang/mit
# FORCE_SCRIPT_NAME = '/cms'
diff --git a/cms/envs/dev_with_worker.py b/cms/envs/dev_with_worker.py
index c5fc256ac9..078567c493 100644
--- a/cms/envs/dev_with_worker.py
+++ b/cms/envs/dev_with_worker.py
@@ -8,6 +8,10 @@ The worker can be executed using:
django_admin.py celery worker
"""
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
from dev import *
################################# CELERY ######################################
diff --git a/cms/envs/jasmine.py b/cms/envs/jasmine.py
index 6c7cbcdcb0..f3a982aa43 100644
--- a/cms/envs/jasmine.py
+++ b/cms/envs/jasmine.py
@@ -2,6 +2,10 @@
This configuration is used for running jasmine tests
"""
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
from .test import *
from logsettings import get_logger_config
diff --git a/cms/envs/test.py b/cms/envs/test.py
index 4cb975e2fb..6d78b0d7d6 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -7,6 +7,11 @@ sessions. Assumes structure:
/mitx # The location of this repo
/log # Where we're going to write log files
"""
+
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
from .common import *
import os
from path import path
diff --git a/cms/static/client_templates/checklist.html b/cms/static/client_templates/checklist.html
index 6884b0e9c9..e985ab9509 100644
--- a/cms/static/client_templates/checklist.html
+++ b/cms/static/client_templates/checklist.html
@@ -11,11 +11,11 @@
<%= percentChecked %>% of checklist completed
- ▾
+
<%= checklistShortDescription %>
Tasks Completed: <%= itemsChecked %>/<%= items.length %>
- ✓
+