haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00
Code Issues Releases Wiki Activity
6,079 Commits 121 Branches 467 Tags
5b55a532d0e20252b915b3e5f4ffab8536943482
Commit Graph

6079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xiez
8822e353d0 Merge pull request #1602 from TMHBOFH/OnlyOffice-html-template 
Update view_file_via_onlyoffice.html
 2017-05-25 17:15:30 +08:00
xiez
59683a5309 Merge pull request #1596 from TMHBOFH/OnlyOfficeLanguageSetting 
add option to set language of OnlyOffice DocumentServer
 2017-05-25 16:19:09 +08:00
lian
3420025b9a Merge pull request #1604 from haiwen/update-admin-log 
update admin log
 2017-05-23 17:03:00 +08:00
lian
37dc0354d9 update admin create repo log 2017-05-23 16:49:52 +08:00
llj
19cedb4779 Merge pull request #1605 from haiwen/file-discussion-fix 
[file view] discussion: fix locale for 'msg time'
 2017-05-23 16:49:37 +08:00
llj
2096ebef02 [file view] discussion: fix locale for 'msg time' 2017-05-23 16:27:46 +08:00
lian
e1d0169e64 update admin log 
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
 2017-05-23 16:05:51 +08:00
llj
42f2571da7 [share link] modified 'direct dl link' 2017-05-23 11:48:41 +08:00
zhengxie
f79159f9d6 Merge branch '6.0' into 6.1 2017-05-23 11:01:55 +08:00
xiez
df2de123ab Merge pull request #1590 from haiwen/encode-utf-8 
not encode utf-8 when do some file/dir operation
 2017-05-23 11:01:15 +08:00
zhengxie
ecb26403ac Merge branch '6.1' 2017-05-23 10:44:06 +08:00
zhengxie
1f7880ebc1 Merge branch '6.0' into 6.1 
Conflicts:
	seahub/urls.py
 2017-05-23 10:38:49 +08:00
TMHBOFH
20cabcac6a Update view_file_via_onlyoffice.html 2017-05-22 13:36:30 +02:00
TMHBOFH
ae5a270fbc Merge pull request #1 from haiwen/master 
pull
 2017-05-22 13:17:45 +02:00
llj
18f0764818 [share link] modification about permissions 2017-05-22 17:20:42 +08:00
Daniel Pan
c734844720 Merge pull request #1600 from haiwen/tc 
Remove t&c relation when user is deleted
 2017-05-22 16:02:30 +08:00
Daniel Pan
985cf09f6b Merge pull request #1599 from haiwen/movie 
[thumbnail] Add setting to enable/disable movie thumbnail
 2017-05-22 16:02:03 +08:00
llj
3fd4fd6bf9 Merge pull request #1597 from zMingGit/login-id 
Login id
 2017-05-22 15:45:38 +08:00
zming
1ed03f96e1 [API2] add login_id field, and test case 
[api] update account and test

[template] increase the function of modifying logind

[review] trans

[review] trans again
 2017-05-22 15:33:50 +08:00
zhengxie
a220b99b8d Remove t&c relation when user is deleted 2017-05-22 15:07:26 +08:00
zhengxie
0d65a68892 [thumbnail] Add setting to enable/disable movie thumbnail 2017-05-22 12:15:38 +08:00
TMHBOFH
eb7ccd6068 Update view_file_via_onlyoffice.html 2017-05-19 22:33:05 +02:00
TMHBOFH
3cbeb78340 Update settings.py 2017-05-19 22:31:51 +02:00
TMHBOFH
4e9d23f8d0 Update file.py 2017-05-19 22:30:07 +02:00