1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 16:04:01 +00:00
Commit Graph

11715 Commits

Author SHA1 Message Date
Daniel Pan
c7f9d30d5d
Merge pull request #4999 from haiwen/sql-9.0
sql-9.0 mysql
2021-10-11 10:27:45 +08:00
skywalker
91aa9377a6 sql-9.0 sqlite 2021-10-09 22:44:50 +08:00
skywalker
5ac6baf575 sql-9.0 mysql 2021-10-09 22:06:22 +08:00
lian
b5d286a413 [OCM] update permission check 2021-10-09 16:54:41 +08:00
Moritz Schlarb
46c6ee9017 Add SITE_DESCRIPTION config variable
Which gets used in the html header <meta name="description" ... /> tag.
2021-10-01 11:35:05 +02:00
lian
ab2930a60b [OCM] fix bug when delete share 2021-09-30 15:50:37 +08:00
lian
9ded919a2f use allowed_hosts argument for is_safe_url func 2021-09-30 14:41:02 +08:00
lian
99b559da61 ocm receive shared folder 2021-09-30 13:44:47 +08:00
王健辉
5c6b5d9474 Merge branch '8.0' 2021-09-29 11:02:02 +08:00
Daniel Pan
a0f75a1dee
Merge pull request #4994 from haiwen/ocm-via-webdav
update
2021-09-28 10:19:10 +08:00
lian
aee169b3f2 receive share from other service 2021-09-27 17:47:08 +08:00
Daniel Pan
5f61dbdb48
Merge pull request #4991 from haiwen/office-preview-docker
office preview docker
2021-09-24 17:21:06 +08:00
skywalker
481e8a1d13 office preview not pro 2021-09-24 17:18:47 +08:00
skywalker
790fb1f5f4 remove office converter in seafevents 2021-09-24 17:03:44 +08:00
skywalker
7742fc3768 office preview docker 2021-09-24 14:35:22 +08:00
Daniel Pan
87e5a1aafd
Merge pull request #4993 from haiwen/repair-move-dirent-bug
repair code bug
2021-09-24 12:19:45 +08:00
shanshuirenjia
911add8bec repair code bug 2021-09-24 12:17:20 +08:00
Daniel Pan
7b4294e59a
Merge pull request #4992 from haiwen/remove-mo-files
remove *.mo files
2021-09-24 09:50:05 +08:00
王健辉
9dac22daec remove *.mo files 2021-09-23 18:24:34 +08:00
Daniel Pan
46fdbb282f
Merge pull request #4968 from haiwen/upgrade-django-to-3.2
upgrade django to 3.2
2021-09-22 12:07:42 +08:00
王健辉
3b154c76c1 merge seahub-extra & repair test 2021-09-22 11:42:06 +08:00
王健辉
e805feca95 upgrade django to 3.2 2021-09-22 10:41:26 +08:00
llj
45e2dd059a [seafile-js] updated the version 2021-09-22 10:21:18 +08:00
Daniel Pan
066d002635
Merge pull request #4984 from haiwen/seafile-onlyoffice-integration
Seafile onlyoffice integration
2021-09-22 10:10:08 +08:00
Daniel Pan
8d4eb7b643
Merge pull request #4988 from haiwen/support-for-cookie-samesite
support for SESSION_COOKIE_SAMESITE
2021-09-22 09:56:52 +08:00
王健辉
57e5a289fc support for SESSION_COOKIE_SAMESITE 2021-09-22 09:45:35 +08:00
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