Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor

.reviewboardrc

+REVIEWBOARD_URL = "https://rbcommons.com/s/edx/"
+GUESS_FIELDS = True

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'
 

cms/envs/acceptance.py

@@ -28,7 +28,7 @@ MODULESTORE_OPTIONS = {
 
 MODULESTORE = {
     'default': {
-        'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
         'OPTIONS': MODULESTORE_OPTIONS
     },
     'direct': {

common/lib/calc/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="calc",
-    version="0.1",
+    version="0.1.1",
     py_modules=["calc"],
     install_requires=[
         "pyparsing==1.5.6",

common/lib/chem/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="chem",
-    version="0.1",
+    version="0.1.1",
     packages=["chem"],
     install_requires=[
         "pyparsing==1.5.6",

common/lib/sandbox-packages/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="sandbox-packages",
-    version="0.1",
+    version="0.1.1",
     packages=[
         "verifiers",
     ],

requirements/edx-sandbox/local.txt

+# Install these packages from the edx-platform working tree
+# NOTE: if you change code in these packages, you MUST change the version
+# number in its setup.py or the code WILL NOT be installed during deploy.
+common/lib/calc
+common/lib/chem
+common/lib/sandbox-packages

requirements/edx-sandbox/post.txt

 # Packages to install in the Python sandbox for secured execution.
 scipy==0.11.0
 lxml==3.0.1
--e common/lib/calc
--e common/lib/chem
--e common/lib/sandbox-packages