12389 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	a38eab49b8	Merge pull request #4799 from haiwen/use-go-fileserver ... use go fileserver	2021-06-07 11:13:55 +08:00
Daniel Pan	2175c1234b	Merge pull request #4908 from haiwen/share-link-dl ... fix bug when visit password protected direct download share link	2021-05-28 11:48:07 +08:00
Daniel Pan	8f392f1cb3	Merge pull request #4905 from haiwen/title ... show filename as title when view published file	2021-05-28 09:55:56 +08:00
lian	f040f0a9a0	fix bug when visit password protected direct download share link	2021-05-26 15:49:49 +08:00
lian	91e0e7b1f3	update	2021-05-25 14:53:07 +08:00
Daniel Pan	82371684b7	Merge pull request #4906 from haiwen/wopi ... update edit file via wopi	2021-05-25 14:47:43 +08:00
Daniel Pan	de7c2f2552	Merge pull request #4904 from haiwen/robots ... update robots.txt	2021-05-25 14:46:51 +08:00
Daniel Pan	a8eef0a59f	Merge pull request #4907 from haiwen/check-virus ... only check virus in pro version	2021-05-25 14:45:40 +08:00
lian	b21f15296e	only check virus in pro version	2021-05-25 13:50:53 +08:00
lian	3e0dbe5b67	update edit file via wopi ... add pro version check before lock/unlock file	2021-05-25 12:11:35 +08:00
lian	57e5d248ae	update robots.txt ... add "Allow: /media/"	2021-05-24 18:20:05 +08:00
lian	f9702147fd	show filename as title when view published file	2021-05-24 18:19:09 +08:00
lian	8e1966c45a	Merge branch '8.0' into master	2021-05-24 12:35:50 +08:00
lian	9cbc27a7f2	Merge branch '7.1' into 8.0	2021-05-24 12:34:57 +08:00
Daniel Pan	c3bd0677db	Merge pull request #4902 from haiwen/last-access ... update admin get users api	2021-05-24 12:30:19 +08:00
Daniel Pan	8de2ff8bac	Merge pull request #4903 from haiwen/user-quota ... fix bug when admin set user quota to 0	2021-05-21 22:44:17 +08:00
Daniel Pan	f0c5c3e74d	Merge pull request #4901 from haiwen/admin-device ... let admin can delete device on CE version	2021-05-21 22:42:55 +08:00
lian	8c2bb6d302	fix bug when admin set user quota to 0	2021-05-21 11:25:37 +08:00
lian	d9120643c8	let admin can delete device on CE version	2021-05-21 10:53:20 +08:00
lian	c1ba613abe	update admin get users api ... remove audit_last_access and update_last_access	2021-05-20 17:00:24 +08:00
Daniel Pan	5984d59e9b	Merge pull request #4893 from haiwen/check_virus ... check virus when upload file via share link	2021-05-20 15:40:56 +08:00
Daniel Pan	8f8d4cda14	Merge pull request #4900 from haiwen/optimize_get_file_audit_events ... optimize get_file_audit_events	2021-05-20 15:29:18 +08:00
王健辉	ce7d93b43b	optimize get_file_audit_events	2021-05-20 15:06:27 +08:00
lian	38aa812fc9	Merge branch '8.0' into master	2021-05-20 10:59:14 +08:00
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