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

Merge branch '4.4' into 5.0

Browse Source
This commit is contained in:
zhengxie
2015-12-28 10:36:30 +08:00
parent 26029be96e 340d30044d
commit 042956c5a5
5 changed files with 261 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/api2/urls.py
View File

@@ -5,6 +5,8 @@ from .views_misc import ServerInfoView
from .views_auth import LogoutDeviceView, ClientLoginTokenView
from .endpoints.dir_shared_items import DirSharedItemsEndpoint
from .endpoints.account import Account
from .endpoints.shared_upload_links import SharedUploadLinksView
from .endpoints.be_shared_repo import BeSharedReposView
urlpatterns = patterns('',
url(r'^ping/$', Ping.as_view()),
@@ -49,8 +51,10 @@ urlpatterns = patterns('',
url(r'^shared-repos/$', SharedRepos.as_view(), name='sharedrepos'),
url(r'^shared-repos/(?P<repo_id>[-0-9-a-f]{36})/$', SharedRepo.as_view(), name='sharedrepo'),
url(r'^beshared-repos/$', BeShared.as_view(), name='beshared'),
url(r'^beshared-repos/(?P<repo_id>[-0-9-a-f]{36})/$', BeSharedReposView.as_view(), name='beshared-repos'),
url(r'^default-repo/$', DefaultRepoView.as_view(), name='api2-defaultrepo'),
url(r'^shared-links/$', SharedLinksView.as_view()),
url(r'^shared-upload-links/$', SharedUploadLinksView.as_view()),
url(r'^shared-files/$', SharedFilesView.as_view()),
url(r'^virtual-repos/$', VirtualRepos.as_view()),
url(r'^repo-tokens/$', RepoTokensView.as_view()),