Browse files

trying to move submodules

  • Loading branch information...
1 parent 0174a80 commit 7a8753c23db1bef7faa8e411db01f44296f30a8c @emperorcezar committed Dec 23, 2011
Showing with 8 additions and 10 deletions.
  1. +0 −6 .gitmodules
  2. +0 −1 bootstrap
  3. +0 −1 django_compressor
  4. +1 −0 requirements/base.txt
  5. +3 −0 settings/common.py
  6. +2 −0 settings/development.py
  7. +1 −1 static-files/bootstrap/js
  8. +1 −1 static-files/bootstrap/lib
View
6 .gitmodules
@@ -1,6 +0,0 @@
-[submodule "django_compressor"]
- path = django_compressor
- url = git://github.com/jezdez/django_compressor.git
-[submodule "bootstrap"]
- path = bootstrap
- url = git://github.com/twitter/bootstrap.git
1 bootstrap
@@ -1 +0,0 @@
-Subproject commit 0c7a80c79bb9a2e1761b4af804050962aac2fe57
1 django_compressor
@@ -1 +0,0 @@
-Subproject commit 4418180a80bb7e2d398738dc96e4fdf74de67b71
View
1 requirements/base.txt
@@ -4,4 +4,5 @@
# versions of distributions here if needed.
Django>=1.3
+django-debug-toolbar
View
3 settings/common.py
@@ -14,6 +14,7 @@
sys.path.append(SITE_ROOT)
sys.path.append(PROJECT_ROOT + '/apps')
+sys.path.append(PROJECT_ROOT + '/libs')
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
@@ -90,6 +91,7 @@
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.request",
+ "django.core.context_processors.static",
"django.contrib.messages.context_processors.messages",
]
@@ -102,6 +104,7 @@
"django.contrib.sites",
"django.contrib.messages",
"django.contrib.humanize",
+ "debug_toolbar",
# project
]
View
2 settings/development.py
@@ -10,6 +10,8 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG
+SERVE_MEDIA = True
+
DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3", # Add "postgresql_psycopg2", "postgresql", "mysql", "sqlite3" or "oracle".
View
2 static-files/bootstrap/js
View
2 static-files/bootstrap/lib

0 comments on commit 7a8753c

Please sign in to comment.