From 8703094109e53ab82356d73ce01332e99a2f0c82 Mon Sep 17 00:00:00 2001
From: pandarong <rongpanda@gmail.com>
Date: Fri, 3 Nov 2017 05:21:16 +0800
Subject: [PATCH 1/6] fix npm run build error (#272)
---
assets/src/router/index.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/src/router/index.js b/assets/src/router/index.js
index 39d387d3..58ca1d87 100644
--- a/assets/src/router/index.js
+++ b/assets/src/router/index.js
@@ -3,8 +3,8 @@ import Router from 'vue-router'
import Login from '@/views/Login'
import Layout from '@/views/Layout'
import Files from '@/views/Files'
-import Users from '@/views/Settings/Users'
-import User from '@/views/Settings/User'
+import Users from '@/views/settings/Users'
+import User from '@/views/settings/User'
import Settings from '@/views/Settings'
import GlobalSettings from '@/views/settings/Global'
import ProfileSettings from '@/views/settings/Profile'
From 0be294a50240b60ae4bd03686226db8ac488bd86 Mon Sep 17 00:00:00 2001
From: Davor Kapsa <davor.kapsa@gmail.com>
Date: Thu, 9 Nov 2017 21:58:34 +0100
Subject: [PATCH 2/6] travis: update go version (#276)
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 8d705c85..7092fe76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: go
-go: 1.8.3
+go: 1.x
env:
- "PATH=/home/travis/gopath/bin:$PATH"
From 00da35b91d759378015105a020e09a1591f5a92c Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Fri, 10 Nov 2017 22:29:15 +0000
Subject: [PATCH 3/6] Add /tmp folder #274
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index d5d3b8e7..5b955dd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN mv filemanager /go/bin/filemanager
FROM scratch
COPY --from=0 /go/bin/filemanager /filemanager
+RUN mkdir /tmp
VOLUME /srv
EXPOSE 80
From 44d68a4868c69536ae2cc92e981b8921c3904315 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sat, 11 Nov 2017 07:06:23 +0000
Subject: [PATCH 4/6] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 5b955dd5..a43760ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN mv filemanager /go/bin/filemanager
FROM scratch
COPY --from=0 /go/bin/filemanager /filemanager
-RUN mkdir /tmp
+RUN mkdir -p /tmp
VOLUME /srv
EXPOSE 80
From 6f394641304b9c51cc2928539eddc29d2382ce82 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sat, 11 Nov 2017 07:08:12 +0000
Subject: [PATCH 5/6] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index a43760ca..e5cb7f2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN mv filemanager /go/bin/filemanager
FROM scratch
COPY --from=0 /go/bin/filemanager /filemanager
-RUN mkdir -p /tmp
+VOLUME /tmp
VOLUME /srv
EXPOSE 80
From d269e239bfff9859f06fd0707578ad6c607ac9ba Mon Sep 17 00:00:00 2001
From: OopsMonk <oopsmonk@gmail.com>
Date: Tue, 14 Nov 2017 15:21:26 +0800
Subject: [PATCH 6/6] fix symbolic links issue on Linux. (#281)
---
file.go | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/file.go b/file.go
index 6c217b10..fa98fed1 100644
--- a/file.go
+++ b/file.go
@@ -133,6 +133,16 @@ func (i *File) GetListing(u *User, r *http.Request) error {
continue
}
+ if strings.HasPrefix(f.Mode().String(), "L") {
+ // It's a symbolic link
+ // The FileInfo from Readdir treats symbolic link as a file only.
+ info, err := os.Stat(f.Name())
+ if err != nil {
+ return err
+ }
+ f = info
+ }
+
if f.IsDir() {
name += "/"
dirCount++