Commit Graph

727 Commits

Author SHA1 Message Date
Peter Papp e78f1ce731 - removed sign in credentials 2021-04-07 13:21:02 +02:00
Peter Papp b00c8cdbed - updated composer 2021-04-07 08:16:29 +02:00
Peter Papp 44a656e5d5 - updated composer 2021-04-07 08:12:02 +02:00
Peter Papp 11c6690e50 - frontend build 2021-04-07 07:53:11 +02:00
Peter Papp fac75c7e71 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
2021-04-07 07:52:07 +02:00
Peter Papp 30ae2c0a54 - fixes 2021-04-07 07:48:07 +02:00
Peter Papp 87b3625b27 - frontend build 2021-04-06 18:08:12 +02:00
Peter Papp bf9581173c - S3 storages compatibility with v2
- user profile fixes
2021-04-06 18:01:59 +02:00
Peter Papp 57bab1a225 - frontend build
- fixes
2021-04-06 10:46:32 +02:00
Peter Papp 17ccf7b354 Merge remote-tracking branch 'origin/master' into oasis 2021-04-06 10:41:38 +02:00
Peter Papp e40ddbec14 fixed upgrade_language_translations 2021-04-06 10:40:51 +02:00
Peter Papp 131ae8109f - flush cache after language upgrade
- Gateway fix
- extended language editor with textarea
2021-04-06 10:32:50 +02:00
Peter Papp 90c0466cd0 - fixed setup wizard 2021-04-06 10:31:34 +02:00
Peter Papp 71147adb01 - flush cache after language upgrade
- Gateway fix
- extended language editor with textarea
2021-04-06 10:27:02 +02:00
Peter Papp 7cefcf8dab - fixed setup wizard
- fixed oasis UserAccountTest.php
2021-04-06 10:10:38 +02:00
Peter Papp 737adfa91a Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json
2021-04-06 10:02:20 +02:00
Peter Papp f531ffce11 it_upgrade_default_language_translations test refactored 2021-04-06 10:01:34 +02:00
Peter Papp 13992deb41 - added function to upgrade language translations
- maintenance gate
2021-04-06 09:56:11 +02:00
Peter Papp 20f8fe4b51 - i18n implementation into homepage 2021-04-06 08:26:35 +02:00
Peter Papp e0daa46b50 - dark mode 2021-04-06 07:23:43 +02:00
Peter Papp 2ca4d4a02d - homepage mobile 2021-04-05 18:00:54 +02:00
Peter Papp 399748b01a - homepage desktop, ipad landscape 2021-04-05 16:43:12 +02:00
Peter Papp 2f4df83b31 - homepage illustrations part 2 2021-04-05 10:15:33 +02:00
Peter Papp 9ea78d103e - homepage illustrations part 1 2021-04-05 08:47:49 +02:00
Peter Papp 790da00420 - added OasisContact.vue
- Mobile responsivenes
2021-04-05 07:07:28 +02:00
Peter Papp 760d7a4687 Added OasisFooter.vue 2021-04-04 07:59:58 +02:00
Peter Papp 37ab6408ba Added OasisAboutUs.vue 2021-04-04 07:32:56 +02:00
Peter Papp b3737c11ba Added OasisNavigation.vue and OasisPricing.vue 2021-04-03 11:28:05 +02:00
Peter Papp 4f667f7a94 Added OasisFeatures.vue and OasisHeader.vue 2021-04-03 10:44:32 +02:00
Peter Papp 377c471a6c Oasis landingpage scaffolding 2021-04-03 07:50:57 +02:00
Peter Papp b2d133e5a3 Merge remote-tracking branch 'origin/v2'
# Conflicts:
#	config/content.php
#	config/vuefilemanager.php
#	public/mix-manifest.json
#	resources/js/views/Mobile/AdminMobileMenu.vue
#	resources/js/views/Shared/SharedPage.vue
2021-04-03 07:40:32 +02:00
Peter Papp 26085c475f - Language translation fixes 2021-04-01 11:50:40 +02:00
Peter Papp 7cf09494e5 - Language implementation for oasis
- frontend build
2021-04-01 11:48:38 +02:00
Peter Papp 5d0348e2d0 Merge remote-tracking branch 'origin/v2' into oasis
# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php
2021-04-01 10:45:10 +02:00
Peter Papp 7772ef6b40 Language editor refactoring part 4 (backend + frontend) 2021-04-01 10:40:48 +02:00
Peter Papp 5130082111 Language editor refactoring part 3 (backend + frontend) 2021-04-01 07:50:01 +02:00
Peter Papp a8fa3694be helpers refactoring 2021-03-31 08:27:28 +02:00
Peter Papp 6ac6528243 Language editor refactoring part 2 (backend + frontend) 2021-03-28 14:06:16 +02:00
Peter Papp ec51440c3a Language editor refactoring part 1 (nackend) 2021-03-27 18:53:41 +01:00
Peter Papp cdb395c77f cleaning 2021-03-27 12:21:35 +01:00
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 0f357ace50 index.blade.php fixes 2021-03-27 11:47:09 +01:00
Peter Papp 4d5cd3d80f added og_image and touch_icon into admin appearance panel 2021-03-27 11:33:42 +01:00
Peter Papp bb3f4d4bda custom color theme part 4 2021-03-27 10:56:23 +01:00
Peter Papp 6d5a43da72 frontend build 2021-03-26 16:59:08 +01:00
Peter Papp d2a82aaa80 frontend build 2021-03-26 16:42:58 +01:00
Milos Holba 9fef371099 add language setting for moobile devices, add upgrade a update app function 2021-03-26 16:20:19 +01:00
Peter Papp 9e330da7a6 - favicon fix
- checkout fix
- stripe prefered locales
- color theme
- stripe card info box in dev version
- upload fix
2021-03-26 16:05:37 +01:00
Peter Papp a3d4dfec3b - favicon fix
- checkout fix
- stripe prefered locales
- color theme
- stripe card info box in dev version
2021-03-26 16:02:02 +01:00
Peter Papp 254a00e18e - cancel/resume subscription fix
- upload into root folder fix
- custom color theme part 3
2021-03-25 15:49:04 +01:00