haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Code Issues Releases Wiki Activity
10,919 Commits 142 Branches 460 Tags
b8f36e651715e805a6e88a2e488a463ebb27d79c
Commit Graph

10919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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