6 Commits

Author	SHA1	Message	Date
zhengxie	d82df5fb52	Merge branch '6.0' ... Conflicts: media/js/base.js seahub/api2/views.py seahub/views/ajax.py tests/api/test_repo_user_folder_perm.py	2017-02-17 17:11:33 +08:00
lian	9848514e7d	update test	2017-01-19 14:40:49 +08:00
lian	2ecae4162b	update remove folder permission ... not check path existence when delete user/group folder permission	2017-01-13 16:54:38 +08:00
lian	413738f66e	update args of repo user/group perm api	2016-02-02 15:27:39 +08:00
lian	3d09dd9953	update seahub according to new seafile api	2016-01-27 15:52:33 +08:00
lian	08f929eb35	[api] add repo user/group folder perm api	2016-01-27 09:58:20 +08:00