Peter Papp
|
f9b5595ab6
|
versioning
|
2021-07-09 12:27:19 +02:00 |
|
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
|
c0da1b0b07
|
Alibaba OSS support
|
2021-06-15 18:37:03 +02:00 |
|
MakingCG
|
350f130d98
|
Fix backend code styling
|
2021-05-24 14:48:13 +00:00 |
|
MakingCG
|
b8731a108b
|
Fix backend code styling
|
2021-05-19 13:31:18 +00:00 |
|
Peter Papp
|
6f9ae7ebfe
|
- added new invoice strings
|
2021-05-19 15:30:36 +02: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
|
61824a511c
|
- mad zipper hotfix
|
2021-05-17 11:49:19 +02:00 |
|
Peter Papp
|
b4e6561134
|
routes refactoring
|
2021-05-13 17:50:42 +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
|
1ea8f2ce60
|
share invoice on email frontend
|
2021-05-11 08:51:41 +02:00 |
|
Peter Papp
|
9857a30d2c
|
Helper methods refactoring
|
2021-05-11 07:27:26 +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
|
f5f0663d07
|
Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
# .php_cs.cache
# public/mix-manifest.json
# resources/js/components/FilesView/FilePreviewMedia.vue
# resources/js/components/Sidebar/SidebarNavigation.vue
# resources/js/helpers.js
|
2021-05-06 16:06:17 +02:00 |
|
Peter Papp
|
9fbd5fd472
|
removed shared files single page
|
2021-05-06 09:28:31 +02:00 |
|
Peter Papp
|
599b238ab4
|
Edit invoice
|
2021-05-05 17:07:36 +02:00 |
|
Peter Papp
|
bdfd92872e
|
added backend translations
|
2021-05-05 09:41:13 +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
|
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
|
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
|
9105ce8bb1
|
SelectInput.vue added translation
|
2021-04-15 11:23:58 +02:00 |
|
Peter Papp
|
110f7b60d6
|
- New mobile navigation experience
|
2021-04-15 09:28:06 +02:00 |
|
Peter Papp
|
3e61482a2c
|
Merge remote-tracking branch 'origin/master' into oasis
|
2021-04-13 08:18:23 +02:00 |
|
Peter Papp
|
16b7575fca
|
- Textarea fix
- translation fix
|
2021-04-13 08:17:14 +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
|
452da6c6b4
|
- disabled notification after backup
- fix incorrect password in sign in form
|
2021-04-10 09:06:05 +02:00 |
|
Peter Papp
|
d5e371f8d6
|
default DB_MYSQLDUMP_PATH value
|
2021-04-10 08:53:12 +02:00 |
|
Peter Papp
|
2598ba38db
|
- auto database backup
|
2021-04-10 08:06:01 +02:00 |
|
Peter Papp
|
20f8fe4b51
|
- i18n implementation into homepage
|
2021-04-06 08:26:35 +02:00 |
|
Peter Papp
|
790da00420
|
- added OasisContact.vue
- Mobile responsivenes
|
2021-04-05 07:07:28 +02:00 |
|
Peter Papp
|
26085c475f
|
- Language translation fixes
|
2021-04-01 11:50:40 +02:00 |
|
Peter Papp
|
7cf09494e5
|
- Language implementation for oasis
- frontend build
|
2021-04-01 11:48:38 +02:00 |
|
Peter Papp
|
7772ef6b40
|
Language editor refactoring part 4 (backend + frontend)
|
2021-04-01 10:40:48 +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
|
ee4a2205f6
|
Merge remote-tracking branch 'origin/version-1.8.3' into v2
# Conflicts:
# app/FileManagerFolder.php
# app/Http/Controllers/AppFunctionsController.php
# app/Http/Controllers/Auth/AuthController.php
# app/Http/Controllers/FileManager/BrowseController.php
# app/Http/Controllers/General/SetupWizardController.php
# app/Http/Controllers/General/UpgradeAppController.php
# app/Http/Controllers/Sharing/FileSharingController.php
# app/Http/helpers.php
# app/Setting.php
# composer.lock
# public/mix-manifest.json
# resources/js/App.vue
# resources/js/components/Others/Forms/FormLabel.vue
# resources/js/store/modules/app.js
# resources/js/views/Admin.vue
# resources/js/views/Mobile/AdminMobileMenu.vue
# resources/js/views/Shared/SharedPage.vue
# resources/views/index.blade.php
# resources/views/vuefilemanager/crawler/og-view.blade.php
# resources/views/vuefilemanager/invoice.blade.php
# routes/api.php
# routes/web.php
|
2021-03-27 12:12:42 +01:00 |
|
Milos Holba
|
9fef371099
|
add language setting for moobile devices, add upgrade a update app function
|
2021-03-26 16:20:19 +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 |
|
Milos Holba
|
df5d5cb75f
|
upgrade of __t function, add save default_language to cache
|
2021-03-22 20:27:47 +01:00 |
|
Milos Holba
|
61635db3db
|
make translation helper for laravel
|
2021-03-22 10:46:27 +01:00 |
|
Peter Papp
|
cff7cd6b32
|
custom color theme part 1
|
2021-03-20 10:25:10 +01:00 |
|
Milos Holba
|
c8dedd44c4
|
add cache for languages, make function to laravel translate
|
2021-03-19 20:17:12 +01:00 |
|
Milos Holba
|
ba7d6be249
|
make string in language_strings for the regular license
|
2021-03-18 16:41:43 +01:00 |
|