Merge remote-tracking branch 'origin/master' into filepreview
# Conflicts: # .env.example # package-lock.json # package.json # public/js/main.js # public/mix-manifest.json # resources/js/App.vue # resources/js/helpers.js # resources/js/i18n/lang/en.json # resources/js/i18n/lang/sk.json # resources/js/store/modules/fileFunctions.js # resources/js/views/Shared/SharedPage.vue
@@ -1 +0,0 @@
|
||||
<svg width="106" height="23" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="M23.715 17.145h2.07c.727 0 1.543-.31 1.543-1.227 0-.992-1.113-1.156-1.871-1.156h-1.742v2.383zm0-4.336h1.672c.71 0 1.449-.297 1.449-1.141 0-.875-.828-1.098-1.55-1.098h-1.571v2.239zm-2.313-4.192h3.91c1.836 0 3.836.387 3.836 2.664 0 1.168-.726 1.969-1.808 2.313v.027c1.375.18 2.297 1.2 2.297 2.563 0 2.187-2.075 2.918-3.938 2.918h-4.297V8.617zm13.789 3.051l-1.27 3.258h2.56l-1.29-3.258zm-.886-3.05h1.91l4.558 10.484h-2.605l-.902-2.223h-4.07l-.876 2.223h-2.547l4.532-10.485zM48.54 11.34c-.462-.547-1.13-.856-1.985-.856-1.746 0-3.035 1.418-3.035 3.375 0 1.954 1.289 3.375 2.96 3.375.93 0 1.688-.414 2.16-1.125l1.926 1.434c-.87 1.246-2.351 1.824-3.793 1.824-3.27 0-5.652-2.148-5.652-5.508 0-3.363 2.383-5.507 5.652-5.507 1.172 0 2.653.398 3.543 1.539L48.54 11.34zm3.233-2.723h2.309v4.352l4.07-4.352h3.02l-4.664 4.871 5.066 5.614h-3.226l-4.266-4.977v4.977h-2.309z" fill="#231F20"/><path d="M64.54 17.145h2.073c.727 0 1.54-.31 1.54-1.227 0-.992-1.11-1.156-1.864-1.156h-1.75v2.383zm0-4.336h1.67c.716 0 1.454-.297 1.454-1.141 0-.875-.828-1.098-1.555-1.098h-1.57v2.239zm-2.31-4.192h3.91c1.833 0 3.833.387 3.833 2.664 0 1.168-.727 1.969-1.805 2.313v.027c1.375.18 2.297 1.2 2.297 2.563 0 2.187-2.074 2.918-3.942 2.918H62.23V8.617zm9.54 0h2.312v8.352h4.277v2.133h-6.59z" fill="#646475"/><path d="M82.59 11.668l-1.274 3.258h2.563l-1.29-3.258zm-.887-3.05h1.91l4.559 10.484H85.57l-.906-2.223H80.59l-.871 2.223h-2.547l4.531-10.485zm6.832 8.351l5.317-6.309h-5.125V8.617h7.921v2.043l-5.21 6.309h5.39v2.133h-8.293zm9.82-8.352h7.125v2.133h-4.816v1.953h4.547v2.133h-4.547v2.133h5.082v2.133h-7.39z" fill="#646475"/><path d="M4.555-.027s3.422 2.992 2.957 5.644c-.207 1.18-1.774 3.13-.93 4.98.914 1.997 1.387 5.844-2.723 4.848C-.195 14.465.121 9.5 3.133 6.88 6.187 4.223 5.156 1.3 4.555-.027" fill="#D30035"/><path d="M7.68 8.945c-.227 2.02 2.007 4.032.234 6.766-1.23 1.894.656 4.555 3.078 4.07 2.656-.531 3.313-2.21 3.242-4.16-.093-2.476-1.078-3.164-3.27-5.023-2.37-2.012-.538-5.809-.538-5.809S7.934 6.723 7.68 8.945" fill="#D30035"/><path d="M.465 14.855c.75.922 2.2 2.008 4.976 2.07.84.016.184 1.583 1.864 2.993 1.453 1.223 3.41 1.25 4.457.855.61-.226 1.183-.445.742.122-1.973 2.527-5.399 2.367-7.844 1.453-2.906-1.086-3.637-3.223-4.113-4.555-.512-1.445-.25-3.145-.082-2.938" fill="#D30035"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 674 KiB After Width: | Height: | Size: 665 KiB |
|
Before Width: | Height: | Size: 738 KiB After Width: | Height: | Size: 615 KiB |
@@ -0,0 +1 @@
|
||||
(window.webpackJsonp=window.webpackJsonp||[]).push([[42],{556:function(e,t,r){"use strict";r.r(t);var n=r(7);function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var c={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){i(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){"setup-done"!==this.config.installation&&"quiet-update"!==this.config.installation||this.$router.push({name:"SignIn"})}},u=r(0),a=Object(u.a)(c,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=a.exports}}]);
|
||||
@@ -1,11 +1,66 @@
|
||||
{
|
||||
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js",
|
||||
"/js/main.js": "/js/main.js",
|
||||
"/css/app.css": "/css/app.css",
|
||||
"/js/main.972096550c1a7f368735.hot-update.js": "/js/main.972096550c1a7f368735.hot-update.js",
|
||||
"/js/main.f5bdb077ae008261b7cc.hot-update.js": "/js/main.f5bdb077ae008261b7cc.hot-update.js",
|
||||
"/js/main.f5271b849a9afac1ca3e.hot-update.js": "/js/main.f5271b849a9afac1ca3e.hot-update.js",
|
||||
"/js/main.cd26f566c89e3ea7d999.hot-update.js": "/js/main.cd26f566c89e3ea7d999.hot-update.js",
|
||||
"/js/main.ec8883e3bc6200937b70.hot-update.js": "/js/main.ec8883e3bc6200937b70.hot-update.js",
|
||||
"/js/main.86422d63264ce98aedc4.hot-update.js": "/js/main.86422d63264ce98aedc4.hot-update.js",
|
||||
"/js/main.c73a3d4490ae4ef2ccb0.hot-update.js": "/js/main.c73a3d4490ae4ef2ccb0.hot-update.js"
|
||||
"/chunks/admin.js": "/chunks/admin.js",
|
||||
"/chunks/admin-account.js": "/chunks/admin-account.js",
|
||||
"/chunks/app-appearance.js": "/chunks/app-appearance.js",
|
||||
"/chunks/app-billings.js": "/chunks/app-billings.js",
|
||||
"/chunks/app-email.js": "/chunks/app-email.js",
|
||||
"/chunks/app-index.js": "/chunks/app-index.js",
|
||||
"/chunks/app-others.js": "/chunks/app-others.js",
|
||||
"/chunks/app-payments.js": "/chunks/app-payments.js",
|
||||
"/chunks/app-settings.js": "/chunks/app-settings.js",
|
||||
"/chunks/app-setup.js": "/chunks/app-setup.js",
|
||||
"/chunks/billings-detail.js": "/chunks/billings-detail.js",
|
||||
"/chunks/contact-us.js": "/chunks/contact-us.js",
|
||||
"/chunks/create-new-password.js": "/chunks/create-new-password.js",
|
||||
"/chunks/dashboard.js": "/chunks/dashboard.js",
|
||||
"/chunks/database.js": "/chunks/database.js",
|
||||
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js",
|
||||
"/chunks/environment-setup.js": "/chunks/environment-setup.js",
|
||||
"/chunks/files.js": "/chunks/files.js",
|
||||
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js",
|
||||
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js",
|
||||
"/chunks/invoices.js": "/chunks/invoices.js",
|
||||
"/chunks/landing-page.js": "/chunks/landing-page.js",
|
||||
"/chunks/not-found-shared.js": "/chunks/not-found-shared.js",
|
||||
"/chunks/page-edit.js": "/chunks/page-edit.js",
|
||||
"/chunks/pages.js": "/chunks/pages.js",
|
||||
"/chunks/plan.js": "/chunks/plan.js",
|
||||
"/chunks/plan-create.js": "/chunks/plan-create.js",
|
||||
"/chunks/plan-delete.js": "/chunks/plan-delete.js",
|
||||
"/chunks/plan-settings.js": "/chunks/plan-settings.js",
|
||||
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js",
|
||||
"/chunks/plans.js": "/chunks/plans.js",
|
||||
"/chunks/profile.js": "/chunks/profile.js",
|
||||
"/chunks/purchase-code.js": "/chunks/purchase-code.js",
|
||||
"/chunks/settings.js": "/chunks/settings.js",
|
||||
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js",
|
||||
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js",
|
||||
"/chunks/settings-password.js": "/chunks/settings-password.js",
|
||||
"/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js",
|
||||
"/chunks/settings-storage.js": "/chunks/settings-storage.js",
|
||||
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js",
|
||||
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js",
|
||||
"/chunks/shared-files.js": "/chunks/shared-files.js",
|
||||
"/chunks/shared-page.js": "/chunks/shared-page.js",
|
||||
"/chunks/sign-in.js": "/chunks/sign-in.js",
|
||||
"/chunks/sign-up.js": "/chunks/sign-up.js",
|
||||
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js",
|
||||
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js",
|
||||
"/chunks/subscription-service.js": "/chunks/subscription-service.js",
|
||||
"/chunks/trash.js": "/chunks/trash.js",
|
||||
"/chunks/upgrade.js": "/chunks/upgrade.js",
|
||||
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js",
|
||||
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js",
|
||||
"/chunks/user.js": "/chunks/user.js",
|
||||
"/chunks/user-create.js": "/chunks/user-create.js",
|
||||
"/chunks/user-delete.js": "/chunks/user-delete.js",
|
||||
"/chunks/user-detail.js": "/chunks/user-detail.js",
|
||||
"/chunks/user-invoices.js": "/chunks/user-invoices.js",
|
||||
"/chunks/user-password.js": "/chunks/user-password.js",
|
||||
"/chunks/user-storage.js": "/chunks/user-storage.js",
|
||||
"/chunks/user-subscription.js": "/chunks/user-subscription.js",
|
||||
"/chunks/users.js": "/chunks/users.js"
|
||||
}
|
||||
|
||||