11715 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	390672c0e9	Merge branch '7.1' into 8.0	2021-05-20 10:58:25 +08:00
lian	19ff00dbc4	update onlyoffice always show watermark if enabled	2021-05-20 10:57:42 +08:00
lian	620d929545	update requirements.txt ... django-webpack_loader==0.7.0	2021-05-20 10:55:50 +08:00
Daniel Pan	64145371e8	Merge pull request #4899 from haiwen/watermark ... update watermark logig when view file via wopi	2021-05-15 11:34:28 +08:00
lian	2451fe9593	update watermark logig when view file via wopi	2021-05-14 18:20:02 +08:00
lian	d00eb38890	Merge branch '7.1' into 8.0	2021-05-13 13:19:37 +08:00
Daniel Pan	a6ac0e28b6	Merge pull request #4896 from haiwen/office-convert-jwt ... pyjwt==2.1.*	2021-05-11 13:35:07 +08:00
lian	4cbc5a9346	pyjwt==2.1.*	2021-05-11 11:44:32 +08:00
lian	ba4d1d95e5	Merge branch '8.0' into master	2021-05-07 13:22:41 +08:00
lian	430d8cbf1b	Merge branch '7.1' into 8.0	2021-05-07 13:22:17 +08:00
Daniel Pan	f1d458a6f9	Merge pull request #4894 from haiwen/repo-owner ... use get_repo_owner func when check if is department admin	2021-05-07 13:06:12 +08:00
lian	22226e451e	use get_repo_owner func when check if is department admin	2021-05-06 18:18:26 +08:00
Daniel Pan	e9b9e7a0bc	Merge pull request #4890 from haiwen/onlyoffice-pyjwt ... pyjwt==2.1.0	2021-05-06 15:05:36 +08:00
lian	50121feb36	update	2021-05-06 14:59:04 +08:00
lian	2d4638eb6b	check virus when upload file via share link	2021-05-06 14:46:36 +08:00
Daniel Pan	37a13bf388	Merge pull request #4891 from haiwen/fix-del-sys-note-cache ... FIX: del sys-note and del cache	2021-05-06 11:22:49 +08:00
AlexCXC	8535358dd2	fix unit test	2021-04-30 15:11:03 +08:00
AlexCXC	9c05362b2d	fix unit test	2021-04-30 14:43:29 +08:00
AlexCXC	949a522795	FIX: del sys-note and del cache	2021-04-30 10:51:42 +08:00
lian	c1a0dbf247	pyjwt==2.1.0	2021-04-29 14:48:48 +08:00
shanshuirenjia	f81dc3fabb	Merge branch '8.0'	2021-04-27 11:35:16 +08:00
Daniel Pan	20495741e5	Merge pull request #4889 from haiwen/optimize-md-file-render ... optimize md render	2021-04-27 11:32:23 +08:00
shanshuirenjia	33377080f0	update comment	2021-04-27 11:28:12 +08:00
shanshuirenjia	e9d1ea9ed6	optimize md render	2021-04-27 11:22:55 +08:00
lian	6a0ec25d01	Merge branch '8.0' into master	2021-04-26 10:05:22 +08:00
lian	3cf4838f98	Merge branch '7.1' into 8.0	2021-04-26 10:03:37 +08:00
Daniel Pan	d2bfe815fe	Merge pull request #4888 from haiwen/onlyoffice-cache ... remove cache delete ONLYOFFICE_doc_key when onlyoffice save file	2021-04-25 09:39:43 +08:00
lian	41550698ef	remove cache delete ONLYOFFICE_doc_key when onlyoffice save file	2021-04-23 18:14:06 +08:00
Daniel Pan	a894121e13	Merge pull request #4886 from haiwen/import-time ... update location of "import"	2021-04-23 16:25:38 +08:00
Daniel Pan	44adf70056	Merge pull request #4885 from haiwen/lock_file ... pass expire parameter when lock file	2021-04-23 16:24:36 +08:00
Daniel Pan	fbc638af4e	Merge pull request #4887 from haiwen/get-dir-size ... remove get_dir_size	2021-04-23 16:15:59 +08:00
lian	256bf3a805	remove get_dir_size	2021-04-23 14:05:11 +08:00
lian	dd2f0f0fdd	update location of "import"	2021-04-23 13:44:04 +08:00
lian	0607892f3d	pass expire parameter when lock file	2021-04-23 13:43:27 +08:00
Daniel Pan	24843811f5	Merge pull request #4882 from haiwen/repair-share-upload-link-bug-3 ... repair shared upload link bug	2021-04-22 16:36:55 +08:00
shanshuirenjia	8a86630b76	repair shared upload link bug	2021-04-22 15:28:42 +08:00
Daniel Pan	914fb751ea	Merge pull request #4881 from haiwen/fix-django2-syntax ... fix django2 syntax	2021-04-22 14:39:33 +08:00
王健辉	05a55b38c4	fix django2 syntax	2021-04-21 23:38:53 +08:00
Daniel Pan	2cef0eb42f	Merge pull request #4880 from haiwen/repair-shared-upload-link-bug ... Repair shared upload link bug	2021-04-21 10:43:54 +08:00
shanshuirenjia	03222a9fef	optimize code	2021-04-21 10:21:11 +08:00
shanshuirenjia	25cb838d12	repair upload file bug in shared uploaded link	2021-04-21 10:19:01 +08:00
shanshuirenjia	64ad908637	update seafile-js version	2021-04-20 13:19:15 +08:00
Daniel Pan	4f7ed788c9	Merge pull request #4877 from haiwen/share-link-upload-done ... add share link file upload done api	2021-04-20 13:14:18 +08:00
Daniel Pan	4c4bb9f904	Merge pull request #4876 from haiwen/repair-share-dir-upload-file-bug-2 ... repair upload file bug in shared uploaded link	2021-04-19 21:33:20 +08:00
Daniel Pan	278f276857	Merge pull request #4878 from haiwen/md-toolbar ... [markdown file view] toolbar: added 'download' & 'open via client', a…	2021-04-19 21:32:18 +08:00
shanshuirenjia	d2a54afdba	optimize code	2021-04-19 17:23:26 +08:00
llj	372be49ae1	[markdown file view] toolbar: added 'download' & 'open via client', and etc.	2021-04-19 16:14:59 +08:00
lian	e9d1d56972	add share link file upload done api	2021-04-19 16:01:33 +08:00
shanshuirenjia	ff61c885fb	repair upload file bug in shared uploaded link	2021-04-19 15:26:35 +08:00
lian	d6fe19dd27	Merge branch '8.0' into master	2021-04-19 11:05:01 +08:00