[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

Chris Lamb lamby at debian.org
Fri Jul 30 02:52:34 UTC 2010


The following commit has been merged in the master branch:
commit 3a0c4b512c7e0186463b31e97e04d0f3eb6b0370
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 10:39:24 2010 -0400

    Add empty 'queue' app.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/config/settings/defaults/apps.py b/config/settings/defaults/apps.py
index 65d08a4..ed9639d 100644
--- a/config/settings/defaults/apps.py
+++ b/config/settings/defaults/apps.py
@@ -8,6 +8,7 @@ INSTALLED_APPS = [
     'live_studio_www.auth',
     'live_studio_www.utils',
     'live_studio_www.debug',
+    'live_studio_www.queue',
     'live_studio_www.config',
     'live_studio_www.static',
     'live_studio_www.templatetags',
diff --git a/config/settings/roles/__init__.py b/live_studio_www/queue/__init__.py
similarity index 100%
copy from config/settings/roles/__init__.py
copy to live_studio_www/queue/__init__.py
diff --git a/live_studio_www/auth/models.py b/live_studio_www/queue/models.py
similarity index 100%
copy from live_studio_www/auth/models.py
copy to live_studio_www/queue/models.py
diff --git a/live_studio_www/queue/urls.py b/live_studio_www/queue/urls.py
new file mode 100644
index 0000000..5438683
--- /dev/null
+++ b/live_studio_www/queue/urls.py
@@ -0,0 +1,4 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('live_studio_www.queue.views',
+)
diff --git a/live_studio_www/urls.py b/live_studio_www/urls.py
index f056e95..e424414 100644
--- a/live_studio_www/urls.py
+++ b/live_studio_www/urls.py
@@ -6,6 +6,7 @@ admin.autodiscover()
 urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     (r'', include('live_studio_www.debug.urls', namespace='debug')),
+    (r'', include('live_studio_www.queue.urls', namespace='static')),
     (r'', include('live_studio_www.config.urls', namespace='config')),
     (r'', include('live_studio_www.static.urls', namespace='static')),
 )

-- 
live-studio



More information about the debian-live-changes mailing list