haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 02:42:26 +00:00
Code Issues Releases Wiki Activity
6,153 Commits 121 Branches 466 Tags
073e4b5d28ae8a2ddab58aff5ba222b64fd5407d
Commit Graph

6153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lian
624b0645f2 rm get_share_in_repo_list func from ajax.py 2017-06-08 10:11:10 +08:00
TMHBOFH
82d5070dde Merge pull request #1 from haiwen/6.1 
6.1
 2017-06-07 13:56:30 +02:00
xiez
f2fc7a451d Merge pull request #1626 from haiwen/api_whitelist 
Api whitelist
 2017-06-07 16:44:44 +08:00
xiez
4c02004220 Merge pull request #1622 from haiwen/delete-files 
update delete multi file api
 2017-06-07 16:41:55 +08:00
zhengxie
c99d3b4035 [tests] Fix tests 2017-06-06 12:11:05 +08:00
Daniel Pan
367da44665 Merge pull request #1623 from haiwen/role_quota 
[role_permission] Add quota for a certain role
 2017-06-05 18:33:58 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
lian
1bd70c2f53 update delete multi file api 2017-06-05 17:17:28 +08:00
zming
e26d5b6aa8 [throtting] Add whitelist of throtting 2017-06-05 15:54:08 +08:00
xiez
7791556e8f Merge pull request #1620 from haiwen/file-history 
File history
 2017-06-05 13:34:34 +08:00
lian
7c9ff51a65 update test of file history api 2017-06-05 11:41:03 +08:00
lian
6396433248 return user info when get file history 2017-06-05 11:19:44 +08:00
zhengxie
e9de086db3 Merge branch '6.1' 2017-06-03 11:21:08 +08:00
xiez
879b6b401b Merge pull request #1616 from haiwen/onlyoffice 
[onlyoffice] Fix doc key issue
 2017-06-02 15:24:18 +08:00
Daniel Pan
537a09cefb Merge pull request #1615 from haiwen/thumbnail_size_for_original 
[thumbnail] added 'thumbnail_size_for_original'
 2017-05-31 17:38:03 +08:00
zhengxie
711f1870cf [onlyoffice] Fix doc key issue 2017-05-31 17:32:15 +08:00
llj
8dd8e1e7f0 [thumbnail] added 'thumbnail_size_for_original' 2017-05-31 16:32:00 +08:00
llj
f7ed342e2d Merge pull request #1593 from haiwen/custom 
admin update logo/favicon
 2017-05-27 16:50:54 +08:00
llj
f92fc53178 modified favicon; modified system logo/favicon setting 2017-05-27 14:18:51 +08:00
llj
59c494f419 [sysadmin] logo/favicon: improvement 2017-05-26 15:38:56 +08:00