1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-30 12:56:46 +00:00
Commit Graph

12389 Commits

Author SHA1 Message Date
王健辉
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
llj
d3b6789cfa [user setting] modified 'language setting' 2019-05-16 13:53:43 +08:00
shanshuirenjia
deea2ac717 update package script 2019-05-16 13:49:33 +08:00
llj
057917126e [file view] removed 'open via client' 2019-05-16 12:25:12 +08:00
shanshuirenjia
5581b9c1b3 repair 'call' undefine bug 2019-05-16 11:48:19 +08:00
Daniel Pan
56cdd087b2
Merge pull request #3468 from haiwen/fix-translation
Fix warnings in org page
2019-05-16 11:38:29 +08:00
Daniel Pan
080bd26998
Merge pull request #3472 from haiwen/share-link-new-file-bug
repair new file bug
2019-05-15 21:02:41 +08:00
shanshuirenjia
a262e06d3f repair new file bug 2019-05-15 18:43:40 +08:00
Michael An
e7f3ef027a fix org page warnings 2019-05-15 18:31:18 +08:00
Michael An
93a99421bc fix translation and warnings 2019-05-15 18:31:17 +08:00
Daniel Pan
9221d2a7e2
Merge pull request #3471 from haiwen/dl-fixup
[shared file view] fixed download url for file from shared dir
2019-05-15 18:31:01 +08:00
llj
f187c101c8 [shared file view] fixed download url for file from shared dir 2019-05-15 18:24:20 +08:00
Daniel Pan
7adccf7ee0
Merge pull request #3470 from haiwen/search-page
press submit btn then collapse advanced-search
2019-05-15 17:57:22 +08:00
Michael An
1e96ce74e1 press submit btn then collapse advanced-search 2019-05-15 17:52:31 +08:00
Daniel Pan
126a61b784
Merge pull request #3469 from haiwen/share-admin-bug-repair
share admin bug repair
2019-05-15 17:44:50 +08:00
shanshuirenjia
993bff6054 share admin bug repair 2019-05-15 17:40:28 +08:00
Daniel Pan
944bd84b42
Merge pull request #3465 from haiwen/file-view-ui
[file view] modified UI
2019-05-15 17:30:39 +08:00
Daniel Pan
1af4f60c3d
Merge pull request #3464 from haiwen/email-notice-text
[user settings] email notice: added explanation
2019-05-15 17:27:04 +08:00
Daniel Pan
abb6e62710
Merge pull request #3466 from haiwen/wiki-published
fix warning of namespace "wiki" is not unique
2019-05-15 17:17:26 +08:00
lian
858c5f3c45 fix warning of namespace "wiki" is not unique 2019-05-15 17:16:47 +08:00
llj
a189369fe5 [file view] modified UI 2019-05-15 16:13:11 +08:00
llj
f9a09e17b6 [user settings] email notice: added explanation 2019-05-15 15:45:34 +08:00
Daniel Pan
aa5ad1f8b0
Merge pull request #3463 from haiwen/folder-perm-fixup
[folder permission] group permission: fixup for 'edit perm'
2019-05-15 15:14:21 +08:00
llj
04b1083594 [folder permission] group permission: fixup for 'edit perm' 2019-05-15 15:06:43 +08:00
Daniel Pan
5b827aec8c
update seafile-js (#3462) 2019-05-15 13:54:52 +08:00
lian
689c7df2cc update .po file 2019-05-15 13:54:26 +08:00
Michael An
716f4078c5 update seafile-js 2019-05-15 13:48:38 +08:00
Michael An
7050e48ec0 translation (#3461) 2019-05-15 12:22:11 +08:00
ilearnit
3a84040870 add sub-folder permission (#3354)
* add sub-folder permission

* [folder permission] fixup
2019-05-15 08:01:48 +08:00
Michael An
4eb2533123 update version (#3459) 2019-05-14 17:01:31 +08:00
zxj96
b5bd705516 Open the edit page when the content is not empty (#3458)
* Open the edit page when the content is not empty

* Use size instead of content

* change func name

* Replace getMarkdownSize with showColumnMarkdownFile
2019-05-14 16:58:59 +08:00
Michael An
b266592463 add send share email (#3457) 2019-05-14 16:38:43 +08:00
lian
d2fcf7f69a update wopi file info api (#3431)
return last modified time field
2019-05-14 14:04:43 +08:00
sniper-py
88b24c609c update permission check wehn unstar item 2019-05-14 10:44:38 +08:00
zxj96
3cc43d9041 Resolve warring (#3454)
* Resole project warrings

* Delete extra blank lines

* resolve dir-column-nav warnings
2019-05-14 10:15:09 +08:00
Michael An
9f8fc78d14 fix search page (#3453) 2019-05-13 22:14:41 +08:00
杨顺强
3f0ba9b395 repair share dialog generator share link bug (#3451)
* repair share dialog generator share link bug

* optimized code

* repair bug
2019-05-13 20:01:53 +08:00
zxj96
de8cb4cb2d change button color to wiki-delete-dialog (#3452) 2019-05-13 20:01:24 +08:00