From 41f07c64eb026fcf71be6fa84f6c86c16f87b0ff Mon Sep 17 00:00:00 2001 From: pandarong Date: Fri, 3 Nov 2017 05:21:16 +0800 Subject: [PATCH 1/6] fix npm run build error (#272) Former-commit-id: bb2a5ea8b5949e11629d344c319e4cb0c5d48f0e [formerly c6b89a2ab4c66a1e9f16116906dead677e03a5ec] [formerly eb2a1b5b8840883ee18af987f6b7cf16a9d70075 [formerly 8703094109e53ab82356d73ce01332e99a2f0c82]] Former-commit-id: 4208e88d8263785a5cc5bacd1127ce8460df960a [formerly 7d45d39e5913b04ca12998ce622188f3c4b975f9] Former-commit-id: 6020a51629bbdd71ddc131c8ab9c6b0db5eb0f56 --- 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 cc8369d83e39d57e450af77e541525f0384bc0bb Mon Sep 17 00:00:00 2001 From: Davor Kapsa Date: Thu, 9 Nov 2017 21:58:34 +0100 Subject: [PATCH 2/6] travis: update go version (#276) Former-commit-id: cb189a867e029cd6dd57e6abcd70f74949e770a7 [formerly 92b3401b09d16673356c16321a1fd2938a8002fe] [formerly 5118e5894f9dec2ae5ae337e300c033f763be0fe [formerly 0be294a50240b60ae4bd03686226db8ac488bd86]] Former-commit-id: 516ccab1cfd5c713eb79a5ab4907e13d1bda98e2 [formerly 586b5951af545993c9ee4bff07625bfc26a3e439] Former-commit-id: 77e2897c8571704617bd721e46a50a46f6f9acd9 --- .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 003f36195656593e07c5deb391ffa146557cc097 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 10 Nov 2017 22:29:15 +0000 Subject: [PATCH 3/6] Add /tmp folder #274 Former-commit-id: 938bde70202335858fe569949b65c04e7ffc4146 [formerly 37c4c3ac2743f7be8e4a8eec92565e8c3b4303e2] [formerly 74b276e4616904471b27d3478b3a58c2ba09fe42 [formerly 00da35b91d759378015105a020e09a1591f5a92c]] Former-commit-id: 7be322ae95ea19b352cb4799b8927353b69286f5 [formerly c662fbd6eb0dc63624daae038897bcede3f28ed7] Former-commit-id: c8ef89c3ea2239cdf715ad9f1555c1f28167e4f2 --- 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 e5265b6632d0b68394f79bb951de4091893a9de6 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 11 Nov 2017 07:06:23 +0000 Subject: [PATCH 4/6] Update Dockerfile Former-commit-id: 2b02497070be694a121f6ae8f7567ee521d2039f [formerly 6c301dfe46f6e1ebb9d92fa5251c23aa6a5c9f64] [formerly befd05696772a79c19330a4d3f0b4651c35802a4 [formerly 44d68a4868c69536ae2cc92e981b8921c3904315]] Former-commit-id: 9f8661bb18ac3230d4f65fc4c5c8ccf31122daf6 [formerly 683bb4fdbfc8c95f1e69382322a8f1132c3de457] Former-commit-id: a7af592420975962f5556ba47801f9cd4f009fcc --- 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 f61e71e44f31eda6c8699a49db51a8e542d92ee9 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 11 Nov 2017 07:08:12 +0000 Subject: [PATCH 5/6] Update Dockerfile Former-commit-id: 657785108f5de159eebb842d402ef98d512f96f7 [formerly addc47263d93e2895204151aab13539307533430] [formerly 91081acc00772f9fba15eec3362d94cbf9513145 [formerly 6f394641304b9c51cc2928539eddc29d2382ce82]] Former-commit-id: 54dc3af451a3bb3e1fdd114b88e0dac7c1a8802e [formerly 49d5afc124292884245cacdd951c5f9670cb552a] Former-commit-id: f331a53412d10708e0ac19db04d94f0b99e63b40 --- 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 52599314b0832010d6d100d5d4d998d808016ab4 Mon Sep 17 00:00:00 2001 From: OopsMonk Date: Tue, 14 Nov 2017 15:21:26 +0800 Subject: [PATCH 6/6] fix symbolic links issue on Linux. (#281) Former-commit-id: 84a15d1ff70cbdcb91aaa7a40cb86604f036e349 [formerly 60e5a702fd98686193c5ee7bfb66698453de05ae] [formerly b863bd64cfc4e953c005f71ccc3fd936456b8a5e [formerly d269e239bfff9859f06fd0707578ad6c607ac9ba]] Former-commit-id: 24b6c15a5c3a54a866106eff843bea0d7401cf15 [formerly 6b6c3036a90776bb16d93a4b7e864e4f433f5531] Former-commit-id: 5b7aacabf2ceb1a5303fd303d5132bbdd711362f --- 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++