haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'lj' into merge/share_repo_with_lj

Browse Source
This commit is contained in:
xiez
2012-04-25 11:39:25 +08:00
parent 784a160e53 f4f05ab034
commit 74d5325fe4
5 changed files with 138 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
urls.py
View File

@@ -3,7 +3,7 @@ from django.conf import settings
from django.views.generic.simple import direct_to_template
from seahub.views import root, peers, groups, myhome, \
repo, group, modify_token, remove_repo, seafadmin, useradmin, \
repo, repo_history, group, modify_token, remove_repo, seafadmin, useradmin, \
role_add, role_remove, activate_user, user_add, user_remove, \
ownerhome, remove_fetched_repo, repo_set_public, repo_unset_public, \
repo_list_dir, user_info, repo_set_access_property, repo_operation_file, \
@@ -35,6 +35,7 @@ urlpatterns = patterns('',
(r'^download/$', direct_to_template, { 'template': 'download.html' } ),
(r'^repo/(?P<repo_id>[^/]+)/$', repo),
(r'^repo/history/(?P<repo_id>[^/]+)/$', repo_history),
(r'^repo/token/modify/(?P<repo_id>[^/]+)/$', modify_token),
(r'^repo/remove/(?P<repo_id>[^/]+)/$', remove_repo),
(r'^repo/removefetched/(?P<user_id>[^/]+)/(?P<repo_id>[^/]+)/$', remove_fetched_repo),