haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity
5,868 Commits 145 Branches 464 Tags
3ca1e5f042df1899b51c2bd20e56b8782a3a785b
Commit Graph

5868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
3ca1e5f042 [locale] Update locales 2017-05-02 12:19:25 +08:00
zhengxie
09112d9f41 [sql] Update sql to 6.1 2017-04-28 17:12:13 +08:00
zhengxie
25637830c2 Update translations 2017-04-28 16:31:55 +08:00
zhengxie
ae7f0e15a3 Update locales 2017-04-28 16:23:33 +08:00
xiez
4876a97b3f Merge pull request #1566 from haiwen/trans 
update trans str at settings page
 2017-04-28 16:22:25 +08:00
lian
4b1502af50 update trans str at settings page 2017-04-28 16:21:10 +08:00
zhengxie
086f02af3a [locale] Update source string 2017-04-28 15:19:59 +08:00
xiez
9e5bd17ce3 Merge pull request #1565 from haiwen/update-trans 
update trans str
 2017-04-28 15:16:16 +08:00
lian
adaadf24fc update trans str 2017-04-28 15:07:28 +08:00
zhengxie
0aa1c4f624 [locale] Update source files 2017-04-28 14:00:06 +08:00
zhengxie
5c998cdb03 Merge branch '6.0' 2017-04-28 13:35:49 +08:00
zhengxie
dfe8f6a6db Update video thumbnail 2017-04-28 13:29:46 +08:00
Daniel Pan
bcde41a24a Merge pull request #1549 from haiwen/org-user-quota 
update usage of seafile api
 2017-04-28 13:26:53 +08:00
zhengxie
764a63e705 Update sso login 2017-04-26 10:28:33 +08:00
xiez
55e1c7470d Merge pull request #1562 from haiwen/file-ops-api 
update file ops api
 2017-04-25 16:03:24 +08:00
lian
bd0bbf3121 add test for file ops api 2017-04-25 15:54:42 +08:00
xiez
380aacbe89 Merge pull request #1554 from haiwen/check-repo-share 
check if repo/dir has been shared when share repo/dir
 2017-04-25 15:44:52 +08:00
xiez
62d6b39273 Merge pull request #1561 from haiwen/file-ops-api 
update file ops api
 2017-04-25 15:21:34 +08:00
lian
c4a0653940 update file ops api 
return obj info when copy/move file via web api in bulk
 2017-04-25 13:57:17 +08:00
Daniel Pan
b2c1b819a2 Merge pull request #1560 from haiwen/search-file-page 
rm SVG type when search file
 2017-04-25 11:14:27 +08:00
lian
5da3d73870 rm SVG type when search file 2017-04-25 10:29:21 +08:00
Daniel Pan
8e48b821a3 Merge pull request #1559 from haiwen/move-copy-file 
update return value when copy/move file via web api
 2017-04-24 18:37:52 +08:00
Daniel Pan
5c69f79688 Merge pull request #1545 from haiwen/use-thumbnail 
[image] use thumbnail for magnificPopup & file view page
 2017-04-24 18:21:45 +08:00
Daniel Pan
8a45925831 Merge pull request #1558 from haiwen/search-api 
return repo name when search file via api
 2017-04-24 18:20:12 +08:00
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
lian
1e4b3ae5a2 return repo name when search file via api 2017-04-24 17:31:25 +08:00
xiez
a0286f1a6f Merge pull request #1553 from haiwen/video 
video thumbnail
 2017-04-24 16:26:23 +08:00
zhengxie
e80fc98890 [thumbnail] Refactor generate thumbnail function 2017-04-24 16:23:29 +08:00
xiez
688911aa7a Merge pull request #1552 from haiwen/share-file-thumb 
update thumbnail
 2017-04-24 14:44:08 +08:00
Daniel Pan
4ff85e26dc Merge pull request #1557 from haiwen/rename-fix-6.0 
[dir view] rename: fix
 2017-04-22 17:49:24 +08:00
Daniel Pan
666063f47c Merge pull request #1556 from haiwen/rename-fix 
Rename fix
 2017-04-22 17:49:07 +08:00
llj
7c82cada60 [dir view] rename: fix 2017-04-22 16:40:05 +08:00
llj
dbc8d1b041 [dir view] rename: fix 2017-04-22 16:30:58 +08:00
llj
390424fe30 [dir view] enable 'select text' when rename 2017-04-22 15:47:25 +08:00
Daniel Pan
f9e9b44ed9 Merge pull request #1555 from haiwen/video-file-icon 
[file icon] added file icon for video files
 2017-04-21 11:20:22 +08:00
llj
055e860e87 [file icon] added file icon for video files 2017-04-20 16:13:54 +08:00
llj
3443479e75 [video] show thumbnail for video files in dir-view/favorites/view-shared-dir pages 2017-04-19 16:21:33 +08:00
lian
02a3078829 check if repo/dir has been shared when share repo/dir 2017-04-19 16:05:59 +08:00
zhengxie
4d3b1964f3 wip: Support video thumbnail, moviepy and ffmpeg are required to enable this feature 2017-04-18 18:02:11 +08:00
llj
2a8e40c3c0 [image] use thumbnail for magnificPopups, file_view page & shared_file_view page 2017-04-18 17:28:29 +08:00
xiez
3dd41dd202 Merge pull request #1550 from haiwen/wopi 
add wopi app
 2017-04-18 16:07:03 +08:00
lian
4a76fc0cbc add wopi app 2017-04-18 15:37:12 +08:00
xiez
6ea2858f64 Merge pull request #1548 from haiwen/is-admin 
use true/false as the return value of "is_admin" field
 2017-04-18 15:30:48 +08:00
zhengxie
81db6a7a0a [institution] Add institution quota 2017-04-18 14:12:29 +08:00
lian
54a09989f0 update thumbnail 
generate thumbnail of a shared file.
 2017-04-18 12:03:33 +08:00
zhengxie
0c61a22100 Fix tests 2017-04-17 16:37:23 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
lian
9829bb2e86 update usage of seafile api 
1. seafile_api.get_org_user_quota_usage
1. seafile_api.get_org_user_quota
 2017-04-17 16:10:12 +08:00
lian
088bf8f6c5 Merge pull request #1543 from haiwen/onlyoffice 
Add onlyoffice support
 2017-04-17 15:23:44 +08:00