From cf61baa2731d288ab10543eefd368873fe1e7158 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 29 Oct 2017 13:32:02 +0000 Subject: [PATCH] Version 1.3.4 Former-commit-id: 6d70d81a1967f171a41cecbdad8664fc65d1111a [formerly e273e78de0030dcb2eec730a00f248f1e8dbd9f7] [formerly 37b0ede2385e153153a854112ffab1065bcdd44d [formerly f89b86939e36d97cefead23968b8b6fb9ca8ffd8]] Former-commit-id: 84fc2f9742c2e0011254ee762faf6f087986c6fa [formerly f22c175e96173bf25aa08067533937041152fdb3] Former-commit-id: 32981c2a1211608d2d5c059264aa5eb434099400 --- assets/src/components/prompts/Copy.vue | 1 + assets/src/components/prompts/Move.vue | 1 + assets/src/css/base.css | 5 +++++ assets/src/router/index.js | 2 +- filemanager.go | 2 +- rice-box.go.REMOVED.git-id | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/assets/src/components/prompts/Copy.vue b/assets/src/components/prompts/Copy.vue index a312bcd3..b1523d1c 100644 --- a/assets/src/components/prompts/Copy.vue +++ b/assets/src/components/prompts/Copy.vue @@ -16,6 +16,7 @@ :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }} diff --git a/assets/src/components/prompts/Move.vue b/assets/src/components/prompts/Move.vue index 6ff75f3f..8df25dd8 100644 --- a/assets/src/components/prompts/Move.vue +++ b/assets/src/components/prompts/Move.vue @@ -15,6 +15,7 @@ :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }} diff --git a/assets/src/css/base.css b/assets/src/css/base.css index 54b11660..c6eeaa79 100644 --- a/assets/src/css/base.css +++ b/assets/src/css/base.css @@ -112,6 +112,11 @@ button.flat.cancel { color: #ccc; } +button.flat[disabled] { + color: #ccc; + cursor: not-allowed; +} + .mobile-only { display: none !important; } diff --git a/assets/src/router/index.js b/assets/src/router/index.js index cbc0e1e3..39d387d3 100644 --- a/assets/src/router/index.js +++ b/assets/src/router/index.js @@ -11,7 +11,7 @@ import ProfileSettings from '@/views/settings/Profile' import Error403 from '@/views/errors/403' import Error404 from '@/views/errors/404' import Error500 from '@/views/errors/500' -import auth from '@/utils/auth.js' +import auth from '@/utils/auth' import store from '@/store' Vue.use(Router) diff --git a/filemanager.go b/filemanager.go index 22d4116e..bc1089c6 100644 --- a/filemanager.go +++ b/filemanager.go @@ -24,7 +24,7 @@ import ( // Version is the current File Manager version. const ( // Version is the current File Manager version. - Version = "(untracked)" + Version = "1.3.4" ListViewMode = "list" MosaicViewMode = "mosaic" diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id index eafb6a1e..18bd8785 100644 --- a/rice-box.go.REMOVED.git-id +++ b/rice-box.go.REMOVED.git-id @@ -1 +1 @@ -cc3d5748ed2706fd16dab2451b473d31d4f43c11 \ No newline at end of file +516ce42a80231bca5557d985bfafe57fd07ba59d \ No newline at end of file