Commit Graph

872 Commits

Author SHA1 Message Date
Peter Papp
2f238c90d9 Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-19 15:30:46 +02:00
Peter Papp
6f9ae7ebfe - added new invoice strings 2021-05-19 15:30:36 +02:00
Peter Papp
983425b89a - decimal price fixes 2021-05-19 13:03:33 +02:00
MakingCG
ca9ed1029e Fix backend code styling 2021-05-19 06:38:55 +00:00
Peter Papp
78aa1a0779 - added unit into invoice 2021-05-19 08:38:21 +02: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
0000909ec0 Merge remote-tracking branch 'origin/master' 2021-05-17 11:49:42 +02:00
Peter Papp
61824a511c - mad zipper hotfix 2021-05-17 11:49:19 +02:00
MakingCG
cb239fb3bc Fix backend code styling 2021-05-17 08:50:44 +00:00
Peter Papp
08099b9671 Merge remote-tracking branch 'origin/master' 2021-05-17 10:50:16 +02:00
Peter Papp
bb8a205b7e - php fixer upgrade 2021-05-17 10:50:06 +02:00
MakingCG
09dda32dfd Application Build 2021-05-17 08:47:48 +00:00
Peter Papp
790052804e - php fixer upgrade
- workflow update
- npm update
2021-05-17 10:45:50 +02:00
Peter Papp
e371b37016 Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-17 10:08:51 +02:00
Peter Papp
05583f74af added Code Style Fix workflow 2021-05-17 10:04:22 +02:00
MakingCG
6cbffd08b2 Application Build 2021-05-17 08:03:54 +00:00
Peter Papp
66fe92653c added frontend build workflow 2021-05-17 10:01:42 +02:00
Peter Papp
b16b8b87cc - dark mode
- fixes
2021-05-17 10:00:01 +02:00
MakingCG
2e233990a2 Application Build 2021-05-15 05:28:00 +00: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
6dc34964d8 upload fix 2021-05-15 07:22:57 +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
0eee956011 setup billing profile redirect 2021-05-14 10:42:59 +02:00
Peter Papp
722eceb0c1 bug fixes 2021-05-14 10:29:46 +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
f5958dda57 - fixes 2021-05-11 18:24:22 +02:00
Peter Papp
e8ca132a8b - Invoice sorting refactored
- Frontend build
2021-05-11 10:57:30 +02:00
Peter Papp
a7a6ef9f0a Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	public/mix-manifest.json
#	resources/js/components/FilesView/Option.vue
#	resources/js/components/Others/MobileNavigation.vue
2021-05-11 10:37:31 +02:00
MakingCG
688f234ae1 Application Build 2021-05-11 08:36:10 +00:00
Peter Papp
6e330046b3 Added arrows to Option.vue component 2021-05-11 10:34:08 +02:00
Peter Papp
438ddbb868 removed padding in mobile pdf view 2021-05-11 10:16:12 +02:00
Peter Papp
a6db642db7 Invoice & Clients sorting 2021-05-11 10:09:50 +02:00
Peter Papp
1ea8f2ce60 share invoice on email frontend 2021-05-11 08:51:41 +02:00
MakingCG
bcd4209aca Application Build 2021-05-11 06:38:21 +00:00
Peter Papp
88ac70bc67 Merge pull request #2 from MakingCG/dependabot/npm_and_yarn/axios-0.21.1
Bump axios from 0.19.2 to 0.21.1
2021-05-11 08:36:35 +02:00
Peter Papp
b31fb4f7d2 Merge pull request #1 from MakingCG/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21
2021-05-11 08:36:24 +02:00
Peter Papp
862fc68134 Merge pull request #3 from MakingCG/dependabot/npm_and_yarn/url-parse-1.5.1
Bump url-parse from 1.4.7 to 1.5.1
2021-05-11 08:36:10 +02:00
Peter Papp
a04c2de84f Merge pull request #4 from MakingCG/dependabot/npm_and_yarn/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9
2021-05-11 08:35:53 +02:00
dependabot[bot]
6ac8089cd7 Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 06:33:58 +00:00
dependabot[bot]
f29a2571df Bump url-parse from 1.4.7 to 1.5.1
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 06:33:11 +00:00
dependabot[bot]
c0d1fa6965 Bump axios from 0.19.2 to 0.21.1
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 06:32:42 +00:00
dependabot[bot]
499e4e8f7c Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 06:32:01 +00: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
MakingCG
e9a1ad9f09 Application Build 2021-05-10 15:14:43 +00:00
Peter Papp
dccf006f1e Merge remote-tracking branch 'origin/master' 2021-05-10 17:12:43 +02:00