1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Commit Graph

1537 Commits

Author SHA1 Message Date
plt
20d7594d84 Merge branch '7.0' 2019-06-24 17:32:31 +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
Michael An
eec40eb737 delete useless code 2019-06-24 13:34:33 +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
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
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
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
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
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
Michael An
dca546b285 share bug 2019-06-21 10:03:52 +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
Michael An
a08a1e97e3 update 2019-06-20 18:25:10 +08:00
shanshuirenjia
59a783f578 add loading for share-dialog 2019-06-20 18:23:13 +08:00
Michael An
eaca5e0584 update 2019-06-20 18:06:12 +08:00
Michael An
08579289d7 wiki relative image path 2019-06-20 17:26:10 +08:00
shanshuirenjia
fec79816bc rename variable 2019-06-20 17:21:21 +08:00
shanshuirenjia
d1c8a5cc50 repair permission error 2019-06-20 17:13:15 +08:00
shanshuirenjia
4979571104 repair admin show bug 2019-06-20 16:56:55 +08:00
plt
a069264637 Merge branch '7.0' into master2 2019-06-19 21:28:07 +08:00
Michael An
1e00d6a6b7 update 2019-06-19 20:41:36 +08:00
Michael An
ea5741351d get infos 2019-06-19 18:40:42 +08:00
Daniel Pan
0c75ced2ee Merge pull request #3677 from haiwen/share-bug-repair
repair share bug
2019-06-19 17:31:59 +08:00
shanshuirenjia
a63a70491e repair share bug 2019-06-19 17:02:59 +08:00
Daniel Pan
945e820644 Merge pull request #3672 from haiwen/add-delete-dialog
Add delete dialog
2019-06-19 14:56:55 +08:00
Michael An
efe36acfe9 update dtable 2019-06-19 13:52:39 +08:00