1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-25 02:00:06 +00:00
Commit Graph

12389 Commits

Author SHA1 Message Date
lian
bbbcfacd91 give ONLYOFFICE_CONVERTER_URL a default value 2021-09-18 17:06:20 +08:00
lian
8192e64175 update onlyoffice convert 2021-09-18 12:35:23 +08:00
Daniel Pan
db4c4f190d
Merge pull request #4985 from haiwen/update-translation
update translation
2021-09-17 13:47:40 +08:00
王健辉
5d5732b3a7 remove useless locale dirs 2021-09-17 12:29:47 +08:00
王健辉
be46d47d48 update translation 2021-09-17 11:51:58 +08:00
llj
47fbbc622f fixup for text 2021-09-17 11:10:16 +08:00
lian
5eba921f2a use upload api 2021-09-15 17:20:27 +08:00
lian
cd9a3f3312 update code style 2021-09-15 17:18:51 +08:00
Sergey Linnik
2e17d92991 Feature/onlyoffice converter (#4937)
* onlyoffice-converter: initial setup

* onlyoffice-converter: hardcoded converter

* onlyoffice-converter: converter v0.1

* onlyoffice-converter: config tweaks

* onlyoffice-connector: jwt typo fix

* format

* onlyoffice-converter: async fix

* onlyoffice-converter: jwt fix

Co-authored-by: Dmitrii Vershinin <dmitry.vershinin@onlyoffice.com>
2021-09-15 17:15:38 +08:00
Daniel Pan
0dd7a289f0
Merge pull request #4983 from haiwen/upload-link-optimize
[upload link] show the latest added file as the the first one & added…
2021-09-15 16:06:59 +08:00
llj
bce135d811 [upload link] bugfix & improvements for notifications 2021-09-15 14:53:00 +08:00
llj
2890e6adde [upload link] show the latest added file as the the first one & added tips 2021-09-14 18:11:31 +08:00
llj
a24c4abf8a [seafile-js] updated the version 2021-09-13 10:59:09 +08:00
王健辉
07df610e43
custom share permission (#4967)
* custom share permission

* remove path field

* add permission manager ui

* optimize custom permission manager style

* add permission setting

* add normalize_custom_permission_name

* optimize repo custom permission

* delete useless code

* optimize code

* optimize code

* optimize markdown file page

* fix a few bugs

* add permission control

* repair modify permission

* optimize style

* optimize copyright

* add try-except

* optimize code

* move file&folder

* batch operation item

* repair batch move item

* update copyright

* optimize move permission control

* optimize code

* optimize code

* optimize code & fix code wranning

* optimize code

* delete unsupport permission

* optimize code

* repair code bug

* add pro limit

* optimize code

* add permission handle for permission editor

* repair new file&folder bug

* optimize file uploader code

* custom permission user can not visit custom permission module

* optimize code

* forbid comment&detail module

* optimize code

* optimize modify/preview permission

* optimize custom permission share perm

* optimize view file module: file-toolbar

* optimize custom drag move operation

* repair column view bug

* optimize drag operation code

* repair code bug

* optimize code

Co-authored-by: shanshuirenjia <978987373@qq.com>
2021-09-13 10:37:07 +08:00
lian
1f68680257 use go fileserver when download single folder 2021-08-31 18:00:02 +08:00
Daniel Pan
723786c94e
Merge pull request #4980 from haiwen/repair-visit-file-history-bug
repair visit file history bug
2021-08-31 12:33:38 +08:00
shanshuirenjia
e34e26cab5 repair visit file history bug 2021-08-31 11:28:39 +08:00
Daniel Pan
4ace0c4061
Merge pull request #4979 from haiwen/admin-active-user
check if user count over limit when admin active user
2021-08-28 11:25:49 +08:00
lian
964ad47e11 add is_pro_version() 2021-08-28 11:17:52 +08:00
lian
5aac2ad28d check if user count over limit when admin active user 2021-08-27 15:28:31 +08:00
Daniel Pan
ee8cac276c
Merge pull request #4978 from haiwen/merge-seahub-extra-into-seahub
merge seahub-extra into seahub
2021-08-27 13:16:37 +08:00
王健辉
6fa22cf180 delete ENABLE_SYSADMIN_EXTRA & use is_pro_version 2021-08-27 10:46:28 +08:00
王健辉
de33463b97 delete uselsee code 2021-08-26 18:22:00 +08:00
王健辉
0430756328 merge seahub-extra into seahub 2021-08-26 13:42:35 +08:00
Daniel Pan
ef4677d560
Merge pull request #4977 from haiwen/service-url
add SERVICE_URL in settings.py
2021-08-26 10:00:23 +08:00
lian
ecb5bd1e50 add SERVICE_URL in settings.py 2021-08-26 09:56:49 +08:00
Daniel Pan
0a10575f25
Merge pull request #4955 from haiwen/wopi-utils
use iter instead of getiterator
2021-08-25 16:30:27 +08:00
Daniel Pan
65d3107a0b
Merge pull request #4975 from haiwen/admin-permission-log
check if group existes before get group name
2021-08-22 14:34:38 +08:00
lian
f510b8fe24 check if group existes before get group name 2021-08-19 17:15:48 +08:00
Daniel Pan
3893c93764
Merge pull request #4974 from haiwen/invite-email
use "You are invited to join" as subject
2021-08-19 11:48:45 +08:00
lian
4308d858cf use "You are invited to join" as subject 2021-08-19 11:24:12 +08:00
songjiaqi1
d24fc8f68c
Merge pull request #4972 from haiwen/update-markdown-editor
update markdown editor
2021-08-17 11:40:31 +08:00
cainiao222
fffdb8b801 update markdown editor 2021-08-17 11:38:35 +08:00
lian
d498f2a1a5 Merge branch '8.0' into master 2021-08-16 14:28:32 +08:00
Daniel Pan
81b49a6e72
Merge pull request #4966 from haiwen/admin-import-users
filter out empty cell when admin import users from excel
2021-08-16 09:49:29 +08:00
Daniel Pan
d38a93f04d
Merge pull request #4971 from haiwen/2fa-site-name
use SITE_NAME as issuer for 2fa
2021-08-16 09:47:44 +08:00
Daniel Pan
a6d747a728
Merge pull request #4970 from haiwen/system-notification
update system notification
2021-08-16 09:44:33 +08:00
Daniel Pan
b8f36e6517
Merge pull request #4965 from haiwen/change-password
hide "Forgot password?" when not ENABLE_CHANGE_PASSWORD
2021-08-14 08:47:52 +08:00
Daniel Pan
6cd47ca041
Merge pull request #4964 from haiwen/share-link-password
update create share/upload link
2021-08-14 08:46:09 +08:00
lian
521175b148 filter out empty cell when admin import users from excel 2021-08-12 16:25:53 +08:00
lian
a44c9a3d1e update test 2021-08-12 15:49:10 +08:00
lian
d7c6be0865 hide "Forgot password?" when not ENABLE_CHANGE_PASSWORD 2021-08-12 15:31:34 +08:00
lian
8e78d73b53 update create share/upload link
add SHARE_LINK_FORCE_USE_PASSWORD and SHARE_LINK_PASSWORD_STRENGTH_LEVEL
2021-08-12 15:02:03 +08:00
lian
01f9b4ab85 update system notification 2021-08-06 17:15:53 +08:00
Daniel Pan
88376a91ec
Merge pull request #4962 from haiwen/image-view-fixup
[dir view] fixup for 'image view' in 'column mode'
2021-08-06 15:16:17 +08:00
llj
3462473cdb [dir view] fixup for 'image view' in 'column mode' 2021-08-06 14:52:59 +08:00
lian
32ecda5ee3 Merge branch '8.0' into master 2021-08-06 13:07:36 +08:00
lian
73fd93dd07 Merge branch '7.1' into 8.0 2021-08-06 13:07:17 +08:00
Daniel Pan
3752bc5b84
Merge pull request #4961 from haiwen/cache-key-length
use sha1 encrypted str as cache key
2021-08-06 12:21:10 +08:00
lian
c567a8cab6 use sha1 encrypted str as cache key 2021-08-06 11:53:58 +08:00