 MakingCG
|
15a6ad6166
|
Application Build
|
2021-05-19 13:35:56 +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 |
|
|
MakingCG
|
09dda32dfd
|
Application Build
|
2021-05-17 08:47:48 +00:00 |
|
|
MakingCG
|
6cbffd08b2
|
Application Build
|
2021-05-17 08:03:54 +00: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
|
87b3625b27
|
- frontend build
|
2021-04-06 18:08:12 +02:00 |
|
|
Peter Papp
|
57bab1a225
|
- frontend build
- fixes
|
2021-04-06 10:46:32 +02: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 |
|