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 |
|
Peter Papp
|
f6f9199b87
|
Filename as original
|
2021-06-18 17:23:40 +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
|
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
|
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
|
d8bbfcd4d2
|
External storage fix
|
2021-05-14 20:03:07 +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
|
3c3e82758d
|
Create invoice form part 1.
|
2021-04-30 17:53:19 +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
|
f7135c9b27
|
get invoice from url
|
2021-04-27 08:57:00 +02:00 |
|
Peter Papp
|
7cf193abb7
|
pdf invoice generation scaffolding
|
2021-04-26 17:03:17 +02:00 |
|
Peter Papp
|
c47886fb8b
|
code style fix
|
2021-04-25 09:02:00 +02:00 |
|
Peter Papp
|
3774a05edd
|
Searching frontend
|
2021-04-22 10:06:31 +02:00 |
|
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 |
|