From 0fd59939e22c443277c7b63340a4b5270150305f Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 27 Feb 2014 10:42:46 -0500 Subject: [PATCH 1/2] Add JSdraw to INSTALLED_APPS if we can. --- cms/envs/common.py | 10 ++++++++++ lms/envs/common.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index b60cec9db7..f637049702 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -525,3 +525,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',) diff --git a/lms/envs/common.py b/lms/envs/common.py index ed2fd43147..a9b62e44a5 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1487,3 +1487,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',) From db90cd7985271eb019547cc6951e7f9b227e3670 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Fri, 28 Feb 2014 13:53:29 -0500 Subject: [PATCH 2/2] update js_draw req --- requirements/edx/edx-private.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index 5780b475a0..b47f56052a 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -1 +1 @@ --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