1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Commit Graph

6976 Commits

Author SHA1 Message Date
Daniel Pan
52c8ef34a3 Merge pull request #2198 from haiwen/file-detail
add last modifier info to file detail api
2018-07-06 21:46:39 +08:00
lian
8755d87510 add last modifier info to file detail api 2018-07-05 16:51:53 +08:00
Daniel Pan
a6daba759a Merge pull request #2197 from haiwen/fix-public-wiki
[fix] public wiki
2018-07-05 15:34:13 +08:00
ilearnit
6ddf3506e0 [fix] public wiki 2018-07-05 15:00:45 +08:00
zheng xie
3f85ee0021 Update dev-requirements.txt 2018-07-05 11:17:38 +08:00
zheng xie
d662c5e3d8 Fix adfs urls in django 1.11 2018-07-05 10:42:41 +08:00
zheng xie
87a5714354 Merge pull request #2192 from haiwen/email-reminder
[fix]the email reminds unread notifications after uploading file
2018-07-04 18:05:34 +08:00
Daniel Pan
9a3c96c510 Merge pull request #2195 from haiwen/fix-download-link
[fix] Invalid download in some specific languages
2018-07-04 17:50:58 +08:00
ilearnit
8aa72108e9 [fix] Invalid download in some specific languages 2018-07-04 17:10:42 +08:00
ilearnit
c3e37fea3a [fix]the email reminds unread notifications after uploading file 2018-07-03 11:45:20 +08:00
Daniel Pan
fad837ec16 Merge pull request #2191 from haiwen/admin-repos
return empty sting if repo owner not found
2018-07-02 17:48:22 +08:00
lian
b9db85c3af return empty sting if repo owner not found 2018-07-02 16:17:16 +08:00
lian
1c86daa342 add "jq.min.js" to onlyoffice/wopi html page 2018-07-02 10:30:01 +08:00
zheng xie
b1c1c11f26 Merge pull request #2146 from haiwen/org
add admin org api
2018-06-28 13:06:54 +08:00
lian
8b0e0ceb51 add admin org api
1, get org info
2, update name/max user number/quota
3, delete an org
2018-06-27 18:25:21 +08:00
Daniel Pan
68558b082c Merge pull request #2182 from haiwen/delete-default-library
Delete setting default library option from the web UI
2018-06-27 16:18:58 +08:00
ilearnit
5cefe0bdba Delete setting default library option from the web UI 2018-06-27 15:51:36 +08:00
zhengxie
663e4c854f [sql] Update sql 2018-06-27 11:04:45 +08:00
zheng xie
3af6532040 Merge pull request #2140 from haiwen/online-office-lock
OnlineOffice lock file
2018-06-26 12:04:32 +08:00
llj
03407c5e24 [view_file_onlyoffice.html] modification 2018-06-26 11:56:18 +08:00
lian
db4eb44c65 OnlineOffice lock file 2018-06-26 11:03:19 +08:00
llj
30deccc517 [system admin] org: fixed 'add org' 2018-06-25 17:52:06 +08:00
llj
c27d131710 [groups, group] use new icon for 'unshare' a repo 2018-06-25 14:42:33 +08:00
llj
f511f240a6 [search] added 'search by time & size' 2018-06-25 10:51:00 +08:00
Daniel Pan
17a122fc47 Merge pull request #2171 from haiwen/mkdir-create-parents
update repos dir api
2018-06-22 16:20:03 +08:00
llj
b996701c1e [messages] fixup 2018-06-22 16:13:47 +08:00
lian
603e993c39 update repos dir api
remove pro version check when create folder with parents
2018-06-22 14:03:12 +08:00
Daniel Pan
1244ecd9e4 Merge pull request #2163 from haiwen/onlyoffice-co-edit
update onlyoffice view file
2018-06-15 18:33:26 +08:00
lian
c6059f1370 update onlyoffice view file
use origin repo_id/file_path if current repo is a virtual repo
2018-06-15 18:28:34 +08:00
lian
553aaf68cf add group owned library user/group share api (#2133)
* add new api for group owned library share

add all groups api
add group owned library user/group share api

* filter library owner group id in get group share item api

* update get address book memebre info api

* return "group_name" field for groups/admin-libs/admin-trash-libs api

* update address book group api

* update admin delete address book api

* [address book] fixed text tips
2018-06-15 17:14:40 +08:00
Daniel Pan
f7bc608da7 Merge pull request #2160 from haiwen/onlyoffice-mobile
add mobile check when view file via OnlyOffice
2018-06-15 16:34:33 +08:00
lian
275c3abeb7 add mobile check when view file via OnlyOffice 2018-06-15 15:07:53 +08:00
zhengxie
e5dccc6a6c [locale] Update po files 2018-06-15 14:59:17 +08:00
zhengxie
3c3cf5c18e [local] Update source strings 2018-06-15 14:46:50 +08:00
Daniel Pan
4febe78fb8 Merge pull request #2158 from haiwen/file-detail-star
add starred field to file detail api
2018-06-15 14:27:29 +08:00
llj
79c12093f2 [system admin] groups: modified link URL for address book group 2018-06-15 14:22:10 +08:00
llj
040348e6f4 [address book] group: show repo owner and etc. 2018-06-15 14:22:10 +08:00
llj
ce23a58edf [group owned repo] share: enable 'share to user/group' 2018-06-15 14:22:10 +08:00
zhengxie
fde748909e [sys admin] User list, email -> ID 2018-06-15 11:52:58 +08:00
zhengxie
194a9555cf Update translations 2018-06-14 18:30:17 +08:00
zheng xie
c925cb4e0e Merge pull request #2157 from haiwen/redesign-register
[register] redesigned it
2018-06-14 17:26:25 +08:00
llj
435ced05f5 [register] redesigned it 2018-06-14 16:51:13 +08:00
llj
f6d24df9c6 [login, settings] added 'capfirst' for current language name 2018-06-13 16:03:50 +08:00
lian
4507beb7e8 add starred field to file detail api 2018-06-13 15:25:06 +08:00
Daniel Pan
c70b878359 Merge pull request #2155 from haiwen/update-seafile-editor
update seafile editor
2018-06-11 11:36:34 +08:00
ilearnit
748670b1a2 update seafile editor 2018-06-11 11:28:27 +08:00
zhengxie
6151c80b93 [locale] Update translations 2018-06-09 16:29:18 +08:00
zhengxie
f8f96c3300 [locale] Update source files 2018-06-09 16:06:09 +08:00
zheng xie
a4ad95b5b2 Merge pull request #2154 from haiwen/fix-terms
fix terms
2018-06-09 16:03:10 +08:00
ilearnit
116f6c45d8 fix terms 2018-06-09 15:58:55 +08:00