From 8fb83ee33ced1dfbef52aa5ff2b6f16465cde05e Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 15 Aug 2012 22:55:26 -0400 Subject: [PATCH] Added django-wiki as a submodule. --- .gitmodules | 3 +++ lms/djangoapps/django-wiki | 1 + lms/envs/common.py | 1 + requirements.txt | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 lms/djangoapps/django-wiki diff --git a/.gitmodules b/.gitmodules index 72ec77d0e2..76d1f7d672 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "askbot"] path = askbot url = git@github.com:MITx/askbot-devel.git +[submodule "lms/djangoapps/django-wiki"] + path = lms/djangoapps/django-wiki + url = git@github.com:benjaoming/django-wiki.git diff --git a/lms/djangoapps/django-wiki b/lms/djangoapps/django-wiki new file mode 160000 index 0000000000..cdb2c3a847 --- /dev/null +++ b/lms/djangoapps/django-wiki @@ -0,0 +1 @@ +Subproject commit cdb2c3a847f423e4599a74537c9506dff6f4c550 diff --git a/lms/envs/common.py b/lms/envs/common.py index 48fe931869..4d30870a66 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -84,6 +84,7 @@ sys.path.append(REPO_ROOT) sys.path.append(ASKBOT_ROOT) sys.path.append(ASKBOT_ROOT / "askbot" / "deps") sys.path.append(PROJECT_ROOT / 'djangoapps') +sys.path.append(PROJECT_ROOT / 'djangoapps' / 'django-wiki') sys.path.append(PROJECT_ROOT / 'lib') sys.path.append(COMMON_ROOT / 'djangoapps') sys.path.append(COMMON_ROOT / 'lib') diff --git a/requirements.txt b/requirements.txt index ad6a8ab4a1..983b4c5547 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,6 +43,5 @@ django-robots django-ses django-storages django-threaded-multihost --e git+git://github.com/benjaoming/django-wiki.git#egg=django-wiki django-sekizai<0.7 -r repo-requirements.txt