projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add __repr__ for Collection and CollectionItem
[mediagoblin.git]
/
mediagoblin
/
routing.py
diff --git
a/mediagoblin/routing.py
b/mediagoblin/routing.py
index daf8a45d216dfbd488ed52a4712b124ee6e93c9a..3ec1dba0d876fd5782f9e6391d1bd2a1ad3c146e 100644
(file)
--- a/
mediagoblin/routing.py
+++ b/
mediagoblin/routing.py
@@
-18,7
+18,7
@@
import logging
from mediagoblin.tools.routing import add_route, mount, url_map
from mediagoblin.tools.pluginapi import PluginManager
from mediagoblin.tools.routing import add_route, mount, url_map
from mediagoblin.tools.pluginapi import PluginManager
-from mediagoblin.
admin.routing import admi
n_routes
+from mediagoblin.
moderation.routing import moderatio
n_routes
from mediagoblin.auth.routing import auth_routes
from mediagoblin.auth.routing import auth_routes
@@
-27,20
+27,19
@@
_log = logging.getLogger(__name__)
def get_url_map():
add_route('index', '/', 'mediagoblin.views:root_view')
def get_url_map():
add_route('index', '/', 'mediagoblin.views:root_view')
+ add_route('terms_of_service','/terms_of_service',
+ 'mediagoblin.views:terms_of_service'),
mount('/auth', auth_routes)
mount('/auth', auth_routes)
- mount('/
a', admi
n_routes)
+ mount('/
mod', moderatio
n_routes)
import mediagoblin.submit.routing
import mediagoblin.user_pages.routing
import mediagoblin.edit.routing
import mediagoblin.submit.routing
import mediagoblin.user_pages.routing
import mediagoblin.edit.routing
- import mediagoblin.webfinger.routing
import mediagoblin.listings.routing
import mediagoblin.notifications.routing
import mediagoblin.listings.routing
import mediagoblin.notifications.routing
-<<<<<<< HEAD
-=======
import mediagoblin.oauth.routing
import mediagoblin.oauth.routing
->>>>>>> e7b8059f17c98ee88d933af52b0c4d858e882e8e
-
+ import mediagoblin.federation.routing
+
for route in PluginManager().get_routes():
add_route(*route)
for route in PluginManager().get_routes():
add_route(*route)