summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2011-01-02 20:06:07 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2011-01-02 20:06:07 -0300
commit043a2577d7249a19779eb573ec0653c551649937 (patch)
treed4691fa87fcd396c9a3cf435c90545cb20ab7d5d
parent1f9ed0beb285815b257983134d13ea5cb535e63c (diff)
parent458e70c504501820ef74f27c71063843cf0c6f2b (diff)
Merge branch 'master' of ssh://vparabola/srv/git/projects/parabolaweb
-rw-r--r--.gitignore3
-rw-r--r--repos/i686/core.db.tar.gzbin51161 -> 51436 bytes
-rw-r--r--repos/x86_64/core.db.tar.gzbin51509 -> 51795 bytes
-rw-r--r--urls.py8
4 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index fea51cc3..0770125c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
*.pyc
*.swp
*.swo
+*~
+#*#
local_settings.py
archweb.db
archweb.db-*
testing/
+repos/*
diff --git a/repos/i686/core.db.tar.gz b/repos/i686/core.db.tar.gz
index eebd29d7..fcb2e8ac 100644
--- a/repos/i686/core.db.tar.gz
+++ b/repos/i686/core.db.tar.gz
Binary files differ
diff --git a/repos/x86_64/core.db.tar.gz b/repos/x86_64/core.db.tar.gz
index cd1710d3..3e105d12 100644
--- a/repos/x86_64/core.db.tar.gz
+++ b/repos/x86_64/core.db.tar.gz
Binary files differ
diff --git a/urls.py b/urls.py
index 9c979d4b..9067c9a0 100644
--- a/urls.py
+++ b/urls.py
@@ -76,10 +76,10 @@ urlpatterns += patterns('public.views',
(r'^about/$', direct_to_template, {'template': 'public/about.html'}, 'page-about'),
(r'^art/$', direct_to_template, {'template': 'public/art.html'}, 'page-art'),
(r'^svn/$', direct_to_template, {'template': 'public/svn.html'}, 'page-svn'),
- (r'^hackers/$', 'public.views.userlist', { 'type':'Hackers' }, 'page-devs'),
- (r'^fellows/$', 'public.views.userlist', { 'type':'Fellows' }, 'page-fellows'),
- (r'^donate/$', 'public.views.donate', {}, 'page-donate'),
- (r'^download/$', 'public.views.download', {}, 'page-download'),
+ (r'^hackers/$', 'userlist', { 'type':'Hackers' }, 'page-devs'),
+ (r'^fellows/$', 'userlist', { 'type':'Fellows' }, 'page-fellows'),
+ (r'^donate/$', 'donate', {}, 'page-donate'),
+ (r'^download/$', 'download', {}, 'page-download'),
)
# Includes and other remaining stuff