Revision 59a287b0
b/snf-astakos-app/astakos/im/urls.py | ||
---|---|---|
84 | 84 |
url(r'^email_change/confirm/(?P<activation_key>\w+)/?$', 'change_email', {}, |
85 | 85 |
name='email_change_confirm')) |
86 | 86 |
|
87 |
urlpatterns += patterns( |
|
88 |
'astakos.im.target', |
|
89 |
url(r'^login/redirect/?$', 'redirect.login')) |
|
90 |
|
|
91 | 87 |
if 'local' in IM_MODULES: |
92 | 88 |
urlpatterns += patterns( |
93 | 89 |
'astakos.im.target', |
b/snf-astakos-app/astakos/urls.py | ||
---|---|---|
35 | 35 |
|
36 | 36 |
urlpatterns = patterns('', |
37 | 37 |
(r'^im/', include('astakos.im.urls')), |
38 |
(r'^login/?$', 'astakos.im.login.redirect.login'), |
|
38 | 39 |
(r'^feedback/?$', 'astakos.im.api.user.send_feedback'), |
39 | 40 |
(r'^user_catalogs/?$', 'astakos.im.api.user.get_uuid_displayname_catalogs')) |
b/snf-pithos-app/pithos/api/urls.py | ||
---|---|---|
50 | 50 |
(r'^v1(?:$|/)', include(api_urlpatterns)), |
51 | 51 |
(r'^v1\.0(?:$|/)', include(api_urlpatterns)), |
52 | 52 |
(r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'), |
53 |
(r'^login/?$', 'pithos.api.delegate.delegate_to_login_service')) |
|
54 | 53 |
|
55 | 54 |
if settings.PROXY_USER_SERVICES: |
56 | 55 |
urlpatterns += patterns( |
57 | 56 |
'', |
57 |
(r'^login/?$', 'pithos.api.delegate.delegate_to_login_service'), |
|
58 | 58 |
(r'^feedback/?$', 'pithos.api.delegate.delegate_to_feedback_service'), |
59 | 59 |
(r'^user_catalog/?$', 'pithos.api.delegate.delegate_to_user_catalogs_service')) |
Also available in: Unified diff