4324 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiez	c09defec56	Merge pull request #873 from haiwen/dl-zipped ... use "real_path" when download sub-folder in shared dir	2015-10-29 17:45:18 +08:00
lian	59961ea9dd	use "real_path" when download sub-folder in shared dir	2015-10-28 15:15:47 +08:00
zhengxie	501fa793b1	Use custom django-constance	2015-10-27 16:03:08 +08:00
zhengxie	02938dd6cb	Refactor utils rpc imports	2015-10-27 12:12:00 +08:00
zhengxie	77aa0ae82e	Merge branch '4.4' ... Conflicts: seahub/templates/sysadmin/userinfo.html seahub/views/sysadmin.py	2015-10-27 11:44:08 +08:00
xiez	688671329c	Merge pull request #871 from haiwen/file-dl-fix ... [file] Fix file download bug	2015-10-27 11:30:23 +08:00
xiez	1a9858f7fc	Merge pull request #856 from haiwen/merge-server-config ... Merge server config	2015-10-27 11:02:48 +08:00
zhengxie	c1e6f04c53	[auth] Refactor get_user function	2015-10-27 10:18:45 +08:00
lian	0aed6d8453	[audit] send file access msg when preview file	2015-10-27 10:13:10 +08:00
zhengxie	e6a68d4d5c	[file] Fix file download bug	2015-10-26 18:02:23 +08:00
llj	3fa2ab6a38	Merge pull request #859 from haiwen/license ... [sys-admin] check seafile license expiration	2015-10-24 18:27:20 +08:00
llj	96cbd7debc	[sys-admin] license expiration: modification	2015-10-24 18:14:58 +08:00
lian	9e755e36e8	[pub-user] only list active users	2015-10-24 18:10:54 +08:00
Shuai Lin	4994b12197	fixed ccnet pool params in utils module	2015-10-24 17:39:13 +08:00
zhengxie	7e42e9b8b2	Update get_emailusers rpc	2015-10-24 17:18:07 +08:00
lian	5d7761ee0f	[sys-admin] check seafile license expiration	2015-10-24 15:53:02 +08:00
xiez	f9fd818df8	Merge pull request #867 from haiwen/pub-user ... [pubuser] only list ldap imported users	2015-10-24 13:57:54 +08:00
lian	bf3bcc768a	[pubuser] only list ldap imported users	2015-10-24 11:41:38 +08:00
llj	2bc230ccba	bugfix for 'repo create' & 'sys user admin'	2015-10-23 18:01:29 +08:00
llj	6437c29dfe	[sysadmin] clean up code	2015-10-23 15:31:59 +08:00
Daniel Pan	31b437855f	Merge pull request #865 from haiwen/audit-log ... [audit] send file access msg when preview file	2015-10-23 15:15:32 +08:00
llj	6737913af1	Merge pull request #854 from haiwen/user-repo-transfer ... [sysadmin] userinfo: add 'transfer' for library	2015-10-23 14:24:12 +08:00
llj	f279a7115f	[sysadmin] userinfo: modification	2015-10-23 14:15:16 +08:00
lian	3415606969	[audit] send file access msg when preview file	2015-10-23 14:13:58 +08:00
xiez	cddfb7a7a5	Merge pull request #862 from haiwen/unshare-fix ... Refactor remove share, and clean code	2015-10-23 13:58:13 +08:00
xiez	8cef3682d9	Merge pull request #864 from haiwen/repo-url ... update repo url in device and user profile page	2015-10-23 13:57:57 +08:00
lian	9af14d78c1	update repo url in device and user profile page	2015-10-23 13:12:40 +08:00
llj	7c4be98169	[sysadmin] libraries: show 'Files / Size' for library	2015-10-22 19:11:19 +08:00
xiez	534937a73f	Merge pull request #861 from haiwen/del-virus ... update remove virus file	2015-10-22 16:22:58 +08:00
xiez	a45f831e21	Merge pull request #863 from haiwen/encrypted-repo ... [api2] update ENABLE_ENCRYPTED_LIBRARY	2015-10-22 16:22:16 +08:00
llj	ae9d0b296a	[UI] modified 'share popup' & 'dir perm popup'	2015-10-22 16:17:41 +08:00
lian	d0c8235f13	[api2] update ENABLE_ENCRYPTED_LIBRARY	2015-10-22 16:08:52 +08:00
zhengxie	e9e8e59512	Refactor remove share, and clean code	2015-10-22 16:01:12 +08:00
lian	06ebef7f86	update remove virus file	2015-10-22 15:40:15 +08:00
xiez	08f922f356	Merge pull request #855 from haiwen/get-post ... [sys-admin] change http request from "GET" to "POST"	2015-10-22 11:37:40 +08:00
zhengxie	a9fdd106d8	[group] Update a few ops	2015-10-22 11:31:23 +08:00
lian	3a47c427bb	update code: rm cspt	2015-10-22 10:14:57 +08:00
lian	a65f94656a	[sys-admin] change http request from "GET" to "POST"	2015-10-22 10:14:57 +08:00
llj	ce6030cdfe	Merge pull request #857 from haiwen/fix-share ... [share.js] modified 'delete link'	2015-10-21 15:41:38 +08:00
llj	0e6de3b4e9	[share.js] modified 'delete link'	2015-10-21 15:34:09 +08:00
xiez	494483f905	Merge pull request #843 from haiwen/sysadmin-view-repo ... enabel sysadmin view user's repo	2015-10-21 15:22:16 +08:00
zhengxie	47e513eb88	Merge branch 'fix-revert'	2015-10-21 15:18:10 +08:00
llj	516a7c0eeb	[revert] improvement	2015-10-21 14:29:05 +08:00
Shuai Lin	dba5ee4cf4	update initial sqls	2015-10-21 14:16:33 +08:00
lian	c41ff45ea2	enable sysadmin view user's repo	2015-10-21 14:05:46 +08:00
Shuai Lin	5df7796345	import seahub_settings from central conf dir in release pacakge	2015-10-21 13:28:40 +08:00
patrickgao	c1258325fb	enable sysadmin transfer user's repo	2015-10-21 11:08:59 +08:00
zhengxie	edc2e72afc	[auth] Fix middleware	2015-10-20 18:31:19 +08:00
zhengxie	9af79be996	Refactor revert ops	2015-10-20 18:24:27 +08:00
zhengxie	df1ff9e0f6	[tests] Fix shared file tests	2015-10-20 12:17:22 +08:00