6706 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	1182a80989	Merge branch '6.2'	2018-03-15 11:26:02 +08:00
xiez	580a812433	Merge pull request #2033 from haiwen/demo-user ... remove CLOUD_MODE check when login demo user	2018-03-14 17:29:34 +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
lian	b3da8a8d49	Merge pull request #2031 from haiwen/6.2-trash-event ... trash event	2018-03-14 10:58:46 +08:00
zming	f870a6d556	trash event	2018-03-13 18:31:01 +08:00
xiez	44ed4b3955	Merge pull request #2030 from haiwen/password-set ... use `seafile_api.is_password_set` to check encrypted repo	2018-03-13 17:57:02 +08:00
lian	df2de72e00	use seafile_api.is_password_set to check encrypted repo	2018-03-13 11:57:13 +08:00
Daniel Pan	e579fb8775	Merge pull request #2029 from haiwen/prefix-query ... prefix-query	2018-03-13 10:15:47 +08:00
zming	d6d4bf5aa0	prefix-query	2018-03-12 15:01:58 +08:00
xiez	5dd06a7d0c	Merge pull request #2013 from haiwen/fix_rename_activity ... Fix folder renaming issue in activity list, ref: https://forum.seafil…	2018-03-08 11:18:43 +08:00
zming	9960fa349c	Shared files cannot be previewed by others.	2018-03-08 11:15:20 +08:00
xiez	bdaa660787	Merge pull request #2026 from haiwen/fix-2fa-backup-token ... Fix 2fa backup token page when 2fa is skipped.	2018-03-06 17:32:22 +08:00
zhengxie	faf3b84869	Fix 2fa backup token page when 2fa is skipped.	2018-03-06 17:16:38 +08:00
llj	61f4748a46	[system admin] userinfo: improved 'repo transfer'	2018-03-05 15:52:47 +08:00
lian	9a78a6ceef	[sysadmin] use web api to transfer repo	2018-03-05 15:52:47 +08:00
xiez	aba614fde8	Merge pull request #2025 from haiwen/pdf-file-view ... [file view] update logic for document online view	2018-03-05 14:45:08 +08:00
zming	17f24cda51	review	2018-03-05 14:25:17 +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
xiez	ee736c1a75	Merge pull request #2020 from haiwen/wopi-post-inner ... update wopi post file content	2018-03-05 10:29:19 +08:00
zming	82e4648981	[file view] update logic for document online view	2018-03-03 17:01:35 +08:00
llj	e637c5992f	Merge pull request #2024 from haiwen/fileupload ... [fileupload] show error message when failed to get upload url	2018-03-03 13:38:39 +08:00
llj	6d4000fc20	[fileupload] show error message when failed to get upload url	2018-03-02 16:11:27 +08:00
lian	5b537709bb	Merge pull request #2015 from haiwen/Optimize-search ... Reduce redundant operations	2018-03-02 14:16:52 +08:00
zming	16af598e16	Reduce redundant operations	2018-03-02 11:45:52 +08:00
Daniel Pan	d3c8a3f8b2	Merge pull request #2023 from haiwen/pdf-file-view ... [file view] always use pdf.js for PDF online view; upgraded pdf.js	2018-03-01 20:49:58 +08:00
lian	5b02073588	Merge pull request #2016 from haiwen/search_custom_bug ... update search file_map	2018-03-01 17:01:13 +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
llj	64368a7834	[file view] always use pdf.js for PDF online view; upgraded pdf.js	2018-03-01 11:20:21 +08:00
Daniel Pan	6d25225e54	Merge pull request #2022 from haiwen/wiki-create-repo ... create personal/group wiki	2018-02-26 18:02:18 +08:00
lian	ae6e57d262	create personal/group wiki ... fix storage id related bug when create personal/group wiki	2018-02-26 17:44:02 +08:00
zming	c51b05213e	update search file_map	2018-02-24 10:44:05 +08:00
Daniel Pan	c415d3e2c8	Merge pull request #1990 from haiwen/wopi-log ... add some log for view office file via OOS	2018-02-24 09:59:55 +08:00
lian	6cab9ed885	update wopi post file content ... use inner fileserver update url when save a file via WOPI	2018-02-10 14:58:18 +08:00
zMingGit	1529155f3e	Merge pull request #2014 from haiwen/refactor-search ... refactor search file api	2018-02-09 10:41:03 +08:00
Daniel Pan	6bacab815f	Merge pull request #2008 from haiwen/upgrade-jquery ... [upgrade jquery] modifications, & cleaned up code & files	2018-02-08 18:04:59 +08:00
lian	fc3d6b8339	refactor search file api	2018-02-08 17:17:14 +08:00
zhengxie	34530a3368	Fix folder renaming issue in activity list, ref: https://forum.seafile.com/t/bug-in-folder-renaming-operation-list-activity/5194	2018-02-08 16:56:25 +08:00
Daniel Pan	eb4d8c9899	Merge pull request #1994 from haiwen/svg-view ... [file view] added online view for SVG files	2018-02-08 15:41:54 +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
llj	25395fce82	Merge pull request #2011 from haiwen/fix ... [home_base.html] side-nav: fix	2018-02-07 13:28:54 +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	289508ea38	Merge pull request #2012 from haiwen/log_setting ... Redirect python warnings to console when DEBUG = True, instead of wri…	2018-02-07 11:26:35 +08:00
zhengxie	21c827c680	Redirect python warnings to console when DEBUG = True, instead of writing to log files	2018-02-07 11:23:09 +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
llj	bb1eab360f	[home_base.html] side-nav: fix	2018-02-06 15:25:18 +08:00
llj	88478dee1d	[upgrade jquery] modifications, & cleaned up code & files	2018-02-05 16:47:56 +08:00
xiez	298a5a62a0	Merge pull request #2001 from ilearnit/extend-admin-notification ... extend-admin-notification	2018-02-05 10:55:52 +08:00