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

12389 Commits

Author SHA1 Message Date
Daniel Pan
ad8da25133
Merge pull request #4862 from haiwen/8.0
8.0
2021-04-02 21:17:28 +08:00
songjiaqi1
973c9a978f
fix seahub button style (#4861) 2021-04-02 18:23:49 +08:00
llj
0f490fd85a
[system admin] department: fixed the 'op dropdown menu' for sub-department (#4860) 2021-04-01 20:40:08 +08:00
杨顺强
d4052aa966
repair upgrade bug (#4859) 2021-04-01 17:10:55 +08:00
杨顺强
be3c098e81
Update dependencies (#4857)
* update dependencies

* update seaile-editor version

* update seafile-js version
2021-03-31 15:27:24 +08:00
lian
6c1e9d21fe
fix bug when get repo history detail (#4855)
Co-authored-by: lian <lian@seafile.com>
2021-03-31 10:15:50 +08:00
lian
189387a27d update location of "import" 2021-03-30 18:13:09 +08:00
Alex Happy
c043c1c34c
add 'can_update_user' admin permission for subscription system admin (#4843) 2021-03-30 13:19:58 +08:00
王健辉
cb4d88d78f
upgrade translation (#4854) 2021-03-30 11:25:11 +08:00
llj
fdc6812839 [seafile-js] updated the version 2021-03-26 10:37:31 +08:00
Alex Happy
eca5a3b933
support collaborate notis interval (#4841)
* support collaborate notis interval

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* update text

* fix error msg
2021-03-25 21:44:58 +08:00
lian
855b457e5f
admin rename department (#4849)
* admin rename department

* update Code comment

* update group name validate msg

* [department] fixup: added 'add member' back

* [department] rename: fixup & improvements

* [system admin] departments: added 'rename' & 'op menu' for dept

Co-authored-by: lian <lian@seafile.com>
Co-authored-by: llj <lingjun.li1@gmail.com>
2021-03-25 21:41:55 +08:00
王健辉
1d108ae828
upgrade translation (#4848) 2021-03-23 14:30:43 +08:00
lian
327aceec52
update group name validate msg (#4847)
Co-authored-by: lian <lian@seafile.com>
2021-03-23 13:34:01 +08:00
lian
1a53d8c3cf Merge branch '7.1' into 8.0 2021-03-23 12:45:16 +08:00
lian
be075c2383
update trans (#4846)
Failed to send email, email service is not properly configured, please contact administrator.

Co-authored-by: lian <lian@seafile.com>
2021-03-23 12:40:03 +08:00
lian
568c0975f3 Merge branch '7.1' into 8.0 2021-03-23 11:03:01 +08:00
王健辉
717461809f
clean_db_records (#4845) 2021-03-22 10:32:41 +08:00
lian
d7c163b8a7
thirdparty editor (#4828)
Co-authored-by: lian <lian@seafile.com>
2021-03-20 16:22:43 +08:00
llj
06254447e4
File view op (#4836)
* [file view] added 'Details' & 'open via client'

* [file view] adjusted places of operations

* [file view] 'open via client': use a new icon

* [file view] 'open via client': updated the icon
2021-03-18 17:31:21 +08:00
lian
30e4ec65f7 update view lib file
not lock file when open file, let OOS server send lock request to lock file
2021-03-18 13:20:37 +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
b27d7cd11c
check if is pro when get user last access time (#4838)
Co-authored-by: lian <lian@seafile.com>
2021-03-17 16:27:01 +08:00
lian
59509d4f61
update test (#4837)
fix failed test

Co-authored-by: lian <lian@seafile.com>
2021-03-17 16:13:10 +08:00
lian
e747f8e6f1 Merge branch '7.1' into 8.0 2021-03-17 13:11:36 +08:00
lian
504c53f1c2
add ONLINE_OFFICE_LOCK_REFRESH_INTERVAL (#4826)
* unlock file when saving file via onlyoffice; (#4757)

* unlock file when saving file via onlyoffice

* add log when no doc_key in cache and locked by online office

Co-authored-by: lian <lian@seafile.com>

* update lock file logic when edit file via OnlyOffice

* update lock file logic when edit file via OOS

Co-authored-by: lian <lian@seafile.com>
2021-03-17 12:23:42 +08:00
杨顺强
9753ef57e8
repair development env bug (#4833) 2021-03-15 17:01:54 +08:00
lian
afe5bc19c0
update user ccnet email api (#4831)
Co-authored-by: lian <lian@seafile.com>
2021-03-14 13:50:54 +08:00
lian
0631b3cd95
support brackets when create group (#4830)
Co-authored-by: lian <lian@seafile.com>
2021-03-12 16:35:57 +08:00
lian
ae8e1ac849
search user by login id (#4823)
Co-authored-by: lian <lian@seafile.com>
2021-03-02 21:24:50 +08:00
lian
ff13113391
send to contact email when user forget password on login page (#4822)
Co-authored-by: lian <lian@seafile.com>
2021-03-02 15:53:44 +08:00
王健辉
73a2468082 dist 8.0 2021-03-01 11:54:54 +08:00
lian
33760eb644 Merge branch '7.1' into 8.0 2021-03-01 11:21:56 +08:00
lian
e830b069b6
custom role when sso login (#4815)
Co-authored-by: lian <lian@seafile.com>
2021-02-25 12:18:35 +08:00
lian
032319e891
shib user (#4820)
use username in lowercase when check if user alread exists

Co-authored-by: lian <lian@seafile.com>
2021-02-23 15:17:42 +08:00
lian
3ffd697a8b
ENABLE_SHARE_TO_DEPARTMENT = True (#4819)
Co-authored-by: lian <lian@seafile.com>
2021-02-22 10:09:46 +08:00
llj
2e89577990 Merge branch '7.1' 2021-02-10 10:35:12 +08:00
llj
0a9bd97c6a [seafile-js] updated the version 2021-02-10 10:19:46 +08:00
lian
72678fbe8f
import group members (#4814)
Co-authored-by: lian <lian@seafile.com>
2021-02-10 09:59:32 +08:00
llj
5ed88417d5 [seafile-js] updated the version 2021-02-09 15:19:31 +08:00
llj
4173aa6540 [seafile-js] updated the version 2021-02-09 15:13:45 +08:00
llj
c281e5d117
[share dialog] fixed 'QR code icon' for 'markdown file view' (#4813) 2021-02-07 11:59:59 +08:00
lian
632e98ccd6
upload file in encrypted upload link page (#4810)
Co-authored-by: lian <lian@seafile.com>
2021-02-05 14:10:31 +08:00
lian
c29a571826 Merge branch '7.1' into master 2021-02-05 11:55:34 +08:00
lian
f86d164d17 ONLYOFFICE_DESKTOP_EDITORS_PORTAL_LOGIN 2021-02-02 10:22:01 +08:00
llj
1cb10e4dd5
[CE] search: added auto focus for the input (#4809) 2021-02-01 20:57:32 +08:00
lian
ab29326568
not use post_office (#4806)
* not use post_office

* update requirements.txt

Co-authored-by: lian <lian@seafile.com>
2021-01-30 10:23:34 +08:00
llj
a0a3628a8e [seafile-js] updated the version 2021-01-28 14:36:21 +08:00
llj
3b2fb53268
Group manage member (#4805)
* [group manage members] added 'scroll to load more members'

* [group manage members] fixup for 'add/delete/modify member'
2021-01-28 14:20:37 +08:00
lian
a79d9327cb
permission check when user list dirent in received repo (#4804)
Co-authored-by: lian <lian@seafile.com>
2021-01-27 14:17:00 +08:00