Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee53803fc2 | ||
|
|
fa2ab280aa | ||
|
|
395801016b | ||
|
|
30ed82a70f | ||
|
|
ab643cd0c4 | ||
|
|
85e5beaa4a | ||
|
|
3cab34c68b | ||
|
|
8299f8ed06 | ||
|
|
da05c5048e | ||
|
|
071e1ec19b |
@@ -2,7 +2,7 @@ version: 2
|
||||
jobs:
|
||||
linting:
|
||||
docker:
|
||||
- image: circleci/golang:1.9
|
||||
- image: circleci/golang:1.10
|
||||
working_directory: /go/src/github.com/filebrowser/filebrowser
|
||||
steps:
|
||||
- checkout
|
||||
@@ -16,6 +16,7 @@ jobs:
|
||||
name: Run linting
|
||||
command: |
|
||||
gometalinter --exclude="rice-box.go" \
|
||||
--deadline=300s \
|
||||
-D goconst \
|
||||
-D gocyclo \
|
||||
-D vetshadow \
|
||||
@@ -24,7 +25,7 @@ jobs:
|
||||
-D gas
|
||||
build:
|
||||
docker:
|
||||
- image: circleci/golang:1.9
|
||||
- image: circleci/golang:1.10
|
||||
working_directory: /go/src/github.com/filebrowser/filebrowser
|
||||
steps:
|
||||
- checkout
|
||||
@@ -38,7 +39,7 @@ jobs:
|
||||
command: go build
|
||||
deploy:
|
||||
docker:
|
||||
- image: circleci/golang:1.9
|
||||
- image: circleci/golang:1.10
|
||||
working_directory: /go/src/github.com/filebrowser/filebrowser
|
||||
steps:
|
||||
- checkout
|
||||
|
||||
9
file.go
9
file.go
@@ -134,13 +134,12 @@ func (i *File) GetListing(u *User, r *http.Request) error {
|
||||
}
|
||||
|
||||
if strings.HasPrefix(f.Mode().String(), "L") {
|
||||
// It's a symbolic link
|
||||
// The FileInfo from Readdir treats symbolic link as a file only.
|
||||
// It's a symbolic link. We try to follow it. If it doesn't work,
|
||||
// we stay with the link information instead if the target's.
|
||||
info, err := os.Stat(f.Name())
|
||||
if err != nil {
|
||||
return err
|
||||
if err == nil {
|
||||
f = info
|
||||
}
|
||||
f = info
|
||||
}
|
||||
|
||||
if f.IsDir() {
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
|
||||
const (
|
||||
// Version is the current File Manager version.
|
||||
Version = "1.5.2"
|
||||
Version = "1.5.5"
|
||||
|
||||
ListViewMode = "list"
|
||||
MosaicViewMode = "mosaic"
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
type modifySettingsRequest struct {
|
||||
*modifyRequest
|
||||
modifyRequest
|
||||
Data struct {
|
||||
CSS string `json:"css"`
|
||||
Commands map[string][]string `json:"commands"`
|
||||
|
||||
@@ -18,7 +18,7 @@ type modifyRequest struct {
|
||||
}
|
||||
|
||||
type modifyUserRequest struct {
|
||||
*modifyRequest
|
||||
modifyRequest
|
||||
Data *fm.User `json:"data"`
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
"author": "File Browser contributors",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"filebrowser-frontend": "^1.0.3"
|
||||
"filebrowser-frontend": "1.0.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
bf6bef64f1544a286116fe3a9366ac9addaa2dd5
|
||||
0f76698881872d56d49a72ede19f45c0ef58cbca
|
||||
Reference in New Issue
Block a user