 MakingCG
|
350f130d98
|
Fix backend code styling
|
2021-05-24 14:48:13 +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
|
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
|
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
|
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
|
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
|
0332f8b1fb
|
invoice backend VAT & discount calculations
|
2021-05-04 09:44:55 +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
|
13ec1257e1
|
Delete invoice
|
2021-04-28 18:44:42 +02:00 |
|
|
Peter Papp
|
248825f2d1
|
Delete client
|
2021-04-28 18:15:33 +02:00 |
|
|
Peter Papp
|
b37edd298a
|
Billing profile implementation
|
2021-04-28 15:55:01 +02:00 |
|
|
Peter Papp
|
1e4bbd10f3
|
update invoice profile
|
2021-04-28 08:34:37 +02:00 |
|
|
Peter Papp
|
bcf14595bf
|
store invoice profile
|
2021-04-28 07:32:40 +02:00 |
|
|
Peter Papp
|
e7c4048258
|
added invoice profile
|
2021-04-27 10:16:31 +02:00 |
|
|
Peter Papp
|
f7135c9b27
|
get invoice from url
|
2021-04-27 08:57:00 +02:00 |
|
|
Peter Papp
|
5be490c8d5
|
invoice to mail
|
2021-04-27 07:31:16 +02:00 |
|
|
Peter Papp
|
7cf193abb7
|
pdf invoice generation scaffolding
|
2021-04-26 17:03:17 +02:00 |
|
|
Peter Papp
|
644fbaede4
|
pdf installation
|
2021-04-26 08:15:11 +02:00 |
|
|
Peter Papp
|
c47886fb8b
|
code style fix
|
2021-04-25 09:02:00 +02:00 |
|
|
Peter Papp
|
9a5f9fe49d
|
Create client
|
2021-04-23 08:37:54 +02:00 |
|
|
Peter Papp
|
16c47465e6
|
backend refactored
|
2021-04-23 08:21:26 +02:00 |
|
|
Peter Papp
|
da55b3dd78
|
backend refactored
|
2021-04-23 08:15:38 +02:00 |
|
|
Peter Papp
|
894cef5d66
|
Searching mobile frontend
|
2021-04-22 16:40:45 +02:00 |
|
|
Peter Papp
|
73861f814c
|
Searching backend
|
2021-04-22 09:33:52 +02:00 |
|
|
Peter Papp
|
4b0e4da013
|
- Client list
- Context menu
|
2021-04-22 07:36:52 +02:00 |
|
|
Peter Papp
|
eae212ac5d
|
- Invoice listing in frontend
|
2021-04-21 16:53:39 +02:00 |
|
|
Peter Papp
|
5a9583be5b
|
- client and invoice scaffolding
|
2021-04-21 15:22:54 +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
|
7e8511ab3f
|
Popover refactored
|
2021-04-19 17:41:41 +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
|
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
|
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 |
|