Merge pull request #4586 from jazkarta/edx-jsme-1.0

Release edx-jsme 1.0

Merge pull request #4586 from jazkarta/edx-jsme-1.0
Release edx-jsme 1.0
6dd9d9ec · Sarina Canelake · c285bda6 · 88af0090 · 6dd9d9ec · 6dd9d9ec
Commit 6dd9d9ec authored Aug 14, 2014 by Sarina Canelake
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

cms/envs/common.py
+4 -1

lms/envs/common.py
+4 -1

requirements/edx/github.txt
+1 -0

No files found.
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -569,7 +569,10 @@ INSTALLED_APPS = (
    'monitoring',

    # Course action state
-    'course_action_state'
+    'course_action_state',
+
+    # Additional problem types
+    'edx_jsme',    # Molecular Structure
 )



--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1340,7 +1340,10 @@ INSTALLED_APPS = (
    'monitoring',

    # Course action state
-    'course_action_state'
+    'course_action_state',
+
+    # Additional problem types
+    'edx_jsme',    # Molecular Structure
 )

 ######################### MARKETING SITE ###############################

--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -15,6 +15,7 @@
 -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
 -e git+https://github.com/un33k/django-ipware.git@42cb1bb1dc680a60c6452e8bb2b843c2a0382c90#egg=django-ipware
 -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
+-e git+https://github.com/jazkarta/edx-jsme.git@813079fd5218ed275248d2a1fcae2fcbf20a0838#egg=edx-jsme

 # Our libraries:
 -e git+https://github.com/edx/XBlock.git@f0e53538be7ce90584a03cc7dd3f06bd43e12ac2#egg=XBlock