Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py

1 files changed, 11 insertions, 1 deletions

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index a3bcaffb5..daaac77e3 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -81,9 +81,15 @@ urlpatterns = patterns(
         check_rights(['change_organization', 'change_own_organization'])(
             views.OrganizationPersonEdit.as_view()),
         name='organization_person_edit'),
+    url(r'get-ishtaruser/(?P<type>.+)?$',
+        views.get_ishtaruser,
+        name='get-ishtaruser'),
     url(r'account_management/(?P<step>.+)?$',
         check_rights(['add_ishtaruser'])(
             views.account_management_wizard), name='account_management'),
+    url(r'account_deletion/(?P<step>.+)?$',
+        check_rights(['add_ishtaruser'])(
+            views.account_deletion_wizard), name='account_deletion'),
     url(r'^import-new/$',
         check_rights(['change_import'])(
             views.NewImportView.as_view()), name='new_import'),
@@ -133,6 +139,8 @@ urlpatterns += patterns(
         name='autocomplete-person-permissive'),
     url(r'get-person/(?P<type>.+)?$', 'get_person',
         name='get-person'),
+    url(r'get-person-full/(?P<type>.+)?$', 'get_person',
+        name='get-person-full', kwargs={'full': True}),
     url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
         'show_person', name='show-person'),
     url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
@@ -152,6 +160,8 @@ urlpatterns += patterns(
         'new_organization', name='new-organization'),
     url(r'get-organization/(?P<type>.+)?$', 'get_organization',
         name='get-organization'),
+    url(r'get-organization-full/(?P<type>.+)?$', 'get_organization',
+        name='get-organization-full', kwargs={'full': True}),
     url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
         'show_organization', name='show-organization'),
     url(r'autocomplete-organization/([0-9_]+)?$',