haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00
Code Issues Releases Wiki Activity
6,096 Commits 149 Branches 461 Tags
60c78adc44269e96d6eb8a63e3b830bbdf2d835d
Commit Graph

6096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
887662a16b [sql] Update sql to 6.1 2017-05-09 14:26:04 +08:00
zhengxie
e04f83d2d0 [locale] Update source files 2017-05-09 13:14:52 +08:00
zhengxie
194f219a3c Merge branch '6.0' 2017-05-09 13:13:36 +08:00
xiez
122fbe9ef7 Merge pull request #1571 from haiwen/fs_perm 
[share] Add permission field to FileShare model
 2017-05-09 13:13:05 +08:00
xiez
d493f8dad0 Merge pull request #1578 from haiwen/dir-share-trans 
add trans if share repo/dir failed
 2017-05-09 13:12:46 +08:00
lian
bfcaeabc11 update trans 2017-05-09 12:02:40 +08:00
llj
ae241c341f Merge pull request #1573 from haiwen/upload-file 
update argument when get file upload/upload link via web api
 2017-05-09 11:48:26 +08:00
lian
88bea73923 add trans if share repo/dir failed 2017-05-09 11:22:43 +08:00
xiez
e86c8ec134 Merge pull request #1576 from haiwen/wopi-setting 
add OFFICE_SERVER_TYPE for wopi app
 2017-05-09 10:55:07 +08:00
xiez
570faa2185 Merge pull request #1572 from haiwen/drag-drop-fix 
[dir view] move dir/file via drag & drop: modification, to remove the…
 2017-05-08 11:01:20 +08:00
llj
3b24d20f1b Merge pull request #1575 from haiwen/about 
Update about
 2017-05-08 11:01:16 +08:00
zhengxie
487c48db1c Update about 2017-05-08 10:58:53 +08:00
lian
90071b9ddf add OFFICE_SERVER_TYPE for wopi app 2017-05-08 10:49:45 +08:00
xiez
f8f947668a Merge pull request #1574 from haiwen/top-info-fix 
[top info] UI: fix
 2017-05-08 10:40:42 +08:00
llj
45d9d5dbf8 [top info] UI: fix 2017-05-06 17:37:29 +08:00
lian
48c370c8bc update argument when get file upload/upload link via web api 2017-05-06 17:04:40 +08:00
llj
a65499610c [dir view] move dir/file via drag & drop: modification, to remove the effect on 'upload file/folder via drag & drop', and other 'drag & drop' 2017-05-06 15:17:31 +08:00
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