56 Commits

Author	SHA1	Message	Date
zming	b460d89f5a	[test] pro -> master	2017-08-23 16:28:51 +08:00
zhengxie	21701ef3b3	Merge branch 'setLibHistory' ... Conflicts: seahub/urls.py	2017-08-23 15:37:29 +08:00
zming	d0975c7836	migrate two-factor	2017-08-21 14:02:57 +08:00
lian	3e7275ec80	Merge branch '6.1'	2017-08-12 14:34:11 +08:00
zMingGit	60c78adc44	[api2] stat_file (#1690) ... * [api2] stat_file * [send message] update last login info * datetime->data, return number to int * fill data * modify func args * modify algorithm	2017-08-09 18:14:00 +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
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
lian	a77ab79e91	add size when admin get file share link info	2017-07-10 11:22:39 +08:00
lian	46a5473326	add amdin system library upload api	2017-07-03 14:42:12 +08:00
fanghao	3149a4d49d	license	2017-06-30 15:35:31 +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
zhengxie	e9de086db3	Merge branch '6.1'	2017-06-03 11:21:08 +08:00
llj	f7ed342e2d	Merge pull request #1593 from haiwen/custom ... admin update logo/favicon	2017-05-27 16:50:54 +08:00
lian	e1d0169e64	update admin log ... 1. add log when admin create repo 1. add log when admin batch delete user 1. update test	2017-05-23 16:05:51 +08:00
lian	0ca018fcf4	add admin create repo api	2017-05-18 10:43:31 +08:00
lian	2b1ae5b921	admin update logo/favicon	2017-05-17 16:59:38 +08:00
zhengxie	f40aa6341b	Update code styles	2017-03-27 13:58:12 +08:00
zhengxie	1b11350f80	Merge branch '6.0' ... Conflicts: seahub/templates/sysadmin/sysadmin_backbone.html seahub/urls.py seahub/views/sysadmin.py static/scripts/app/views/dir.js	2017-03-27 13:53:35 +08:00
lian	b7d3a62b52	mock has permission	2017-03-24 18:12:27 +08:00
lian	54ec4bba63	add test for admin log api	2017-03-23 15:05:47 +08:00
lian	5427563233	add test for admin libraires api	2017-03-22 17:26:42 +08:00
lian	8286f73331	add api of amdin manage org user	2017-03-09 16:42:09 +08:00
lian	b7cad9a707	add api of admin create default repo for common user	2017-02-17 11:46:37 +08:00
lian	718bdbb59b	update admin manage group page	2017-02-09 14:59:49 +08:00
lian	d43a2e5eb3	admin search group by name	2017-01-19 18:21:04 +08:00
lian	38a06be960	update sysinfo page	2017-01-07 10:12:17 +08:00
lian	d6e216dda5	admin add group	2016-12-16 15:02:21 +08:00
lian	34a350d623	check if user num exceed limit before add user	2016-11-05 12:09:58 +08:00
lian	5c59b81466	add new admin share api	2016-08-16 10:19:56 +08:00
lian	92df1ef8d2	admin manage repo share	2016-08-10 10:21:19 +08:00
lian	c7acdce7de	update admin transfer group	2016-08-04 18:01:44 +08:00
lian	d142f2ddc1	update usage of seafile_api & test	2016-08-01 14:38:54 +08:00
Daniel Pan	02a8ae394b	Merge pull request #1290 from haiwen/admin-groups ... new admin groups page	2016-07-26 15:52:42 +08:00
zhengxie	57cc2b4aba	Merge branch '5.1' ... Conflicts: seahub/base/accounts.py seahub/share/views.py seahub/views/sysadmin.py tests/seahub/base/test_accounts.py tests/seahub/share/views/test_ajax_get_download_link.py tests/seahub/share/views/test_ajax_get_upload_link.py	2016-07-21 10:55:50 +08:00
lian	744efb2322	new admin groups page	2016-07-20 17:23:07 +08:00
lian	fcd3e836e3	[api] return licensed to info when get sysinfo	2016-07-13 16:31:05 +08:00
lian	4f43f31468	[api] update license info	2016-07-11 12:08:44 +08:00
lian	38c5485dd5	update admin device test	2016-06-27 11:59:01 +08:00
zhengxie	7b3f3a429b	Fix tests	2016-06-25 12:02:09 +08:00