Merge pull request #2773 from edx/release

Release

cms/envs/common.py

@@ -533,3 +533,13 @@ YOUTUBE_API = {
 ##### ACCOUNT LOCKOUT DEFAULT PARAMETERS #####
 MAX_FAILED_LOGIN_ATTEMPTS_ALLOWED = 5
 MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS = 15 * 60
+
+
+### JSdraw (only installed in some instances)
+
+try:
+    import edx_jsdraw
+except ImportError:
+    pass
+else:
+    INSTALLED_APPS += ('edx_jsdraw',)

lms/envs/common.py

@@ -1504,3 +1504,13 @@ ALL_LANGUAGES = (
     [u"za", u"Zhuang; Chuang"],
     [u"zu", u"Zulu"]
 )
+
+
+### JSdraw (only installed in some instances)
+
+try:
+    import edx_jsdraw
+except ImportError:
+    pass
+else:
+    INSTALLED_APPS += ('edx_jsdraw',)

requirements/edx/edx-private.txt

--e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@92e8e4a073a06b0afa0aa9d1314900d095483ab5#egg=edx-jsdraw
+-e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@1e580c06061a10235fb0df6575e49a2cd9dcf126#egg=edx-jsdraw