562 Commits

Author	SHA1	Message	Date
lian	45f0d9cd9a	update parameter and tests	2017-08-04 15:01:55 +08:00
lian	e15f6c6737	batch copy folders	2017-08-04 10:55:33 +08:00
lian	44e2889abf	update account test	2017-08-03 18:06:08 +08:00
xiez	2eb27af57f	Merge pull request #1734 from haiwen/modify-tag-model ... modify tag model	2017-08-03 17:38:06 +08:00
zming	0b3977a02e	add unit test	2017-08-03 16:24:09 +08:00
xiez	622931dec4	Merge pull request #1739 from haiwen/shib_role_map ... [shibboleth] Add joker * in affiliation role map	2017-08-02 18:32:22 +08:00
zhengxie	9a5aae50ab	[shibboleth] Add joker * in affiliation role map	2017-08-02 18:31:15 +08:00
zming	5298d25b46	update response	2017-08-02 11:48:15 +08:00
zming	3ab3593fe9	permission check&check whether repo is exists	2017-08-01 15:37:09 +08:00
zming	466ef48116	[api] admin library history limit	2017-08-01 10:17:38 +08:00
zming	2164b717f6	[API2] RevisionTag	2017-07-31 10:54:46 +08:00
lian	259655b6bd	update clear token ... clear token when inactive user, delete user, change user password	2017-07-28 16:37:11 +08:00
zming	d597623b14	update test_get_enabled_role_permissions_by_role	2017-07-28 11:17:24 +08:00
zming	d28e597921	[API2] ReversionTag	2017-07-21 12:30:55 +08:00
Daniel Pan	4c776b0f17	Merge pull request #1705 from haiwen/org-user-info ... update admin org user api	2017-07-20 14:07:48 +08:00
zming	423a3f0e25	Merge branch 'clear-invitations' into 6.1	2017-07-15 17:52:08 +08:00
zming	9e1fb76166	update invalid args	2017-07-15 17:46:46 +08:00
lian	f62a206ed8	update admin org user api	2017-07-15 16:00:30 +08:00
xiez	64832adc03	Merge pull request #1674 from haiwen/license ... license	2017-07-15 15:37:06 +08:00
zhengxie	b1e9f5beb3	reload license when updated and update tests	2017-07-15 15:28:41 +08:00
xiez	0de932bec9	Merge pull request #1703 from haiwen/two-factor-auth ... Two factor auth	2017-07-15 13:48:33 +08:00
zming	c0f512aca6	update test	2017-07-15 12:24:52 +08:00
zming	f51d8122e9	rm expire invitations	2017-07-13 15:41:30 +08:00
zming	c2873b9112	two-factor-auth	2017-07-13 10:55:10 +08:00
zming	b8a4a12880	file tag	2017-07-11 17:45:39 +08:00
lian	a77ab79e91	add size when admin get file share link info	2017-07-10 11:22:39 +08:00
zhengxie	f55d23b095	Merge branch '6.1'	2017-07-06 10:47:39 +08:00
lian	3e81a5b8a8	add dir detail api	2017-07-04 14:07:26 +08:00
xiez	1c08c67d24	Merge pull request #1672 from haiwen/system-lib ... add admin system library upload api	2017-07-03 14:55:45 +08:00
lian	46a5473326	add amdin system library upload api	2017-07-03 14:42:12 +08:00
xiez	0100d6da8b	Merge pull request #1675 from haiwen/multi-copy-move ... update multi copy/move dirents api	2017-07-03 13:12:51 +08:00
lian	0f32bf26fe	update multi copy/move dirents api	2017-07-03 12:24:07 +08:00
zhengxie	da4918d7a9	[tests] Update phantomjs installation	2017-07-03 11:22:59 +08:00
zming	734766391a	[api2] get deleted-repos,and restore deleted-repos	2017-06-30 16:22:29 +08:00
fanghao	3149a4d49d	license	2017-06-30 15:35:31 +08:00
zhengxie	bb8f04993d	Merge branch '6.1' ... Conflicts: seahub/api2/views.py	2017-06-30 14:27:07 +08:00
xiez	1ef77ef036	Merge pull request #1661 from haiwen/normalize_path ... normalize file/dir path	2017-06-27 18:08:10 +08:00
lian	070f68e3e4	add get repo info api for v2.1	2017-06-27 17:23:10 +08:00
lian	2e5d8bc1ed	update get repo info api ... add `file_count` and rm `desc`	2017-06-27 16:32:19 +08:00
lian	68c5e764d6	normalize file/dir path ... 1. Add '/' at the end of directory path if necessary. 1. And make sure path starts with '/'	2017-06-27 11:34:09 +08:00
zhengxie	eb2719fc59	[api] Add repo last modifier and add cache for memcache ops	2017-06-23 11:30:01 +08:00
zhengxie	966e0bcb9c	[api] Improve dir list performance	2017-06-22 15:38:59 +08:00
lian	9750e8baaf	add admin share/upload links api ... 1. get share/upload link info by token 1. get dirents of shared dir 1. get download/upload fileserver url of shared file/dir 1. check share/upload link password	2017-06-21 15:15:24 +08:00
lian	74b8272047	rm unused info when get repo list via api	2017-06-20 11:08:26 +08:00
lian	179e2ebc72	update mkdir api	2017-06-20 10:51:45 +08:00
xiez	b487ca463b	Merge pull request #1636 from haiwen/file-modifier ... [api] file modifier	2017-06-19 15:38:39 +08:00
zhengxie	e939f942e3	Fix travis test	2017-06-19 15:30:22 +08:00
zming	3edfe92f60	[api] file modifier	2017-06-19 14:52:16 +08:00
zhengxie	e5747a1e67	Fix permission in shared file	2017-06-17 16:19:46 +08:00
zhengxie	5e20cd58fa	Update share file permissions	2017-06-17 15:50:17 +08:00