Commit Graph

445 Commits

Author SHA1 Message Date
MakingCG
c132601f06 Fix backend code styling 2021-07-09 10:19:13 +00:00
Peter Papp
0e4595c30f Merge remote-tracking branch 'origin/oasis' into oasis
# Conflicts:
#	app/Http/helpers.php
2021-07-09 12:18:17 +02:00
Peter Papp
d9ee68db7c Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	app/Http/helpers.php
2021-07-09 12:06:58 +02:00
Peter Papp
82019f4833 safety functions helper 2021-07-09 12:05:09 +02:00
MakingCG
756e0c4ca3 Fix backend code styling 2021-06-29 16:40:19 +00:00
Peter Papp
c52c576f7c Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json
2021-06-29 18:38:53 +02:00
MakingCG
449724e78a Fix backend code styling 2021-06-18 15:35:41 +00:00
Peter Papp
e5de408ab0 Merge remote-tracking branch 'origin/master' 2021-06-18 17:35:16 +02:00
Peter Papp
f6f9199b87 Filename as original 2021-06-18 17:23:40 +02:00
MakingCG
cb99e105c0 Fix backend code styling 2021-06-15 16:37:41 +00:00
Peter Papp
c0da1b0b07 Alibaba OSS support 2021-06-15 18:37:03 +02:00
Peter Papp
f2be4059cf Set app locale 2021-06-15 18:04:02 +02:00
Peter Papp
b50e0041e0 - chunking translations query
- language translations fallback
2021-06-07 17:42:53 +02:00
Peter Papp
847221d385 - chunking translations query 2021-06-07 16:42:18 +02:00
MakingCG
350f130d98 Fix backend code styling 2021-05-24 14:48:13 +00:00
Peter Papp
8a2af11f6a - invoice fixes
- optimization for new invoicing module
2021-05-24 16:47:21 +02:00
MakingCG
ca9ed1029e Fix backend code styling 2021-05-19 06:38:55 +00:00
Peter Papp
4ec2d1077f Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	.github/workflows/backend-code-style-fix.yml
#	.github/workflows/unit-testing.yml
#	composer.lock
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.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/database.js
#	public/chunks/dynamic-page.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/chunks/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/profile.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/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
2021-05-19 06:53:33 +02:00
Peter Papp
61824a511c - mad zipper hotfix 2021-05-17 11:49:19 +02:00
Peter Papp
790052804e - php fixer upgrade
- workflow update
- npm update
2021-05-17 10:45:50 +02:00
Peter Papp
04a1f88abb Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	composer.lock
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.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/dashboard.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/chunks/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.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-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
2021-05-15 07:27:01 +02:00
Peter Papp
8a1c20bf4a setup:dev fix 2021-05-15 07:26:02 +02:00
Peter Papp
d8bbfcd4d2 External storage fix 2021-05-14 20:03:07 +02:00
Peter Papp
26f23863c0 setup account fix 2021-05-14 19:31:23 +02:00
Peter Papp
b4e6561134 routes refactoring 2021-05-13 17:50:42 +02:00
Peter Papp
3af8bff13b - removed invoicing from oasis 2021-05-13 09:31:16 +02:00
Peter Papp
e8ca132a8b - Invoice sorting refactored
- Frontend build
2021-05-11 10:57:30 +02:00
Peter Papp
a6db642db7 Invoice & Clients sorting 2021-05-11 10:09:50 +02:00
Peter Papp
5ea898d716 share invoice on email backend 2021-05-11 07:45:38 +02:00
Peter Papp
9857a30d2c Helper methods refactoring 2021-05-11 07:27:26 +02:00
Peter Papp
ca255a7416 Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.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-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/contact-us.js
#	public/chunks/dashboard.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/files.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/plans.js
#	public/chunks/platform.js
#	public/chunks/profile.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.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/js/main.js
#	public/mix-manifest.json
#	resources/js/helpers.js
2021-05-10 17:15:37 +02:00
Peter Papp
5e0007764e Stripe get plans fix 2021-05-10 08:07:41 +02:00
Peter Papp
50bdac62dc fixed static issues 2021-05-08 09:41:10 +02:00
Peter Papp
73672bc023 i18n implementation into invoice module 2021-05-07 11:32:48 +02:00
Peter Papp
070f8b4d40 frontend fixes 2021-05-07 07:35:03 +02:00
Peter Papp
bd881da856 - allow empty input
- allow svg avatar
2021-05-06 10:08:58 +02:00
Peter Papp
69deafeda0 Set up billing profile 2021-05-06 09:15:37 +02:00
Peter Papp
599b238ab4 Edit invoice 2021-05-05 17:07:36 +02:00
Peter Papp
62820c8ddb invoice frontend improvements 2021-05-04 17:43:42 +02:00
Peter Papp
7cc27938bf Mobile optimization 2021-05-04 16:39:59 +02:00
Peter Papp
0332f8b1fb invoice backend VAT & discount calculations 2021-05-04 09:44:55 +02:00
Peter Papp
23611defc1 mobile optimization 2021-05-03 09:07:35 +02:00
Peter Papp
434c45299c oasis setup script 2021-05-03 08:12:37 +02:00
Peter Papp
3c3e82758d Create invoice form part 1. 2021-04-30 17:53:19 +02:00
Peter Papp
aea4213ec2 Client cards 2021-04-29 15:01:50 +02:00
Peter Papp
31dd782bae Resource refactoring 2021-04-29 12:53:17 +02:00
Peter Papp
1486ce63fa Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	app/Console/Commands/SetupDevEnvironment.php
#	app/Console/Kernel.php
#	app/Http/Resources/InvoiceResource.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	config/app.php
#	config/custom-language-translations.php
#	config/language-translations.php
#	public/chunks/admin.js
#	public/chunks/app-language.js
#	public/chunks/dashboard.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/invoices.js
#	public/chunks/pages.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-subscription.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/user-invoices.js
#	public/chunks/user-subscription.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
2021-04-29 11:06:14 +02:00
Peter Papp
834b0ba5e0 Edit client detail 2021-04-29 10:54:10 +02:00
Peter Papp
19bce195b4 Create client frontend 2021-04-29 08:57:53 +02:00
Peter Papp
13ec1257e1 Delete invoice 2021-04-28 18:44:42 +02:00