1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-07 01:41:39 +00:00
Commit Graph

10919 Commits

Author SHA1 Message Date
llj
a3342df76a [system admin] statistic/traffic: modified 'order_by' value according to python API, for sort of users/orgs traffic (#4691) 2020-10-13 11:45:08 +08:00
lian
62c2f0bc9e update for dev env (#4690)
Co-authored-by: lian <lian@seafile.com>
2020-10-10 16:05:33 +08:00
lian
57c8fa967c custom shibboleth get user role (#4689)
Co-authored-by: lian <lian@seafile.com>
2020-10-10 15:40:57 +08:00
lian
0bff0c1104 Merge branch '7.1' into master 2020-09-30 11:05:44 +08:00
lian
1241f21462 add token by session api (#4686)
Co-authored-by: lian <lian@seafile.com>
2020-09-29 11:52:28 +08:00
lian
8aa6081206 djangorestframework==3.11.1 (#4687)
Co-authored-by: lian <lian@seafile.com>
2020-09-29 11:43:04 +08:00
lian
3474e0f6fa update permission check logic when view lib (#4685)
Co-authored-by: lian <lian@seafile.com>
2020-09-29 11:23:56 +08:00
杨顺强
0c10f4a9f7 update seafile-js version (#4684) 2020-09-28 10:52:12 +08:00
llj
39078da3f9 [Linked Devices] added confirmation for 'unlink device' (#4683) 2020-09-28 10:44:12 +08:00
llj
b86f0af855 [system admin / logs / Permission] fixup for 'Share To' (#4680) 2020-09-24 16:54:49 +08:00
lian
40907e2770 update share-permission-logs api (#4679)
Co-authored-by: lian <lian@seafile.com>
2020-09-24 16:54:33 +08:00
llj
44c20e5bc7 [org admin / users] fixup for sort by 'Space Used' (#4682) 2020-09-24 16:53:55 +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
lian
98ca2dfaa1 fix reference_id bug when admin update user info (#4681)
Co-authored-by: lian <lian@seafile.com>
2020-09-23 15:14:07 +08:00
杨顺强
41f5f2eb84 update seafile-js version (#4678) 2020-09-22 14:17:30 +08:00
llj
7474616129 [system admin] statistic/traffic: fixed sort for users/orgs traffic (#4677) 2020-09-22 14:03:58 +08:00
lian
d719fc1c90 add order_by parameter when admin get user/org traffic (#4676)
Co-authored-by: lian <lian@seafile.com>
2020-09-22 14:03:13 +08:00
llj
559702fc57 [org admin] add user: fixed 'can not input space in name input' (#4675) 2020-09-19 20:49:12 +08:00
llj
ffd66a78f1 [department] added 'change password' & 'reset password' for encrypted repo (#4674) 2020-09-19 20:48:02 +08:00
lian
d2e79aee73 support to change/reset password for department repo (#4673)
Co-authored-by: lian <lian@seafile.com>
2020-09-19 20:47:43 +08:00
杨顺强
aea4e3c042 update copyright (#4672) 2020-09-17 14:48:29 +08:00
lian
dafd66b18d use onlyoffice jwt token (#4671)
Co-authored-by: lian <lian@seafile.com>
2020-09-17 13:43:30 +08:00
Leo
f6efead60b update (#4669) 2020-09-11 12:16:50 +08:00
Leo
5942b51673 update-version (#4668) 2020-09-11 11:26:43 +08:00
lian
141121f5af Merge branch '7.1' into master 2020-09-10 16:37:31 +08:00
lian
e66721c3be show org user's repo in admin user profile page (#4666)
Co-authored-by: lian <lian@seafile.com>
2020-09-09 10:37:01 +08:00
lian
949bdce5c1 encode("iso-8859-1") for shibboleth login (#4667)
Co-authored-by: lian <lian@seafile.com>
2020-09-09 10:36:27 +08:00
Leo
2d1753f1d9 update (#4665) 2020-09-07 13:43:55 +08:00
Leo
d5f578318f repo_files_auto_del (#4626)
* repo_files_auto_del

* repo_files_auto_del

* update code
2020-09-07 12:03:05 +08:00
sniper-py
212e667206 fix authenticate (#4660) 2020-09-02 14:59:22 +08:00
lian
1d85acbc07 catch exception when list share links (#4658)
Co-authored-by: lian <lian@seafile.com>
2020-08-29 11:48:23 +08:00
llj
7a4c3e5407 [file access] modified path link href to fix some problem (#4659) 2020-08-29 11:44:32 +08:00
lian
af50cbf9a2 disable rest_framework.renderers.BrowsableAPIRenderer (#4657)
Co-authored-by: lian <lian@seafile.com>
2020-08-26 11:12:28 +08:00
王健辉
20ada50956 add try (#4656) 2020-08-25 15:58:07 +08:00
llj
2f49e2605b [group] fixup (#4655) 2020-08-25 14:54:19 +08:00
lian
6ed24ef254 Merge branch '7.1' into master 2020-08-19 14:01:17 +08:00
lian
230bd5732d only check group name in org when create group in org (#4653)
Co-authored-by: lian <lian@seafile.com>
2020-08-18 20:20:41 +08:00
lian
685ee2c21a fix bug when get repo api token (#4652)
Co-authored-by: lian <lian@seafile.com>
2020-08-18 17:33:31 +08:00
llj
b2f6bb35de updated the version of seafile-js 2020-08-18 10:41:47 +08:00
llj
5477da9d57 [shared file, file in shared dir view] use new api for file 'save as' (#4650) 2020-08-18 10:30:08 +08:00
lian
ab21b424b5 add share link save file to rpeo api (#4636)
Co-authored-by: lian <lian@seafile.com>
2020-08-18 10:29:44 +08:00
llj
483c6fc5c3 [group] added 'load more repos' (#4649) 2020-08-17 11:53:33 +08:00
lian
e9c2e5c76e support pagination when get group repos (#4642)
Co-authored-by: lian <lian@seafile.com>
2020-08-17 11:53:05 +08:00
lian
dcff1ff5e1 update dir shared item api (#4648)
* update dir shared item api

return contact_email and avatar_url field

* [share dialog] share to user: show avatar & user details popover for shared user

Co-authored-by: lian <lian@seafile.com>
Co-authored-by: llj <lingjun.li1@gmail.com>
2020-08-14 14:47:42 +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
0afbc39c4a update the version of seafile-js 2020-08-07 17:38:28 +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
杨顺强
a74e7e5dd5 update seafile-js version (#4639)
* update seafile-js version

* update seafile-js version
2020-08-07 10:42:55 +08:00
llj
ec3d7434f2 [file share] fixup for 'internal link' (#4637) 2020-08-04 07:37:58 +08:00
王健辉
c86ec2fbb2 update other language translation (#4630) 2020-07-28 10:24:56 +08:00