haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 04:10:47 +00:00
Code Issues Releases Wiki Activity
7,016 Commits 144 Branches 460 Tags
d69e700fb6cda99a2cee63ed76dea99c54ca15e8
Commit Graph

7016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Pan
bcd83558a4 Merge pull request #2177 from haiwen/init-password 
support init library password when user forget password
 2018-06-25 17:44:47 +08:00
lian
28554c07f2 support init library password when user forget password 2018-06-25 02:42:07 -07: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
zheng xie
105a22f01a Merge pull request #2143 from haiwen/batch-unshare-repo 
add batch unshare repo from user/group
 2018-06-13 11:52:31 +08:00
lian
fc07a1d885 add batch unshare repo from user/group 2018-06-13 11:51:12 +08:00
zheng xie
991ea8f206 Merge pull request #2145 from haiwen/batch-copy-move-file-dir 
add batch copy/move item api
 2018-06-13 11:38:22 +08:00
zheng xie
5b5d26a8ed Merge pull request #2144 from haiwen/move-dir-merge 
add move folder merge api
 2018-06-13 11:28:10 +08:00
lian
615f7a75b7 add move folder mergea api 2018-06-13 11:24:43 +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
llj
7670caf660 [Terms] fixup 2018-06-09 15:48:33 +08:00
zhengxie
a2354fcc02 Update .gitignore 2018-06-09 13:39:30 +08:00
zhengxie
48d3a046a7 [locale] Update translations 2018-06-09 13:31:57 +08:00
zhengxie
fe44f629c9 [locale] Update source files 2018-06-09 11:29:21 +08:00
zhengxie
4680dc3272 Merge branch '6.3' 2018-06-09 11:27:29 +08:00
zheng xie
e98d7d2345 Merge pull request #2137 from haiwen/terms-and-conditions 
Add terms to web settings
 2018-06-09 11:25:39 +08:00
ilearnit
3cc68f5b6d Add terms to web settings 2018-06-09 11:17:04 +08:00
zheng xie
72750f1265 Merge pull request #2150 from haiwen/onlyoffice-save 
update onlyoffice callback func
 2018-06-09 11:05:21 +08:00
lian
2b1e5b18e7 update onlyoffice callback func 2018-06-08 18:49:57 +08:00
lian
bed4bb9bd7 add batch copy/move item api 2018-06-06 16:49:58 +08:00
zheng xie
1c66f8823f Merge pull request #2141 from haiwen/admin-restore-deleted-repo 
update admin restore deleted repo api
 2018-06-06 15:06:04 +08:00