871 Commits

Author	SHA1	Message	Date
zhengxie	9b16ba0e8f	[Django 1.11] Feature removed in Django 1.9. Update template settings and test	2018-03-19 15:33:25 +08:00
zhengxie	663eebc8ed	[Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site	2018-03-16 13:23:53 +08:00
zhengxie	2d56fd73c0	Rewrite 2fa, do not import models in package level	2018-03-16 11:42:13 +08:00
llj	1182a80989	Merge branch '6.2'	2018-03-15 11:26:02 +08:00
lian	ef5c962b44	update demo user feather ... 1. remove CLOUD_MODE check when login demo user 2. add ENABLE_DEMO_USER settings	2018-03-14 17:23:12 +08:00
zhengxie	faf3b84869	Fix 2fa backup token page when 2fa is skipped.	2018-03-06 17:16:38 +08:00
xiez	e10bbde9c3	Merge pull request #2019 from haiwen/share-link-perm ... update permission when user download/upload link	2018-03-05 10:44:48 +08:00
zming	16af598e16	Reduce redundant operations	2018-03-02 11:45:52 +08:00
lian	91ee8f16cb	update permission when user download/upload link ... add repo access permission check for share link creator	2018-03-01 16:01:20 +08:00
zMingGit	1529155f3e	Merge pull request #2014 from haiwen/refactor-search ... refactor search file api	2018-02-09 10:41:03 +08:00
lian	fc3d6b8339	refactor search file api	2018-02-08 17:17:14 +08:00
xiez	35b7d76c82	Merge pull request #2003 from haiwen/share-link-upload ... add api for upload file via upload link foken	2018-02-08 14:37:51 +08:00
lian	35da335de3	add api for upload file via upload link token	2018-02-08 14:06:02 +08:00
xiez	a55e1fee7e	Merge pull request #2006 from haiwen/search-repo-perm ... update search file api	2018-02-07 15:55:31 +08:00
ilearnit	1d26c71723	[tests] update extend admin notification	2018-02-07 14:28:27 +08:00
lian	9998f89280	update search file ... admin permission check when search file in a repo	2018-02-07 11:49:31 +08:00
xiez	d807295010	Merge pull request #2004 from haiwen/clean-repo-trash ... add clean library trash api	2018-02-06 18:21:08 +08:00
xiez	298a5a62a0	Merge pull request #2001 from ilearnit/extend-admin-notification ... extend-admin-notification	2018-02-05 10:55:52 +08:00
lian	b35c418361	add clean library trash api	2018-02-03 10:58:35 +08:00
ilearnit	0957c4b3ca	extend-admin-notification	2018-02-01 18:01:49 +08:00
zming	5f9033b5ff	sysadmin can share repo with admin permission	2018-01-30 17:38: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
lian	148e382425	add admin copy file/folder api	2018-01-24 13:01:19 +08:00
zhengxie	eb952e2041	Fix demo account	2018-01-22 18:30:37 +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
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
lian	0c173a12ac	use new get group repos api	2018-01-17 16:07:30 +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
zming	0affd2fc1f	license file type invalid && update test	2018-01-10 18:49:55 +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	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
xiez	93b131a8ab	Merge pull request #1975 from haiwen/notify_admin_after_register ... Notify admins after register	2018-01-09 11:43:51 +08:00
xiez	a03f3066c0	Merge pull request #1971 from haiwen/upload_invalid_type ... upload with invalid type	2018-01-08 16:05:29 +08:00
zming	295b567b84	upload with invalid type	2018-01-08 16:00:55 +08:00
zhengxie	ed8a549458	Notify admins after register	2018-01-06 16:53:48 +08:00
zhengxie	2d4c3e2ce2	[sudo] Update tests	2018-01-05 11:56:47 +08:00
zhengxie	4b326ad404	[auth] Refactor login attempts	2018-01-04 17:32:30 +08:00
zhengxie	f0a60418e4	[address book] Add admin api	2018-01-04 17:25:19 +08:00
zhengxie	f4734b161a	[notification] Notify inviter on guest accept invitation.	2017-12-29 14:15:20 +08:00
zhengxie	d37144ef75	Merge branch '6.2' ... Conflicts: seahub/templates/base.html static/scripts/app/views/dir.js static/scripts/common.js	2017-12-28 15:47:18 +08:00
xiez	baeb8ccacf	Merge pull request #1952 from haiwen/invite-multi ... [invite people] enable to invite multiple guests at one time	2017-12-25 13:32:42 +08:00
zming	9adadb6e7d	tests	2017-12-22 12:13:42 +08:00
lian	d4cf67e324	multi storage backend ... 1. add multi storage backend support 2. add 'storage_ids' user role	2017-12-19 15:41:36 +08:00
xiez	78cd00bd13	Merge pull request #1938 from haiwen/search-link ... search link	2017-12-13 17:56:57 +08:00
zming	cd260c0718	review	2017-12-13 17:26:50 +08:00
zming	b82c141afe	review again	2017-12-13 14:33:13 +08:00
zming	3ec7684d46	search link	2017-12-11 16:29:38 +08:00