haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-19 01:41:26 +00:00
Code Issues Releases Wiki Activity
6,022 Commits 118 Branches 466 Tags
e30d19c7913155bca29a2196c434b0ec867bb8ad
Commit Graph

6022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
e30d19c791 [shibboleth] Fix empty role quota issue which will cause page unavailable 2017-06-26 10:33:54 +08:00
Daniel Pan
93dae41ca5 Merge pull request #1654 from haiwen/info-icon 
[system admin] side nav: modified icon for 'Info'
 2017-06-22 16:49:27 +08:00
llj
9215defff4 [system admin] side nav: modified icon for 'Info' 2017-06-22 16:40:41 +08:00
zhengxie
966e0bcb9c [api] Improve dir list performance 2017-06-22 15:38:59 +08:00
Daniel Pan
b0bd1176f2 Merge pull request #1653 from haiwen/wopi-update 
update wopi api
 2017-06-22 14:36:20 +08:00
lian
d1049dda8e update wopi api 
1. use utc timestamp for access_token_ttl
1. return 404 when user/repo/file not found
 2017-06-22 14:32:20 +08:00
Daniel Pan
d83d689300 Merge pull request #1651 from haiwen/wopi-excel 
rm x_wopi_oldlock check for xlsx file
 2017-06-22 11:32:46 +08:00
lian
c0a7456c3a rm x_wopi_oldlock check for xlsx file 2017-06-22 11:30:49 +08:00
xiez
9674334932 Merge pull request #1642 from haiwen/admin-share-link 
add admin share link api
 2017-06-22 10:02:18 +08:00
lian
018544112d use email2contact_email 2017-06-21 16:43:08 +08:00
lian
9750e8baaf add admin share/upload links api 
1. get share/upload link info by token
1. get dirents of shared dir
1. get download/upload fileserver url of shared file/dir
1. check share/upload link password
 2017-06-21 15:15:24 +08:00
xiez
0fd34dcb57 Merge pull request #1647 from haiwen/fix-location-header-after-creating-directory 
Fixed the location header after creating directory.
 2017-06-20 11:34:37 +08:00
xiez
1a61efe05e Merge pull request #1643 from haiwen/access-token 
Access token
 2017-06-20 11:33:06 +08:00
lian
0521a60ba3 check if FileServer access token is None 2017-06-20 11:28:18 +08:00
xiez
87a84e1d6c Merge pull request #1638 from haiwen/repos-api 
rm unused info when get repo list via api
 2017-06-20 11:24:42 +08:00
lian
74b8272047 rm unused info when get repo list via api 2017-06-20 11:08:26 +08:00
xiez
9da6a06455 Merge pull request #1648 from haiwen/mkdir 
update mkdir api
 2017-06-20 11:02:22 +08:00
lian
bee68b5c06 update error msg of dir api 2017-06-20 11:00:56 +08:00
xiez
51fb07f36a Merge pull request #1639 from haiwen/mkdir 
update mkdir api
 2017-06-20 10:57:10 +08:00
lian
179e2ebc72 update mkdir api 2017-06-20 10:51:45 +08:00
Shuai Lin
f76e75d4a7 Fixed the location header after creating directory. 
The path separator was missing.
 2017-06-19 18:12:27 +08:00
xiez
b487ca463b Merge pull request #1636 from haiwen/file-modifier 
[api] file modifier
 2017-06-19 15:38:39 +08:00
zhengxie
e939f942e3 Fix travis test 2017-06-19 15:30:22 +08:00
zming
3edfe92f60 [api] file modifier 2017-06-19 14:52:16 +08:00
zhengxie
49d9744798 [i18n] Update translations 2017-06-17 16:48:45 +08:00
zhengxie
0d904eea92 [i18n] Update source files 2017-06-17 16:25:19 +08:00
zhengxie
e5747a1e67 Fix permission in shared file 2017-06-17 16:19:46 +08:00
zhengxie
5e20cd58fa Update share file permissions 2017-06-17 15:50:17 +08:00
xiez
47f811cd78 Merge pull request #1644 from haiwen/favicon 
update
 2017-06-17 15:35:33 +08:00
lian
d63900bfb9 update 2017-06-17 11:55:25 +08:00
zhengxie
12940b3219 Merge branch '6.1' 2017-06-17 11:07:43 +08:00
xiez
5f666ad754 Merge pull request #1601 from haiwen/share-link 
Share link
 2017-06-17 11:07:02 +08:00
zhengxie
ebba25e3ae Update version 2017-06-13 13:41:58 +08:00
xiez
6723b42d07 Merge pull request #1629 from haiwen/wopi 
update wopi
 2017-06-13 13:40:47 +08:00
zhengxie
9694476b26 Update preview file extension setting 2017-06-13 13:37:02 +08:00
zhengxie
6b0e337f83 [locale] Update translations 2017-06-13 10:46:41 +08:00
zhengxie
6ea935a9e1 Update travis 2017-06-13 10:38:10 +08:00
xiez
ed18982b89 Merge pull request #1635 from haiwen/lang_email 
[language] send email
 2017-06-13 10:37:04 +08:00
zhengxie
12bcabd0b1 [share link] Remove deactivate 2017-06-13 10:35:55 +08:00
zming
c83cc9f212 [language] send email 2017-06-12 17:29:01 +08:00
xiez
14df2bcffd Merge pull request #1633 from zMingGit/setting_text 
[seahub] Added the ability to modify the format of the text preview s…
 2017-06-12 11:36:55 +08:00
zming
11f45979a5 [seahub] Added the ability to modify the format of the text preview suffix 2017-06-12 11:31:51 +08:00
zhengxie
3966856060 Update travis to 6.1 2017-06-09 10:17:05 +08:00
zhengxie
7dbb428c6e Merge branch '6.0' into 6.1 2017-06-09 10:16:34 +08:00
lian
f0b2527bcc update wopi 
1. add `ui` and `rs` parameters
1. get org repo owner
 2017-06-08 18:27:33 +08:00
zhengxie
763083efdb [tests] Fix travis tests 2017-06-08 13:37:33 +08:00
Daniel Pan
005b75bce3 Merge pull request #1628 from haiwen/wopi-api 
add `action` parameter for wopi api
 2017-06-08 11:07:30 +08:00
lian
bd8b03d1c3 add actoin parameter for wopi api 2017-06-08 10:22:13 +08:00
xiez
64b838fb01 Merge pull request #1627 from haiwen/shared-in-repo 
rm `get_share_in_repo_list` func from ajax.py
 2017-06-08 10:21:14 +08:00
zhengxie
5797a0117b [api] Remove prints 2017-06-08 10:16:15 +08:00