haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity
11,241 Commits 148 Branches 463 Tags
b76cda34c2b3b397d02275f5e93260c65ccef17c
Commit Graph

256 Commits

Author SHA1 Message Date
shanshuirenjia
b76cda34c2 repair calander bug 2022-01-19 15:24:37 +08:00
shanshuirenjia
d885162cf5 update calendar default lang 2022-01-14 14:43:28 +08:00
Daniel Pan
f7c4f83fe2 Merge pull request #5020 from haiwen/random-password 
update utils.js
 2021-11-05 17:46:44 +08:00
lian
b6ef872f50 update utils.js 
generate random password
 2021-11-03 16:11:56 +08:00
llj
9cd52bb245 Merge branch '8.0' 
Conflicts:
	frontend/package.json
	frontend/src/components/dialog/manage-members-dialog.js
	frontend/src/css/manage-members-dialog.css
	frontend/src/utils/utils.js
 2021-11-02 11:41:41 +08:00
llj
a6470470d5 [group] added 'search group members' 
- 'search group members' is offered only when there are more than 10
members in the group
 2021-10-25 17:19:44 +08:00
llj
ce7f494d09 [rebase master] bugfix after rebasing master(handling conflicts) 2021-10-11 17:57:52 +08:00
llj
fb205f3c65 [a11y] share dialog: make tab panels accessible by keyboard 2021-10-11 17:11:48 +08:00
王健辉
5c6b5d9474 Merge branch '8.0' 2021-09-29 11:02:02 +08:00
lian
aee169b3f2 receive share from other service 2021-09-27 17:47:08 +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
王健辉
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
shanshuirenjia
e34e26cab5 repair visit file history bug 2021-08-31 11:28:39 +08:00
lian
d498f2a1a5 Merge branch '8.0' into master 2021-08-16 14:28:32 +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
llj
6bfd8cce96 [video thumbnail] display the thumbnails for some pages. 
- when 'video thumbnail' feature is enabled, display the thumbnails
  for 'dir view', 'starred(favorites)', 'file view', 'shared dir view'
  pages.
 2021-07-19 15:13:17 +08:00
lian
4388bca9ce Merge branch '8.0' into master 2021-07-13 12:11:52 +08:00
lian
5472974cc8 Revert "update LOGOUT_URL; (#4785)" 
This reverts commit d75beba8bd.
 2021-07-08 16:47:09 +08:00
Daniel Pan
a38eab49b8 Merge pull request #4799 from haiwen/use-go-fileserver 
use go fileserver
 2021-06-07 11:13:55 +08:00
lian
2405ba671e add GROUP_IMPORT_MEMBERS_EXTRA_MSG (#4835) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-17 16:43:10 +08:00
lian
c29a571826 Merge branch '7.1' into master 2021-02-05 11:55:34 +08:00
lian
708b3ee259 update show UNLOCK icon logic 2021-01-26 16:54:12 +08:00
lian
55c513bf22 use go fileserver 2021-01-22 18:31:53 +08:00
lian
c3c00e4abd repo owner and admin can unlock file (#4791) 
Co-authored-by: lian <lian@seafile.com>
 2021-01-15 18:07:27 +08:00
llj
2db2c08032 [department] added an option to control if libraries can be shared in… (#4778) 
* [department] added an option to control if libraries can be shared into a department

* update seahub web api

Co-authored-by: lian <lian@seafile.com>
 2021-01-13 14:11:35 +08:00
lian
d75beba8bd update LOGOUT_URL; (#4785) 
Co-authored-by: lian <lian@seafile.com>
 2021-01-12 16:19:38 +08:00
lian
42c7f25dfa ocm, add OCM_REMOTE_SERVERS (#4745) 
* ocm, add OCM_REMOTE_SERVERS

* update

Co-authored-by: lian <lian@seafile.com>
 2020-12-14 11:47:36 +08:00
lian
ee6cccf806 Merge branch '7.1' into master 2020-12-03 12:03:51 +08:00
lian
06b55feae6 add ABOUT_DIALOG_CUSTOM_HTML (#4734) 
Co-authored-by: lian <lian@seafile.com>
 2020-12-02 21:31:17 +08:00
lian
c0669d4ad8 Merge branch '7.1' into master 2020-11-25 15:05:57 +08:00
lian
cae1204ab1 support LIBRARY_TEMPLATES (#4723) 
Co-authored-by: lian <lian@seafile.com>
 2020-11-20 10:08:49 +08:00
llj
04f29704b3 [eslint] updated eslintrc and improved the code (#4702) 2020-11-02 13:56:35 +08:00
llj
7000c1f364 Share link file upload (#4633) 
* [share dialog] fixed permission bugs; added 'download and upload'
permission

* share link: fixed permission bug for library
* upload link: fixed permission bug
* share link: added 'download and upload' permission for folder

* [folder share link] added 'file upload' for folder share link with 'can_upload' permission
 2020-10-20 16:24:58 +08:00
lian
0bff0c1104 Merge branch '7.1' into master 2020-09-30 11:05:44 +08:00
Leo
267e9f525c Ocm (#4640) 
* ocm share local and inter-server api, ocm share page (#4335)

* ocm share

* optimize code

* ocm repo (#4341)

* ocm repo

* hide share if not repo owner

* optimize code

* fix All refresh page, hide upload if is r perm

* update permission check

* update return status code

* update code

* add receive user drop share
 2020-09-24 10:57:45 +08:00
llj
7474616129 [system admin] statistic/traffic: fixed sort for users/orgs traffic (#4677) 2020-09-22 14:03:58 +08:00
lian
6ed24ef254 Merge branch '7.1' into master 2020-08-19 14:01:17 +08:00
lian
12b200f3e1 enable show contact email when search user (#4641) 
* enable show contact email when search user

* [user-select] added new user option with email shown

Co-authored-by: lian <lian@seafile.com>
Co-authored-by: llj <lingjun.li1@gmail.com>
 2020-08-14 14:45:44 +08:00
llj
ef95810d4e [share] internal link: fixup for 'folder' (#4643) 
* make a member in a department can share a folder in a library of the
department, with internal link
 2020-08-07 15:36:03 +08:00
llj
ec3d7434f2 [file share] fixup for 'internal link' (#4637) 2020-08-04 07:37:58 +08:00
lian
01c9ddd695 add upload link expire days limit 2020-07-22 16:45:15 +08:00
llj
e55a602d57 Merge branch '7.1' 
Conflicts:
	frontend/src/pages/search/advanced-search.js
 2020-07-22 10:59:53 +08:00
llj
dccddea02f [share] offered 'internal link' for files and folders in encrypted libraries (#4621) 
* offered 'share' for encrypted library in 'dir view' page
 2020-07-21 11:16:33 +08:00
songjiaqi1
bd5cf9e579 Markdown editor update (#4604) 
* update markdown editor

* update markdown editor

* delete cdoc files
 2020-06-30 21:10:47 +08:00
llj
96bc07526b [share dialog] share link: changed default permission (#4530) 2020-04-14 17:16:48 +08:00
llj
605068cb7a [wiki markdown file] modified links in the file content (#4517) 
* only modified links of inserted files from the current library
 2020-04-08 16:51:21 +08:00
llj
4bc73a750d [side nav footer] added 'Terms' link (#4514) 2020-04-04 19:51:16 +08:00
shanshuirenjia
7e50035773 merge 7.0 2020-04-01 18:03:46 +08:00
杨顺强
07e9013c26 repair settings naming bug (#4510) 2020-04-01 17:55:59 +08:00
shanshuirenjia
e9f3f8ed2e conflict fixed 2020-04-01 11:19:09 +08:00