Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	composer.json
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.js
#	public/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js
#	public/chunks/app-billings.js
#	public/chunks/app-email.js
#	public/chunks/app-index.js
#	public/chunks/app-language.js
#	public/chunks/app-others.js
#	public/chunks/app-payments.js
#	public/chunks/app-settings.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/contact-us.js
#	public/chunks/create-new-password.js
#	public/chunks/dashboard.js
#	public/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/user-invoices.js
#	public/chunks/database.js
#	public/chunks/dynamic-page.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/forgotten-password.js
#	public/chunks/homepage.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/invoices.js
#	public/chunks/page-edit.js
#	public/chunks/pages.js
#	public/chunks/plan-create.js
#	public/chunks/plan-delete.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plan.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/platform~chunks/shared.js
#	public/chunks/profile.js
#	public/chunks/profile~chunks/settings-password.js
#	public/chunks/purchase-code.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-password.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-storage.js
#	public/chunks/settings-subscription.js
#	public/chunks/settings.js
#	public/chunks/setup-wizard.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/file-browser.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/chunks/sign-up.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/subscription-service.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-password.js
#	public/chunks/user-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/css/app.css
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/router.js
#	resources/js/store/modules/userAuth.js

resources/js/App.vue

@@ -1,18 +1,24 @@
 <template>
     <div id="vuefilemanager" @click="unClick" v-cloak>
+
+        <!--UI components-->
         <Alert />
         <ToastrWrapper />
-
-        <router-view v-if="isLoadedTranslations" />
-
         <CookieDisclaimer />
         <Vignette />
+
+        <!--Show spinner before translations is loaded-->
+        <Spinner v-if="! isLoadedTranslations"/>
+
+        <!--App view-->
+        <router-view v-if="isLoadedTranslations" />
     </div>
 </template>
 
 <script>
 import ToastrWrapper from '@/components/Others/Notifications/ToastrWrapper'
 import CookieDisclaimer from '@/components/Others/CookieDisclaimer'
+import Spinner from '@/components/FilesView/Spinner'
 import Vignette from '@/components/Others/Vignette'
 import Alert from '@/components/FilesView/Alert'
 import {events} from './bus'
@@ -23,6 +29,7 @@ export default {
         CookieDisclaimer,
         ToastrWrapper,
         Vignette,
+        Spinner,
         Alert
     },
     data() {
@@ -39,7 +46,7 @@ export default {
 
         // Get language translations
         this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.language)
-            .then(response => {
+            .then(() => {
                 this.isLoadedTranslations = true
 
                 // Store config to vuex

resources/js/components/FilesView/ContextMenu.vue

@@ -96,7 +96,6 @@
                 <Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
-
             <OptionGroup v-if="item && isMultiSelectContextMenu">
                 <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
                 <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
@@ -106,7 +105,6 @@
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-
             <OptionGroup v-if="item && isMultiSelectContextMenu ">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
@@ -139,7 +137,6 @@
             </OptionGroup>
 
             <!-- Single options -->
-
             <OptionGroup v-if="item && isMultiSelectContextMenu">
                 <Option @click.native="renameItem" :title=" $t('context_menu.rename')" icon="rename" />
                 <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
@@ -153,7 +150,6 @@
             </OptionGroup>
 
             <!-- Multi options -->
-
             <OptionGroup v-if="item && !isMultiSelectContextMenu">
                 <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
@@ -323,7 +319,9 @@ export default {
             }
         },
         createFolder() {
-            this.$store.dispatch('createFolder', this.$t('popup_create_folder.folder_default_name'))
+            this.$store.dispatch('createFolder', {
+                name: this.$t('popup_create_folder.folder_default_name')
+            })
         },
         closeAndResetContextMenu() {
             // Close context menu

resources/js/components/Others/ShareEdit.vue

@@ -207,7 +207,7 @@
                 this.isLoading = true
 
                 axios.
-                    post(`/api/share/${this.shareOptions.token}/send-email`, {
+                    post(`/api/share/${this.shareOptions.token}/email`, {
                         emails: this.emails
                     })
                     .catch(() => {

resources/js/components/Others/UserImageInput.vue

@@ -52,7 +52,7 @@
                     reader.readAsDataURL(file)
 
                     // Update user avatar
-                    this.$updateImage('/user/profile', 'avatar', event.target.files[0])
+                    this.$updateImage('/user/relationships/settings', 'avatar', event.target.files[0])
                 } else {
                     alert( this.$t('validation_errors.wrong_image') )
                 }

resources/js/components/Sidebar/MenuBar.vue

@@ -33,7 +33,7 @@
             </router-link>
         </div>
 
-        <!--User avatar & Logout-->
+        <!--Logout-->
         <ul class="icon-navigation logout">
             <li @click="$store.dispatch('logOut')" :title="$t('locations.logout')" class="icon-navigation-item">
                 <div class="button-icon">

resources/js/helpers.js

@@ -12,10 +12,10 @@ const Helpers = {
 
             let enableEmptyInput = ['mimetypes_blacklist', 'google_analytics', 'upload_limit']
 
-            if (value === '' && !enableEmptyInput.includes(name)) return
+            if (value === '' || value === ' ' && !enableEmptyInput.includes(name)) return
 
             axios.post(this.$store.getters.api + route, {name, value, _method: 'patch'})
-                .catch(error => {
+                .catch(() => {
                     events.$emit('alert:open', {
                         title: this.$t('popup_error.title'),
                         message: this.$t('popup_error.message'),
@@ -90,10 +90,6 @@ const Helpers = {
             win.focus()
         }
 
-        Vue.prototype.$createFolder = function (folderName) {
-            this.$store.dispatch('createFolder', folderName)
-        }
-
         Vue.prototype.$uploadFiles = async function (files) {
 
             if (files.length == 0) return

resources/js/views/Admin/Users.vue

@@ -139,7 +139,7 @@
             this.columns = [
                 {
                     label: this.$t('admin_page_user.table.name'),
-                    field: 'name',
+                    field: 'email',
                     sortable: true
                 },
                 {

resources/js/views/User/Settings.vue

@@ -178,7 +178,7 @@
         methods: {
             changeUserName() {
                 this.$store.commit('UPDATE_NAME', this.userInfo.name)
-                this.$updateText('/user/profile', 'name', this.userInfo.name)
+                this.$updateText('/user/relationships/settings', 'name', this.userInfo.name)
             }
         },
         created() {