1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-28 03:31:23 +00:00
Commit Graph

10618 Commits

Author SHA1 Message Date
Daniel Pan
a6ac0e28b6
Merge pull request #4896 from haiwen/office-convert-jwt
pyjwt==2.1.*
2021-05-11 13:35:07 +08:00
lian
4cbc5a9346 pyjwt==2.1.* 2021-05-11 11:44:32 +08:00
Daniel Pan
f1d458a6f9
Merge pull request #4894 from haiwen/repo-owner
use get_repo_owner func when check if is department admin
2021-05-07 13:06:12 +08:00
lian
22226e451e use get_repo_owner func when check if is department admin 2021-05-06 18:18:26 +08:00
Daniel Pan
d2bfe815fe
Merge pull request #4888 from haiwen/onlyoffice-cache
remove cache delete ONLYOFFICE_doc_key when onlyoffice save file
2021-04-25 09:39:43 +08:00
lian
41550698ef remove cache delete ONLYOFFICE_doc_key when onlyoffice save file 2021-04-23 18:14:06 +08:00
Daniel Pan
a894121e13
Merge pull request #4886 from haiwen/import-time
update location of "import"
2021-04-23 16:25:38 +08:00
Daniel Pan
44adf70056
Merge pull request #4885 from haiwen/lock_file
pass expire parameter when lock file
2021-04-23 16:24:36 +08:00
Daniel Pan
fbc638af4e
Merge pull request #4887 from haiwen/get-dir-size
remove get_dir_size
2021-04-23 16:15:59 +08:00
lian
256bf3a805 remove get_dir_size 2021-04-23 14:05:11 +08:00
lian
dd2f0f0fdd update location of "import" 2021-04-23 13:44:04 +08:00
lian
0607892f3d pass expire parameter when lock file 2021-04-23 13:43:27 +08:00
Daniel Pan
5ef46b500a
Merge pull request #4870 from haiwen/repair-notification-xss-bug
repair notification xss bug
2021-04-14 21:03:09 +08:00
shanshuirenjia
187d565682 repair notification xss bug 2021-04-14 16:31:48 +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
d7c163b8a7
thirdparty editor (#4828)
Co-authored-by: lian <lian@seafile.com>
2021-03-20 16:22:43 +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
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
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
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
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
4173aa6540 [seafile-js] updated the version 2021-02-09 15:13:45 +08:00
lian
f86d164d17 ONLYOFFICE_DESKTOP_EDITORS_PORTAL_LOGIN 2021-02-02 10:22:01 +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
bd457180a0 show img thumbnail when search file 2021-01-26 17:02:04 +08:00
lian
708b3ee259 update show UNLOCK icon logic 2021-01-26 16:54:12 +08:00
lian
cbf12f9ed9
show last access time on admin users page (#4795)
Co-authored-by: lian <lian@seafile.com>
2021-01-22 10:41:58 +08:00
lian
7994fafd90
show img thumbnail when search file (#4792)
Co-authored-by: lian <lian@seafile.com>
2021-01-21 11:51:16 +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
lian
0853bade7c check if user in db or ldapimport when User.objects.save() 2021-01-15 16:43:06 +08:00
lian
e7be08810a
use get_emailuser_with_import when check if user exists (#4787)
Co-authored-by: lian <lian@seafile.com>
2021-01-13 21:34:40 +08:00
lian
d75beba8bd
update LOGOUT_URL; (#4785)
Co-authored-by: lian <lian@seafile.com>
2021-01-12 16:19:38 +08:00
llj
3600537e12
Mobile visit item (#4779)
* [mobile] my libs: improved 'visit repo'

* [mobile] dir view: improved 'visit dirent'

* [mobile] shared with me: improved 'visit repo'

* [mobile] group, groups, shared with all: improved 'visit repo'

* [mobile] starred: improved 'visit item'
2021-01-09 18:36:26 +08:00
llj
2679355ee8
['about' dialog] modified the year (#4781) 2021-01-09 18:24:07 +08:00
llj
e8ce4305bb
[system admin / orgs] org: show department name in 'owner' column for libraries belong to departments (#4738) 2020-12-10 14:31:24 +08:00
llj
f5d399cc4f
[dir view] enable 'copy multiple selected folders/files' in 'read-only' libraries (#4743) 2020-12-10 14:25:43 +08:00
杨顺强
2a6faa5208
fix: update window.open function for integrate to onlyoffice (#4742) 2020-12-10 11:30:16 +08:00
lian
c0d60d4497
process next parameter when login via simple check (#4737)
Co-authored-by: lian <lian@seafile.com>
2020-12-04 14:19:02 +08:00
llj
3d79d9fad8
[system admin / logs] file access: added 'filter by user / library' (#4731) 2020-12-04 14:18:34 +08:00
杨顺强
9c11444518
Merge pull request #4739 from haiwen/update-seafile-js-162
update seafile-js version
2020-12-04 14:13:12 +08:00
shanshuirenjia
e8911f4974 update seafile-js version 2020-12-04 14:09:29 +08:00
lian
a49af79323
update admin org repos api (#4736)
use group_name as owner_name for group owned repos

Co-authored-by: lian <lian@seafile.com>
2020-12-04 13:54:30 +08:00
lian
f0d8c00656
fix bug when org user transfer repo to department (#4735)
Co-authored-by: lian <lian@seafile.com>
2020-12-02 21:32:01 +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
杨顺强
248fe2e1f0
update seafile-js version (#4733) 2020-12-01 10:24:15 +08:00
lian
373565654f
update has_next_page when admin get file access log (#4732)
Co-authored-by: lian <lian@seafile.com>
2020-11-30 16:43:28 +08:00