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

11715 Commits

Author SHA1 Message Date
Daniel Pan
4bbf5238f1
Merge pull request #5029 from haiwen/onlyoffice-co-editing-lock
enable co-editing for share link with can_edit permission
2021-11-12 11:18:28 +08:00
lian
9fc84d4e1e enable co-editing for share link with can_edit permission 2021-11-11 17:16:15 +08:00
王健辉
0f6f55d34e Merge branch '8.0' 2021-11-09 11:06:56 +08:00
Daniel Pan
0fdd596e73
Merge pull request #5021 from haiwen/onlyoffice-dockey
update onlyoffice callback view
2021-11-08 16:10:30 +08:00
lian
7001a87fb8 update 2021-11-08 15:41:09 +08:00
lian
6f2350c196 update 2021-11-08 14:50:18 +08:00
王健辉
adc2b4edf8
fix dist (#5024) 2021-11-08 11:15:14 +08:00
王健辉
10c3e63c70 Merge branch '8.0' 2021-11-08 11:04:17 +08:00
Daniel Pan
4a2d3ff3a1
Merge pull request #5023 from haiwen/update-8.0-translation
update 8.0 translation
2021-11-06 12:24:41 +08:00
Daniel Pan
7804183437
Merge pull request #5022 from haiwen/update-translation
update translation
2021-11-06 12:24:22 +08:00
王健辉
a2fec36d77 update 8.0 translation 2021-11-06 12:16:00 +08:00
王健辉
ba9ac69c9d update translation 2021-11-06 11:29:58 +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
d40082f675 update onlyoffice callback view
check doc key first
2021-11-05 16:20:06 +08:00
lian
b6ef872f50 update utils.js
generate random password
2021-11-03 16:11:56 +08:00
王健辉
2db67a06fa
fix dist error (#5019) 2021-11-03 14:56:11 +08:00
Daniel Pan
167b55c845
Merge pull request #5018 from haiwen/update-8.0-translation
update translation
2021-11-02 17:39:06 +08:00
王健辉
cb4621b912 update translation 2021-11-02 16:53:50 +08:00
Daniel Pan
ecd26cb0ba
Merge pull request #5017 from haiwen/update-translation
update translation
2021-11-02 16:20:15 +08:00
王健辉
cc8dcca704 update translation 2021-11-02 16:08:24 +08:00
Daniel Pan
3a3a493198
Merge pull request #5016 from haiwen/fix-docker-license
fix docker license
2021-11-02 12:20:18 +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
skywalker
baa8127967 fix docker license 2021-11-02 11:08:06 +08:00
Daniel Pan
4515b470c3
Merge pull request #5015 from haiwen/jwt-sso
add jwt sso
2021-11-01 11:54:48 +08:00
Daniel Pan
104008c1b1
Merge pull request #5013 from haiwen/update-seafile-js
update seafile-js version
2021-10-29 10:58:41 +08:00
shanshuirenjia
ac70e24687 update seafile-js version 2021-10-29 10:53:19 +08:00
Daniel Pan
9bcdc06409
Merge pull request #5005 from haiwen/search-group-member
search group member
2021-10-29 10:15:57 +08:00
llj
75c7cb86c6 [group] manage members: modified UI details 2021-10-27 16:58:37 +08:00
llj
5ef3750090 [group] redesigned the UI of 'search group members' button 2021-10-27 15:52:16 +08:00
Daniel Pan
abea10f385
Merge pull request #5012 from haiwen/cdoc-cleanup
[file view] cleaned up code for 'cdoc'(removed 'online view')
2021-10-27 13:23:45 +08:00
Daniel Pan
f1034c8a63
Merge pull request #5011 from haiwen/exact-last-update
[dir view] show exact 'last update' for folders and files
2021-10-27 13:23:15 +08:00
lian
222c4e26d6 add jwt sso 2021-10-27 12:28:35 +08:00
llj
a7226df7a8 [file view] cleaned up code for 'cdoc'(removed 'online view') 2021-10-26 16:14:08 +08:00
llj
2b01de64e0 [dir view] show exact 'last update' for folders and files 2021-10-26 11:59:33 +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
lian
7a75c32851 update admin group libs api
use department name as user name when list group repos on admin page
2021-10-22 10:05:49 +08:00
Daniel Pan
f7d3e66229
Merge pull request #5010 from haiwen/save-copy-qrcode
[share dialog] share link, upload link: added 'Save image' & 'Copy im…
2021-10-21 15:56:43 +08:00
llj
6914ae0ad9 [share dialog] share link, upload link: added 'Save image' & 'Copy image' for QR code 2021-10-21 14:44:54 +08:00
Daniel Pan
866ebe4588
Merge pull request #5009 from haiwen/pdf-viewer
[pdf viewer] use the latest PDFjs(v2.10.377)
2021-10-20 16:12:35 +08:00
llj
33401fcc35 [pdf viewer] use the latest PDFjs(v2.10.377)
- added 'loadingBar'
- show 'error info', 'password dialog' when needed
2021-10-20 15:22:21 +08:00
Daniel Pan
25138c0a78
Merge pull request #5008 from haiwen/title
remove escapejs when show title on wiki page
2021-10-18 15:23:50 +08:00
lian
9842a95d0c remove escapejs when show title on wiki page 2021-10-18 13:54:33 +08:00
Daniel Pan
0a2cdfda85
Merge pull request #5007 from haiwen/update-9.0-sql
update 9.0 sql
2021-10-15 14:48:43 +08:00
skywalker
1999dd1e69 update 9.0 sql 2021-10-15 14:24:28 +08:00
Daniel Pan
008489a4a6
Merge pull request #5006 from haiwen/onlyoffice-database
[onlyoffice] use database to store doc key
2021-10-15 11:52:43 +08:00
lian
83608b8e74 [onlyoffice] use database to store doc key 2021-10-15 11:12:13 +08:00
lian
63697c5793 update 2021-10-14 14:58:27 +08:00
lian
23dc12f6b0 search group member 2021-10-14 14:55:23 +08:00
Daniel Pan
1800689c90
Merge pull request #5004 from haiwen/admin-generate-token
add admin generate user auth token api
2021-10-14 14:04:10 +08:00
lian
2a6b89082f add admin generate user auth token api 2021-10-13 15:11:51 +08:00