Commit Graph

63 Commits

Author SHA1 Message Date
Peter Papp eae212ac5d - Invoice listing in frontend 2021-04-21 16:53:39 +02:00
Peter Papp 80019b822d Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js
#	public/chunks/app-language.js
#	public/chunks/app-settings.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/dashboard.js
#	public/chunks/database.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/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-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plan.js
#	public/chunks/plans.js
#	public/chunks/platform.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-payment-methods.js
#	public/chunks/settings-storage.js
#	public/chunks/settings-subscription.js
#	public/chunks/settings.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.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-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	public/vendors~chunks/platform~chunks/shared.js
2021-04-20 08:15:34 +02:00
Peter Papp 0910daa1a3 Move to home folder fix 2021-04-16 16:54:59 +02:00
Peter Papp 498f81b846 Changed contact informations on homepage 2021-04-16 10:34:06 +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 bf9581173c - S3 storages compatibility with v2
- user profile fixes
2021-04-06 18:01:59 +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 71147adb01 - flush cache after language upgrade
- Gateway fix
- extended language editor with textarea
2021-04-06 10:27:02 +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 13992deb41 - added function to upgrade language translations
- maintenance gate
2021-04-06 09:56:11 +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 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 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 0e3c6e286e - extend setup:dev script
- Stripe taxes refactoring
- billing subscription fixes
2021-03-24 08:42:10 +01:00
Peter Papp 480f518ebc - Fixed UpgradeBilling.vue
- Fixed CreatePaymentMethod.vue
2021-03-24 08:19:52 +01:00
Peter Papp 888d76fea0 - scheduler command updates
- Order reminder notification
2021-03-24 07:32:08 +01:00
Peter Papp 19925e398f - refactored PricingResource
- get_tax_rates added into StripeService.php
2021-03-23 09:40:30 +01:00
Peter Papp 4163c28e37 - Get plan from cache in StripeService.php 2021-03-23 09:34:19 +01:00
Peter Papp 97f13c0b62 - added payment page 2021-03-23 09:07:31 +01:00
Peter Papp 778a94e5ba - Pay and subscribe from generated Subscription Request 2021-03-22 15:41:47 +01:00
Peter Papp 3c01ce5ad3 - admin client order 2021-03-22 10:43:37 +01:00
Peter Papp 80b24cd753 - added CzechRegisterSearchService
- oasis RouteServiceProvider.php
- oasis admincontroller
2021-03-22 08:19:50 +01:00
Peter Papp aa51484303 - refactored user_scope to author
- added author_id for future teams implementation
2021-03-19 11:27:58 +01:00
Peter Papp f4b3f1f163 - public sharing refactored part 3 2021-03-19 10:13:48 +01:00
Peter Papp ed8ab2978f - public sharing refactored part 2 2021-03-19 09:04:18 +01:00
Peter Papp db9900fcfb - public sharing refactored part 1 2021-03-19 07:27:15 +01:00
Peter Papp f0e9c80572 frontend function consolidation part 2 2021-03-16 11:53:19 +01:00
Peter Papp 1bb59854ea frontend function consolidation part 1 2021-03-16 08:31:42 +01:00
Peter Papp cb272709a3 DemoService.php refactoring 2021-03-14 17:48:26 +01:00
Peter Papp 732fc48aa4 get_items_under_shared_by_folder_id moved to HelperService.php 2021-03-14 17:20:30 +01:00
Peter Papp 380a588b0a added SharedFileAccessContentController 2021-03-14 13:25:35 +01:00
Peter Papp 9297eae1d7 moved move_to_external_storage into HelperService.php 2021-03-14 13:11:21 +01:00
Peter Papp 419a1d8180 moved move_to_external_storage into HelperService.php 2021-03-14 13:05:53 +01:00
Peter Papp 9cc9111d63 moved check_user_storage_capacity into HelperService.php 2021-03-14 13:03:09 +01:00
Peter Papp 0364e73c60 Guardian and FileManagerService.php refactored 2021-03-14 12:54:34 +01:00
Peter Papp bb469f2520 added delete_failed_files into SchedulerService.php 2021-03-14 12:42:25 +01:00
Peter Papp 5660fcd4dc added it_get_all_invoices_from_admin, it_get_single_user_invoice_page test 2021-03-07 09:50:04 +01:00
Peter Papp ce08240355 added it_update_settings, it_get_page, it_update_settings_image test 2021-03-05 11:57:48 +01:00
Peter Papp e514994b08 added it_get_all_pages, it_get_page, it_update_page test 2021-03-05 11:02:13 +01:00
Peter Papp 779b7fc8ba added it_delete_user_with_all_data test 2021-03-05 10:35:30 +01:00
Peter Papp 69b72d24a9 added it_get_setup_intent, it_upgrade_plan, it_cancel_subscription test 2021-03-04 12:48:51 +01:00
Peter Papp 7f21755f5a added UserAccountTest 2021-03-02 17:24:13 +01:00
Peter Papp f95b3acbd2 refactored create_directories 2021-03-02 17:13:01 +01:00
Peter Papp 4e098286a6 - added it_delete_zips_older_than_one_day test
- refactored scheduler tasks into SchedulerService.php
2021-03-02 17:05:49 +01:00