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
zhengxie
a4ead6dc38 Add more avatar size 2017-05-06 10:40:51 +08:00
zhengxie
b2b9495a35 [share] Add permission field to FileShare model 2017-05-05 15:35:56 +08:00
Daniel Pan
6cc943e43e Merge pull request #1570 from haiwen/new 
[dir view] new dir/file: close the dropdown menu after clicking a men…
 2017-05-05 11:02:55 +08:00
llj
0169245045 [dir view] new dir/file: close the dropdown menu after clicking a menu item 2017-05-04 16:32:47 +08:00
xiez
b2da598650 Merge pull request #1569 from haiwen/lang-selector 
[language selector] improvement
 2017-05-04 15:17:47 +08:00
llj
9d407c4cab [language selector] improvement 2017-05-04 15:06:45 +08:00
zhengxie
0c732638eb Merge branch '6.0' 2017-05-04 10:31:49 +08:00
xiez
26b86ee1c1 Merge pull request #1567 from haiwen/get-rw-repos 
fix bug when get unenc rw repos
 2017-05-03 10:14:55 +08:00
lian
d75fc57832 fix bug when get unenc rw repos 2017-05-02 14:09:25 +08:00
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
d4fc5275e6 Merge pull request #1563 from haiwen/share-test 
update dir share item api test
 2017-04-28 15:16:40 +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
lian
28c7fb5703 update dir share item api test 
test share failed when share the same item to the same user/group
 2017-04-25 16:12:56 +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