Commit Graph

7 Commits

Author SHA1 Message Date
Peter Papp
ee4a2205f6 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
2021-03-27 12:12:42 +01:00
Peter Papp
cff7cd6b32 custom color theme part 1 2021-03-20 10:25:10 +01:00
Peter Papp
87e05d9521 - App container 2021-03-17 08:25:44 +01:00
Milos Holba
9a1a9ee206 add Language component 2021-02-21 12:09:24 +01:00
carodej
5a9f5813c8 dark mode update 2020-07-09 10:56:17 +02:00
carodej
05bc598405 frontend update 2020-07-02 18:04:10 +02:00
carodej
aedc98cc8b setup wizard init 2020-06-29 10:09:42 +02:00