MakingCG
|
350f130d98
|
Fix backend code styling
|
2021-05-24 14:48:13 +00:00 |
|
MakingCG
|
ca9ed1029e
|
Fix backend code styling
|
2021-05-19 06:38:55 +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
|
26f23863c0
|
setup account fix
|
2021-05-14 19:31:23 +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
|
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
|
50bdac62dc
|
fixed static issues
|
2021-05-08 09:41:10 +02:00 |
|
Peter Papp
|
0332f8b1fb
|
invoice backend VAT & discount calculations
|
2021-05-04 09:44:55 +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
|
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
|
b37edd298a
|
Billing profile implementation
|
2021-04-28 15:55:01 +02:00 |
|
Peter Papp
|
f7135c9b27
|
get invoice from url
|
2021-04-27 08:57:00 +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
|
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
|
0bf81164e7
|
Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
# app/Console/Kernel.php
# composer.json
# composer.lock
# 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/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/js/main.js
# public/mix-manifest.json
|
2021-04-12 06:57:47 +02:00 |
|
Peter Papp
|
afd2270e0e
|
setup:prod script
|
2021-04-10 08:41:00 +02:00 |
|
Peter Papp
|
2598ba38db
|
- auto database backup
|
2021-04-10 08:06:01 +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
|
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
|
4d5cd3d80f
|
added og_image and touch_icon into admin appearance panel
|
2021-03-27 11:33:42 +01:00 |
|
Peter Papp
|
44fe96497c
|
- cancel/resume subscription fix
- upload into root folder fix
- custom color theme part 3
|
2021-03-25 10:51:00 +01:00 |
|
Peter Papp
|
ac6b2b09e1
|
- cancel/resume subscription fix
- upload into root folder fix
- custom color theme part 3
|
2021-03-25 10:46:23 +01:00 |
|
Peter Papp
|
f2c44c3cfe
|
- custom route for PlanPricingTables.vue
- removed passport error in signin form
|
2021-03-24 11:43:03 +01:00 |
|
Peter Papp
|
af79a28361
|
- redirect after sign in/up to payment page
- extended /api/oasis/subscribe function
- setup:dev extended data
|
2021-03-24 11:38:15 +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
|
09d2032a70
|
- queue work command edit
- scheduler period changes
|
2021-03-24 08:37:57 +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
|
aa51484303
|
- refactored user_scope to author
- added author_id for future teams implementation
|
2021-03-19 11:27:58 +01:00 |
|
Peter Papp
|
fc18280842
|
- added not found exception for Model
- cleared dev console
- get share record refactored on backend
|
2021-03-17 12:24:15 +01:00 |
|
Peter Papp
|
f142919cd1
|
dispatch jobs after demo data was generated
|
2021-03-16 14:33:01 +01:00 |
|
Peter Papp
|
adbe35e8b5
|
trash fixed
|
2021-03-16 10:30:36 +01:00 |
|
Peter Papp
|
f3783e6f98
|
demo content generation
|
2021-03-16 10:00:28 +01:00 |
|
Peter Papp
|
1bb59854ea
|
frontend function consolidation part 1
|
2021-03-16 08:31:42 +01:00 |
|
Peter Papp
|
6b67f861c3
|
- enhanced setup:dev script
- refactored shared token creation
|
2021-03-15 07:51:01 +01:00 |
|
Peter Papp
|
bb469f2520
|
added delete_failed_files into SchedulerService.php
|
2021-03-14 12:42:25 +01:00 |
|
Peter Papp
|
ce08240355
|
added it_update_settings, it_get_page, it_update_settings_image test
|
2021-03-05 11:57:48 +01:00 |
|
Peter Papp
|
69b72d24a9
|
added it_get_setup_intent, it_upgrade_plan, it_cancel_subscription test
|
2021-03-04 12:48:51 +01:00 |
|
Peter Papp
|
4e098286a6
|
- added it_delete_zips_older_than_one_day test
- refactored scheduler tasks into SchedulerService.php
|
2021-03-02 17:05:49 +01:00 |
|