1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00

Merge branch 'pubinfo'

Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
This commit is contained in:
zhengxie
2013-02-23 11:48:06 +08:00
12 changed files with 299 additions and 150 deletions

View File

@@ -114,7 +114,9 @@ if CLOUD_MODE:
)
else:
urlpatterns += patterns('',
(r'^pubinfo/$', pubinfo),
url(r'^pubinfo/libraries/$', pubrepo, name='pubrepo'),
(r'^publicrepo/create/$', public_repo_create),
url(r'^pubinfo/groups/$', pubgrp, name='pubgrp'),
url(r'^pubinfo/users/$', pubuser, name='pubuser'),
)