diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-20 22:58:16 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-20 22:58:16 +0100 |
| commit | 463a5dcc433f6e4a442eeaee67bd22910cfb2d08 (patch) | |
| tree | c4618ecf6ea9ced5633cd95814c304e1a92d50ff /mediagoblin/routing.py | |
| parent | 4ae4012dad3f5638ea7b510d40f0b4d0b641fe2a (diff) | |
| parent | 85c916919b1e1fe31472feac74f8c216a5df608f (diff) | |
| download | mediagoblin-463a5dcc433f6e4a442eeaee67bd22910cfb2d08.tar.lz mediagoblin-463a5dcc433f6e4a442eeaee67bd22910cfb2d08.tar.xz mediagoblin-463a5dcc433f6e4a442eeaee67bd22910cfb2d08.zip | |
Merge remote branch 'remotes/joar/webfinger'
* remotes/joar/webfinger:
Added references to docstring in mediagoblin.webfinger
Removed mediagoblin.tools.feed which was accidentally included
Polishing the webfinger implementation
webfinger fully compliant with webfinger.org! Still *preliminary* solution.
Changed some thngs to be compatible with webfinger.org, still *very preliminary*
Added *very preliminary* support for webfinger
Diffstat (limited to 'mediagoblin/routing.py')
| -rw-r--r-- | mediagoblin/routing.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index ae56f8cb..bd727db5 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -21,6 +21,8 @@ from mediagoblin.submit.routing import submit_routes from mediagoblin.user_pages.routing import user_routes from mediagoblin.edit.routing import edit_routes from mediagoblin.listings.routing import tag_routes +from mediagoblin.webfinger.routing import webfinger_well_known_routes, \ + webfinger_routes def get_mapper(): @@ -36,5 +38,7 @@ def get_mapper(): mapping.extend(user_routes, '/u') mapping.extend(edit_routes, '/edit') mapping.extend(tag_routes, '/tag') + mapping.extend(webfinger_well_known_routes, '/.well-known') + mapping.extend(webfinger_routes, '/api/webfinger') return mapping |