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 |
|
lian
|
866e84e692
|
Merge branch '7.1' into 8.0
|
2021-04-19 10:55:50 +08:00 |
|
Daniel Pan
|
8b2106e8c2
|
Merge pull request #4875 from haiwen/repair-share-dir-upload-bug
repair share dir upload bug
|
2021-04-17 12:14:46 +08:00 |
|
shanshuirenjia
|
93e0cc5857
|
repair share dir upload bug
|
2021-04-17 12:08:10 +08:00 |
|
Daniel Pan
|
58038e275f
|
Merge pull request #4871 from haiwen/admin-search-user
remove duplicated email when admin search user
|
2021-04-16 10:52:54 +08:00 |
|
lian
|
47fa10d8bc
|
remove duplicated email when admin search user
|
2021-04-15 13:44:02 +08:00 |
|
Daniel Pan
|
5ef46b500a
|
Merge pull request #4870 from haiwen/repair-notification-xss-bug
repair notification xss bug
|
2021-04-14 21:03:09 +08:00 |
|
shanshuirenjia
|
187d565682
|
repair notification xss bug
|
2021-04-14 16:31:48 +08:00 |
|
Daniel Pan
|
e5873b25e2
|
Merge pull request #4868 from haiwen/default-send-collaborate-email
Default send collaborate email
|
2021-04-12 15:12:57 +08:00 |
|
AlexCXC
|
0c4d3ea5c0
|
update query users methods
|
2021-04-12 14:53:08 +08:00 |
|
Daniel Pan
|
2805f05e8a
|
Merge pull request #4863 from haiwen/update-import-deparement
Update import deparement
|
2021-04-12 14:49:18 +08:00 |
|
AlexCXC
|
46baf3bdfb
|
dont unset collaborate when interval is 0
|
2021-04-12 12:21:01 +08:00 |
|
AlexCXC
|
5bb7821dbe
|
default end collaborate email
|
2021-04-12 12:17:13 +08:00 |
|
Daniel Pan
|
024af25593
|
Merge pull request #4866 from haiwen/markdown-content
return markdown content to web page
|
2021-04-10 14:02:30 +08:00 |
|
Daniel Pan
|
16bb3b005a
|
Merge pull request #4865 from haiwen/django-timezone
fix bug when config USE_TZ and TIME_ZONE
|
2021-04-10 13:51:07 +08:00 |
|
Markus Richter
|
30914eff0c
|
Fix for python 3.9
This replaces a removed method (see https://docs.python.org/3.9/whatsnew/3.9.html#removed-in-python-39 and https://docs.python.org/3.8/library/xml.etree.elementtree.html#xml.etree.ElementTree.Element.getiterator) with its successor which should be a drop-in replacement (judging from the docs)
|
2021-04-09 16:02:50 +02:00 |
|
lian
|
c0a756082b
|
return markdown content to web page
|
2021-04-09 16:21:33 +08:00 |
|
lian
|
7b98838fc1
|
fix bug when config USE_TZ and TIME_ZONE
|
2021-04-09 13:42:00 +08:00 |
|
skywalker
|
14ce83c518
|
rm outer_parent_id
|
2021-04-08 12:00:15 +08:00 |
|
skywalker
|
04515c829e
|
rename
|
2021-04-08 10:37:32 +08:00 |
|
skywalker
|
cab973eb2b
|
sync_departments_to_db
|
2021-04-07 17:07:01 +08:00 |
|
skywalker
|
1ab06f85db
|
BigIntegerField
|
2021-04-07 16:39:36 +08:00 |
|
skywalker
|
7e3067643c
|
external_department
|
2021-04-07 11:27:23 +08:00 |
|
skywalker
|
fe4a0838b8
|
ding ding inport
|
2021-04-07 11:26:40 +08:00 |
|
skywalker
|
2a1665a6a2
|
work weixin import
|
2021-04-07 11:21:25 +08:00 |
|
skywalker
|
100da7240f
|
ExternalDepartment
|
2021-04-07 10:51:06 +08:00 |
|
skywalker
|
757e6d5777
|
sorted department_list
|
2021-04-06 15:50:46 +08:00 |
|