haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-30 12:56:46 +00:00
Code Issues Releases Wiki Activity
10,648 Commits 142 Branches 460 Tags 2.8 GiB
5958d7e91e
Commit Graph

10648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
5958d7e91e
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>
 2020-12-25 18:23:42 +08:00
llj
29ee396805
[help] update (#4770) 2020-12-25 18:16:54 +08:00
llj
f0f504111f
[l10n] updated .po files (#4769) 2020-12-25 17:12:05 +08:00
lian
e282331de9
user is_pro_version instead of is_seafile_pro (#4767) 
Co-authored-by: lian <lian@seafile.com>
 2020-12-24 21:45:59 +08:00
llj
969ed7d7f6
Help (#4768) 
* [help] modified the text

* [help] modified the text

* [help] removed linux related pages

* [help] modification
 2020-12-24 20:21:12 +08:00
songjiaqi1
6e0b04ccfc
fix upload image (#4766) 2020-12-24 15:20:01 +08:00
杨顺强
dd0515cd99
optimize code (#4762) 2020-12-22 12:04:03 +08:00
杨顺强
cf4abe5e3e
Optimize css (#4760) 
* optimize code

* optimize css

* update seafile-editor font

* revert back to default
 2020-12-21 16:21:51 +08:00
llj
8fd7064627
[help] i18n: fixup (#4759) 2020-12-21 14:51:23 +08:00
杨顺强
41cbd10722
update seafile-editor version (#4758) 2020-12-21 11:34:48 +08:00
llj
c5f5051cea
Fixup (#4756) 
* [create repo] fixup for 'template'

* [auto deletion] fixup

* [file upload] fixup

* fixup
 2020-12-17 18:03:21 +08:00
llj
c0e40076d4
Ocm frontend (#4754) 
* [OCM] modified the icon in 'side nav'

* [OCM] share dialog: improved 'Server select', 'user input', 'submit' and etc.

* [OCM] share dialog: fixup & improvement for 'delete an item' and etc.

* [OCM] 'Shared from other servers' page: fixup & improvement

* [OCM] dir view: fixup & improvement
 2020-12-17 15:17:18 +08:00
lian
6281cd77ac
update office lock logic (#4753) 
can only preview file even if locked by me

Co-authored-by: lian <lian@seafile.com>
 2020-12-16 17:45:23 +08:00
杨顺强
873c49d30e
Upgrade webpack 2 (#4748) 
* update webpack to version 4

* repair build bug

* update package code

* optimize package script

* update seafile-editor version

* repair code bug
 2020-12-15 18:00:39 +08:00
lian
030fa283cb
update .github/workflows/test.yml (#4750) 
Co-authored-by: lian <lian@seafile.com>
 2020-12-15 13:18:57 +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
杨顺强
b22f90f2e8
Upgrade webpack (#4746) 
* optimize code

* optimize code

* optimize code

* optimize dependences

* optimize code
 2020-12-11 16:11:25 +08:00
shanshuirenjia
bc71331666 update seafile-editor version 2020-12-07 17:45:43 +08:00
shanshuirenjia
21be6e4fe2 upddate package.json 2020-12-07 17:19:51 +08:00
欢乐马
93aa7debb4
add ocm sql (#4741) 2020-12-07 16:54:12 +08:00
shanshuirenjia
2b782a5663 Merge branch '7.1' 2020-12-04 14:15:11 +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
8128c8c0b6 update frontend/package-lock.json 2020-12-03 12:05:44 +08:00
lian
ee6cccf806 Merge branch '7.1' into master 2020-12-03 12:03:51 +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
lian
98903f940f return members when admin get address book group 2020-11-30 14:25:32 +08:00
lian
b52eefd46b update dingtalk contact email 2020-11-30 14:18:59 +08:00
lian
cca6bcf6ff
return org group quota usage (#4730) 
Co-authored-by: lian <lian@seafile.com>
 2020-11-29 11:13:53 +08:00
lian
e3fd4091f6
remove unused rest_framework files (#4729) 
* remove unused rest_framework files

* update

Co-authored-by: lian <lian@seafile.com>
 2020-11-26 21:15:16 +08:00
songjiaqi1
3d21ad6407
update editor (#4728) 2020-11-26 17:40:02 +08:00
lian
3c09c81ddb convert login id to email before authenticate 2020-11-26 17:36:50 +08:00
lian
3fd6f0f68b convert login id to email before authenticate 2020-11-26 17:33:38 +08:00
lian
f130ecdfa8
convert login id to email before authenticate (#4725) 
Co-authored-by: lian <lian@seafile.com>
 2020-11-26 17:27:32 +08:00
lian
1be91b6887
add id parameter to front page; (#4727) 
Co-authored-by: lian <lian@seafile.com>
 2020-11-26 17:26:22 +08:00
lian
82266a58cd return salt when repo.enc_version >= 3 2020-11-26 16:55:27 +08:00
王健辉
fffcc8e939 Merge branch '7.1' 2020-11-26 14:50:57 +08:00
王健辉
ceaa7660c7
improve check_user_quota (#4726) 2020-11-26 12:00:02 +08:00
lian
d8b4ebbe6f update server-info api 
update encrypted_library_version
 2020-11-26 10:38:33 +08:00
lian
1924f81221 update server-info api 
update encrypted_library_version
 2020-11-26 10:37:38 +08:00
lian
7241087242 remove unused code in lib-content-toolbar.js 2020-11-25 15:06:21 +08:00
lian
c0669d4ad8 Merge branch '7.1' into master 2020-11-25 15:05:57 +08:00
欢乐马
9c143c31b8
remove sha1 for centos (#4724) 2020-11-20 18:23:08 +08:00
lian
cae1204ab1
support LIBRARY_TEMPLATES (#4723) 
Co-authored-by: lian <lian@seafile.com>
 2020-11-20 10:08:49 +08:00
llj
87a80eadc5
[markdown] improved 'print' (#4722) 
* when the right panel is open, make the print be ok
* print all the pages in Firefox
 2020-11-19 15:58:43 +08:00
王健辉
019dd8ddb9
Merge pull request #4692 from haiwen/fix-django-syntax 
fix django syntax
 2020-11-19 15:32:07 +08:00