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
|
110f7b60d6
|
- New mobile navigation experience
|
2021-04-15 09:28:06 +02:00 |
|
Peter Papp
|
eba8903792
|
- Mobile menu components refactoring
- Components name renaming
|
2021-04-14 11:17:29 +02:00 |
|
Peter Papp
|
790da00420
|
- added OasisContact.vue
- Mobile responsivenes
|
2021-04-05 07:07:28 +02: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 |
|
Peter Papp
|
0f357ace50
|
index.blade.php fixes
|
2021-03-27 11:47:09 +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
|
254a00e18e
|
- cancel/resume subscription fix
- upload into root folder fix
- custom color theme part 3
|
2021-03-25 15:49:04 +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
|
0e3c6e286e
|
- extend setup:dev script
- Stripe taxes refactoring
- billing subscription fixes
|
2021-03-24 08:42:10 +01:00 |
|
Milos Holba
|
4142f829be
|
cahng laravel translation, move route for languages from api to web, fix contact formular
|
2021-03-23 21:00:25 +01:00 |
|
Peter Papp
|
c6b3995cc3
|
- Added theme color into ButtonBase.vue
|
2021-03-23 15:35:12 +01:00 |
|
Peter Papp
|
4999b23474
|
custom color theme part 2
|
2021-03-22 07:45:38 +01:00 |
|
Peter Papp
|
deaac3717c
|
added it_get_og_page_for_folder, it_get_og_page_for_image, it_get_og_page_for_protected_file test
|
2021-03-13 19:16:47 +01:00 |
|
carodej
|
b67297f160
|
v1.7 RC.1
|
2020-07-20 16:03:39 +02:00 |
|
carodej
|
6f95fc2565
|
v1.7 beta.8
|
2020-07-20 08:54:57 +02:00 |
|
carodej
|
caa586ceb4
|
v1.7 beta.4
|
2020-07-17 08:34:28 +02:00 |
|
carodej
|
a74c1c7b6e
|
translations update
|
2020-07-12 11:02:21 +02:00 |
|
carodej
|
aedc98cc8b
|
setup wizard init
|
2020-06-29 10:09:42 +02:00 |
|
carodej
|
a2dfc627a7
|
frontend & backend update
|
2020-06-22 16:46:02 +02:00 |
|
carodej
|
ca14838212
|
frontend update
|
2020-06-03 10:58:44 +02:00 |
|