diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-11 19:00:29 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-11 19:00:29 +0200 |
| commit | 72de941ef9ec59b282e056c28339a414c2b8b162 (patch) | |
| tree | 3db3213d2e87cfcdeb7d1245fe239ec3188eb01e /ishtar_common/urls.py | |
| parent | 3120af6c41157b71561d6fd5a68fc6022f6dbadf (diff) | |
| parent | f9e0e0518c087febb5bf0eb89eac34f685559970 (diff) | |
| download | Ishtar-72de941ef9ec59b282e056c28339a414c2b8b162.tar.bz2 Ishtar-72de941ef9ec59b282e056c28339a414c2b8b162.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 27078dd9e..22a09a052 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -192,6 +192,14 @@ urlpatterns += patterns( views.OrgaManualMergeItems.as_view(), name='orga_manual_merge_items'), url(r'reset/$', 'reset_wizards', name='reset_wizards'), + url(r'activate-all-search/$', 'activate_all_search', + name='activate-all-search'), + url(r'activate-own-search/$', 'activate_own_search', + name='activate-own-search'), + url(r'activate-advanced-menu/$', 'activate_advanced_shortcut_menu', + name='activate-advanced-menu'), + url(r'activate-simple-menu/$', 'activate_simple_shortcut_menu', + name='activate-simple-menu'), url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'), ) |