6634 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	bb1eab360f	[home_base.html] side-nav: fix	2018-02-06 15:25:18 +08:00
xiez	298a5a62a0	Merge pull request #2001 from ilearnit/extend-admin-notification ... extend-admin-notification	2018-02-05 10:55:52 +08:00
Daniel Pan	38e299e7a7	Merge pull request #2005 from haiwen/search-perm ... update file search result	2018-02-04 10:19:26 +08:00
lian	77bb5bf75c	update file search result ... filter out None permission files	2018-02-03 14:26:51 +08:00
ilearnit	0957c4b3ca	extend-admin-notification	2018-02-01 18:01:49 +08:00
llj	5cb9dbd254	Merge pull request #2000 from haiwen/onlyoffice-fix ... [onlyoffice] CSS: fix	2018-01-31 14:42:59 +08:00
llj	4d8fef102b	[onlyoffice] CSS: fix	2018-01-31 14:40:45 +08:00
llj	1753d6fc53	Merge pull request #1993 from haiwen/onlyoffice-html-fix ... [onlyoffice] HTML: fix	2018-01-31 11:45:46 +08:00
xiez	de375f7cc0	Merge pull request #1997 from haiwen/sysadmin-share-lib-6.2 ... sysadmin can share repo with admin permission	2018-01-31 10:14:31 +08:00
Daniel Pan	a118899f2a	Merge pull request #1998 from haiwen/logging ... [logging] Combine seahub.log and seahub_django_request.log, and enabl…	2018-01-31 10:01:14 +08:00
llj	4fd7b7acd7	[share] fix	2018-01-30 18:04:50 +08:00
zming	5f9033b5ff	sysadmin can share repo with admin permission	2018-01-30 17:38:30 +08:00
llj	09b2447050	Merge pull request #1999 from haiwen/notices-fix ... [notices] fix	2018-01-30 14:58:16 +08:00
llj	e0b13dc147	[notices] fix	2018-01-30 14:44:54 +08:00
zhengxie	6fdb7f3544	[logging] Combine seahub.log and seahub_django_request.log, and enable existing loggers	2018-01-30 12:07:30 +08:00
xiez	f797d2d523	Merge pull request #1985 from haiwen/fs-encrepo ... Fix shared link in enc repo and update tests	2018-01-29 10:43:26 +08:00
xiez	650e1d6041	Merge pull request #1995 from haiwen/file_preview ... File preview	2018-01-29 10:39:16 +08:00
zhengxie	90d4cafd5b	[requirements] Update pillow to 4.3.0	2018-01-29 10:37:44 +08:00
llj	a8a0f12f3c	[onlyoffice] HTML: fix	2018-01-24 14:41:34 +08:00
xiez	760002ee17	Merge pull request #1991 from haiwen/admin-copy-file ... add admin copy file/folder api	2018-01-24 13:31:39 +08:00
lian	148e382425	add admin copy file/folder api	2018-01-24 13:01:19 +08:00
lian	7b2d7f089e	Merge pull request #1987 from haiwen/demo_user ... Fix demo account	2018-01-22 18:35:01 +08:00
zhengxie	eb952e2041	Fix demo account	2018-01-22 18:30:37 +08:00
Daniel Pan	9e370167e6	Merge pull request #1986 from haiwen/cloud-mode ... add CLOUD_MODE to settings.py	2018-01-22 10:12:28 +08:00
lian	08b83039de	add CLOUD_MODE to settings.py	2018-01-22 10:09:50 +08:00
xiez	246269ba55	Merge pull request #1984 from haiwen/group-repo-test ... update get group repo test	2018-01-20 14:49:36 +08:00
lian	c9968d59e6	update get group repo test	2018-01-20 14:38:03 +08:00
zhengxie	4315f29aa2	Fix shared link in enc repo and update tests	2018-01-20 14:13:47 +08:00
zhengxie	cb5f04fbac	[locale] Update translations	2018-01-19 11:02:22 +08:00
zhengxie	912cc83356	[file preview] Support .tif and .eps file	2018-01-18 17:25:39 +08:00
xiez	14f143fe47	Merge pull request #1968 from haiwen/groups-for-repo-share ... add api for getting groups that user can share repo to	2018-01-17 19:04:14 +08:00
lian	ed8200b52a	add api for getting groups that user can share repo to	2018-01-17 18:22:48 +08:00
xiez	37c6e51c6d	Merge pull request #1978 from haiwen/get-group-repos ... update get user's (org) group repos	2018-01-17 18:08:51 +08:00
lian	0c173a12ac	use new get group repos api	2018-01-17 16:07:30 +08:00
xiez	ea9c1801d2	Merge pull request #1981 from haiwen/oauth-fix ... [oauth] Fix oauth state issue in multiple processes	2018-01-17 14:55:05 +08:00
zhengxie	60b02a1f30	[locale] Update locales	2018-01-15 18:20:44 +08:00
xiez	bfc72301b5	Merge pull request #1980 from haiwen/6.2-trans ... [i18n] Update source string	2018-01-15 18:11:10 +08:00
zhengxie	cc33ca396c	[locale] Update po files	2018-01-15 17:32:47 +08:00
zhengxie	2c7aeb1296	[oauth] Fix oauth state issue in multiple processes	2018-01-15 16:12:33 +08:00
zhengxie	06ee26e7d3	[i18n] Update source string	2018-01-12 18:06:42 +08:00
zhengxie	2abfa3fd53	Update tests	2018-01-11 16:35:14 +08:00
zhengxie	efac7b598f	Fix tests	2018-01-11 15:50:22 +08:00
xiez	ddd8affb48	Merge pull request #1949 from haiwen/org-delete-repo ... update send repo_deleted signal in org mode	2018-01-11 10:23:19 +08:00
zming	0affd2fc1f	license file type invalid && update test	2018-01-10 18:49:55 +08:00
lian	a2a77236c0	update send repo_deleted signal in org mode	2018-01-10 17:48:32 +08:00
ilearnit	4b7ec9de27	Delete user option (#1979) ... * Remove user all options * delete space * delete space * debug sapce	2018-01-10 17:28:28 +08:00
xiez	1c6092cc58	Merge pull request #1977 from haiwen/2fa_remember ... [2fa] Remember device for certain days	2018-01-09 16:15:16 +08:00
zhengxie	7206c13200	[locale] Update translations	2018-01-09 14:08:06 +08:00
zhengxie	c767931fd3	[2fa] Remember device for certain days	2018-01-09 13:29:26 +08:00
xiez	f5daddfef3	Merge pull request #1965 from haiwen/guest-login-notify ... [notification] Notify inviter on guest accept invitation.	2018-01-09 13:23:50 +08:00