Merge remote-tracking branch 'origin/version-1.8.3' into v2

# Conflicts:
#	app/FileManagerFolder.php
#	app/Http/Controllers/AppFunctionsController.php
#	app/Http/Controllers/Auth/AuthController.php
#	app/Http/Controllers/FileManager/BrowseController.php
#	app/Http/Controllers/General/SetupWizardController.php
#	app/Http/Controllers/General/UpgradeAppController.php
#	app/Http/Controllers/Sharing/FileSharingController.php
#	app/Http/helpers.php
#	app/Setting.php
#	composer.lock
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/components/Others/Forms/FormLabel.vue
#	resources/js/store/modules/app.js
#	resources/js/views/Admin.vue
#	resources/js/views/Mobile/AdminMobileMenu.vue
#	resources/js/views/Shared/SharedPage.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/crawler/og-view.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	routes/api.php
#	routes/web.php
This commit is contained in:
Peter Papp
2021-03-27 12:12:42 +01:00
39 changed files with 3404 additions and 132 deletions

View File

@@ -23,6 +23,29 @@ const Helpers = {
})
}, 150)
Vue.prototype.$loadLanguage = function (language) {
return new Promise((resolve, reject) => {
let locale = language ? language : this.$store.getters.config.language
axios.get(`/language/${locale}`)
.then((response) => {
let lang = response.data.language_strings
let obj = {}
lang.map(element => {
obj[element.key] = element.value
})
i18n.setLocaleMessage(locale, obj)
i18n.locale = locale
resolve(true)
})
})
}
Vue.prototype.$updateImage = function (route, name, image) {
// Create form