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
|
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 |
|