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

10326 Commits

Author SHA1 Message Date
王健辉
fba6a7f9bf
Merge pull request #3496 from haiwen/fix-file-history-bug
Fix file history bug
2019-05-18 20:38:21 +08:00
王健辉
a9e0397b77 fix code 2019-05-18 20:27:07 +08:00
Daniel Pan
5c2cbe827e
Merge pull request #3495 from haiwen/restored-library-activity
restored library activity
2019-05-18 16:33:57 +08:00
王健辉
506286bf05 restored library activity 2019-05-18 15:57:32 +08:00
lian
3ac3956251 enable wiki 2019-05-18 13:32:03 +08:00
lian
d2f468d181 update travis yml file
add 7.0 branch
2019-05-18 13:31:40 +08:00
Daniel Pan
e82fb2d991
Merge pull request #3492 from haiwen/env-improve
add hash for package module
2019-05-18 11:24:33 +08:00
shanshuirenjia
db37499fea add hash for package module 2019-05-18 11:18:25 +08:00
lian
c22eee6c7b update logic of can_preview_file func
check if HAS_OFFICE_CONVERTER
2019-05-17 18:07:29 +08:00
Daniel Pan
2b08c6bbb0
Merge pull request #3491 from haiwen/folder-perm
[folder permission] modification for folder in department repo
2019-05-17 17:14:02 +08:00
王健辉
ba2ac6ca49 repo-status-interface 2019-05-17 16:30:56 +08:00
Daniel Pan
fb0c71a5ee
Merge pull request #3490 from haiwen/view-dir-bug-repair
repair code error
2019-05-17 16:09:21 +08:00
shanshuirenjia
8eede90d59 repair code error 2019-05-17 16:04:42 +08:00
llj
553fe1001f [folder permission] modification for folder in department repo 2019-05-17 15:53:59 +08:00
Daniel Pan
289d791ef5
Merge pull request #3488 from haiwen/repire_starr_bug
Give hint when permission is not enough
2019-05-17 15:17:49 +08:00
zxj96
cf5894503d Give hint when permission is not enough 2019-05-17 14:47:06 +08:00
Daniel Pan
a8533a9a7d
Merge pull request #3487 from haiwen/repire_enter
Fix bug when fixing enter
2019-05-17 14:25:29 +08:00
zxj96
94246d1d67 Fix bug when fixing enter 2019-05-17 14:17:52 +08:00
王健辉
75954dbf93 repo status 2019-05-17 14:07:01 +08:00
Daniel Pan
375e6bcb3c
Merge pull request #3486 from haiwen/text-type-bug-repair
repair code bug
2019-05-17 13:58:49 +08:00
shanshuirenjia
c31b8793c6 repair code bug 2019-05-17 13:54:19 +08:00
Daniel Pan
53a6926b23
Merge pull request #3481 from haiwen/repire_empty_name
Fix a bug created when the name is empty
2019-05-17 11:32:20 +08:00
Daniel Pan
96923d49ea
Merge pull request #3485 from haiwen/share-dialog
hide send share button when press delete link button
2019-05-17 11:20:34 +08:00
lian
50a17a4e2f update .po files 2019-05-17 11:18:49 +08:00
Michael An
61282ab0a9 hide send share btn when press delete link btn 2019-05-17 11:14:40 +08:00
zxj96
e538bbc284 Add new-wiki-dialog.js 2019-05-17 11:11:59 +08:00
zxj96
d70051f087 When it is empty, submit btn is disabled 2019-05-17 11:09:05 +08:00
Daniel Pan
9ac18635b5
Merge pull request #3482 from haiwen/update-sf
update Seafile js and Seafile editor
2019-05-17 11:05:07 +08:00
Daniel Pan
5cd000ecd3
Merge pull request #3484 from haiwen/translation
modify translation content
2019-05-17 10:57:32 +08:00
Michael An
bef5ac0d3c update Seafile js and Seafile editor 2019-05-17 10:56:18 +08:00
zxj96
a35a0e8abc modify translation content 2019-05-17 10:55:21 +08:00
Daniel Pan
f98cb5d30a
Merge pull request #3483 from haiwen/repo-rpc
update parameter call of seafile api
2019-05-17 10:53:10 +08:00
lian
d19b07d277 update parameter call of seafile api
create_org_repo(self, name, desc, username, org_id, passwd=None, enc_version=2)
create_org_enc_repo(self, repo_id, name, desc, username, magic, random_key, salt, enc_version, org_id)
add_group_owned_repo (self, group_id, name, permission, passwd=None, enc_version=2, storage_id = None)
org_add_group_owned_repo (self, org_id, group_id, name, permission, passwd=None, enc_version=2)
2019-05-17 10:45:40 +08:00
Daniel Pan
19a9a2ce35
Merge pull request #3476 from haiwen/folder-perm
Folder perm
2019-05-17 10:09:42 +08:00
zxj96
398c9f3f96 Fix a bug created when the name is empty 2019-05-17 10:01:57 +08:00
llj
32eac3f826 [folder perm] modification for department repo 2019-05-17 09:14:26 +08:00
Daniel Pan
0f5f6608c6
Merge pull request #3480 from haiwen/fix-file-history-bug
fix bug
2019-05-16 20:00:51 +08:00
王健辉
2c9aeddb2e fix bug 2019-05-16 19:05:49 +08:00
Daniel Pan
b4bc5aa891
Merge pull request #3479 from haiwen/user-setting-m
[user setting] modification
2019-05-16 18:29:46 +08:00
Daniel Pan
fbe27af9ee
Merge pull request #3477 from haiwen/share-password-bug-repair
repair share bug
2019-05-16 18:26:25 +08:00
llj
4f38429d35 [user setting] modification 2019-05-16 18:23:26 +08:00
Daniel Pan
ecd62b1a0d
Merge pull request #3478 from haiwen/system-admin
[system admin] modified text
2019-05-16 18:17:33 +08:00
llj
30f7439271 [system admin] modified text 2019-05-16 18:14:05 +08:00
shanshuirenjia
48274456a2 repair share bug 2019-05-16 18:13:57 +08:00
llj
31a5e955cc [folder perm] added it for department repo 2019-05-16 17:28:04 +08:00
Daniel Pan
c2ff293ec4
Merge pull request #3474 from haiwen/file-view
[file view] removed 'open via client'
2019-05-16 17:19:09 +08:00
lian
488da88189 update .po file 2019-05-16 14:24:41 +08:00
llj
8f54bbf6ff [department] folder permission 2019-05-16 14:19:55 +08:00
lian
8af98dc2cd
support encrypted library v3 (#3455) 2019-05-16 14:09:31 +08:00
Daniel Pan
bb7c3f563d
Merge pull request #3473 from haiwen/update-package-script
repair 'call' undefine bug
2019-05-16 13:59:15 +08:00