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

Merge branch 'lj'

Browse Source 
Conflicts:
	templates/repo_file_get.html
	utils.py
This commit is contained in:
xiez
2012-07-24 00:01:22 +08:00
parent acf3dfdf6b 65a1b667dd
commit 47076f8ad9
30 changed files with 40777 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
urls.py
View File

@@ -8,7 +8,7 @@ from seahub.views import root, peers, myhome, \
activate_user, user_add, user_remove, sys_group_admin, sys_org_admin, \
ownerhome, repo_history_revert, repo_file_get, \
user_info, repo_set_access_property, repo_access_file, \
repo_remove_share, repo_download, org_info, repo_view_file, \
repo_remove_share, repo_download, org_info, repo_view_file, pdf_full_view, \
seafile_access_check, back_local, repo_history_changes, \
repo_upload_file, file_upload_progress, file_upload_progress_page, \
get_subdir, file_move, repo_new_dir, repo_rename_file, validate_filename, \
@@ -68,6 +68,7 @@ urlpatterns = patterns('',
# (r'^repo/setap/(?P<repo_id>[^/]+)/$', repo_set_access_property),
url(r'^repo/(?P<repo_id>[^/]+)/files/$', repo_view_file, name="repo_view_file"),
(r'^repo/(?P<repo_id>[^/]+)/file/get/$', repo_file_get),
(r'^pdf_full_view/$', pdf_full_view),
url(r'^repo/(?P<repo_id>[^/]+)/(?P<obj_id>[^/]+)/$', repo_access_file, name='repo_access_file'),
(r'^download/repo/$', repo_download),