1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Commit Graph

9497 Commits

Author SHA1 Message Date
plt
20d7594d84 Merge branch '7.0' 2019-06-24 17:32:31 +08:00
Daniel Pan
0a5eeff861 Merge pull request #3708 from haiwen/detail-comment
add comment in dirent detail
2019-06-24 15:53:22 +08:00
Michael An
c884dfc2ed add comment in dirent detail 2019-06-24 15:44:22 +08:00
Daniel Pan
5bbf4f90c6 Merge pull request #3707 from haiwen/7.0
7.0
2019-06-24 15:24:00 +08:00
Daniel Pan
2e741334e5 Merge pull request #3706 from haiwen/fix-code
delete useless code
2019-06-24 13:41:33 +08:00
Michael An
eec40eb737 delete useless code 2019-06-24 13:34:33 +08:00
Daniel Pan
81573415c7 Merge pull request #3705 from haiwen/update
update version
2019-06-24 13:21:01 +08:00
Michael An
a21353ae43 update version 2019-06-24 13:05:05 +08:00
Daniel Pan
2354fd9964 Merge pull request #3701 from haiwen/forbid-container-menu
Forbid container menu
2019-06-24 12:09:35 +08:00
Daniel Pan
f165de6865 Merge pull request #3700 from haiwen/delete-api-test
add version
2019-06-24 12:08:33 +08:00
shanshuirenjia
3cdaff67c9 repair code error 2019-06-24 11:42:03 +08:00
shanshuirenjia
01df690b19 forbid new folder & new file in container for someone who not has permission 2019-06-24 11:28:25 +08:00
zxj96
ad9908bc0d add package-lock.json 2019-06-24 10:37:04 +08:00
zxj96
46c4774012 add version 2019-06-24 10:17:32 +08:00
Daniel Pan
ba39bfe176 Merge pull request #3697 from haiwen/share-btn-control-repair-2
repair share btn control bug
2019-06-21 21:18:33 +08:00
shanshuirenjia
fff5d94cea repair code error 2019-06-21 21:16:05 +08:00
shanshuirenjia
a09770720e optimized code 2019-06-21 21:09:12 +08:00
Daniel Pan
d35dded33f Merge pull request #3698 from haiwen/add-comment
Add comment
2019-06-21 20:16:26 +08:00
zxj96
9b3bbed113 modify comment 2019-06-21 18:35:11 +08:00
zxj96
38b117720f Add comment 2019-06-21 18:31:55 +08:00
zxj96
d7245c1b05 Add comment 2019-06-21 18:28:13 +08:00
Daniel Pan
9e68fdfc76 Merge pull request #3690 from haiwen/handle-move-file
Putting the file out is the same as putting it in a blank space
2019-06-21 18:09:06 +08:00
zxj96
ad3cb6bca7 enteredCounter replace dragEnterContainerAmount 2019-06-21 18:03:54 +08:00
shanshuirenjia
d5d6472186 repair share btn control bug 2019-06-21 17:54:06 +08:00
Daniel Pan
6f1c9662cd Merge pull request #3684 from haiwen/batch-delete
update repo batch api
2019-06-21 17:49:02 +08:00
Daniel Pan
afce695bdb Merge pull request #3695 from haiwen/update-version
update-version
2019-06-21 16:45:05 +08:00
Michael An
5237747255 update-version 2019-06-21 16:40:14 +08:00
plt
023af7bf2b Merge branch '7.0' 2019-06-21 16:16:41 +08:00
Daniel Pan
f0b2cbbd69 Merge pull request #3694 from haiwen/wechat-style
adjust style
2019-06-21 16:15:46 +08:00
Daniel Pan
4b60316f69 Merge pull request #3692 from haiwen/wiki-style
index-viewer style
2019-06-21 16:07:14 +08:00
Daniel Pan
1b1df904f5 Merge pull request #3693 from haiwen/set-folder-permission-bug
Set folder permission bug
2019-06-21 16:00:57 +08:00
Michael An
c763ba0f3c adjust style 2019-06-21 15:47:43 +08:00
lian
8d2ae47e8a update repo download info api (#3691)
return permission field
2019-06-21 15:41:07 +08:00
zxj96
049c74010b Modify variable name 2019-06-21 15:22:22 +08:00
zxj96
907eed4813 Modify variable name 2019-06-21 15:20:34 +08:00
Michael An
fcf7a15284 index-viewer style 2019-06-21 15:20:14 +08:00
Daniel Pan
b1fbe68dda Merge pull request #3689 from haiwen/fix-warnings-7.0
fix-warnings
2019-06-21 14:35:13 +08:00
Daniel Pan
ba7775d225 Merge pull request #3688 from haiwen/fix-dtable-style
dtable-style
2019-06-21 14:24:08 +08:00
shanshuirenjia
e4fbc8674f update menu generate algorithm 2019-06-21 14:22:45 +08:00
zxj96
9a8da1ac19 Putting the file out is the same as putting it in a blank space 2019-06-21 14:07:52 +08:00
Michael An
e0baee1f95 dtable-style 2019-06-21 14:00:45 +08:00
Michael An
479350dc77 fix-warnings 2019-06-21 13:59:17 +08:00
shanshuirenjia
5e0924b383 repair set folder permission bug 2019-06-21 10:44:41 +08:00
Daniel Pan
dae726b432 Merge pull request #3686 from haiwen/fix-share-bug
share bug
2019-06-21 10:13:18 +08:00
Michael An
dca546b285 share bug 2019-06-21 10:03:52 +08:00
Daniel Pan
2d9dd929f3 Merge pull request #3685 from haiwen/update-dtable
update version
2019-06-20 19:50:14 +08:00
Michael An
d094b24a43 update version 2019-06-20 18:48:32 +08:00
Daniel Pan
f3201469b4 Merge pull request #3681 from haiwen/wiki-image
relative image path
2019-06-20 18:46:14 +08:00
lian
a4eba32bd5 update repo batch api
1, add batch delete item api
2, check sub folder permission when batch delte/move item
2019-06-20 18:30:59 +08:00
Daniel Pan
ceeff3fa97 Merge pull request #3683 from haiwen/share-dialog-bug-repair
Share dialog bug repair
2019-06-20 18:25:18 +08:00