diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
| commit | a30350ac6e76c66d14f6d78ed2b5ae4e5799c79c (patch) | |
| tree | a2b7127366a1b9d8d5be9fcda5abefacef7d2579 /packages/urls.py | |
| parent | d8f82d9d72eec6042536797f75e06a9296f4cc71 (diff) | |
| parent | 2470c543d60c96343a5b0fefe04464b5b445b859 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
devel/views.py
feeds.py
templates/devel/index.html
templates/packages/flag.html
templates/public/index.html
todolists/views.py
urls.py
Diffstat (limited to 'packages/urls.py')
| -rw-r--r-- | packages/urls.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/urls.py b/packages/urls.py index 638a370a..e0362fa2 100644 --- a/packages/urls.py +++ b/packages/urls.py @@ -5,6 +5,7 @@ package_patterns = patterns('packages.views', (r'^files/$', 'files'), (r'^maintainer/$', 'getmaintainer'), (r'^flag/$', 'flag'), + (r'^flag/done/$', 'flag_confirmed', {}, 'package-flag-confirmed'), (r'^unflag/$', 'unflag'), (r'^unflag/all/$', 'unflag_all'), (r'^download/$', 'download'), @@ -17,10 +18,6 @@ urlpatterns = patterns('packages.views', 'signoff_package'), (r'^update/$', 'update'), - # Preference is for the non-search url below, but search is kept - # because other projects link to it - (r'^search/$', 'search'), - (r'^search/(?P<page>\d+)/$', 'search'), (r'^$', 'search'), (r'^(?P<page>\d+)/$', 'search'), |