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
|
bd881da856
|
- allow empty input
- allow svg avatar
|
2021-05-06 10:08:58 +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
|
33d45408d2
|
Mobile main navigation
|
2021-04-20 15:24:44 +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
|
25a28c37c8
|
FileSidebar refactored
|
2021-04-20 08:11:05 +02:00 |
|
Peter Papp
|
7e8511ab3f
|
Popover refactored
|
2021-04-19 17:41:41 +02:00 |
|
Peter Papp
|
7cd29fce98
|
- data renamed to entries
|
2021-04-19 09:39:09 +02:00 |
|
Peter Papp
|
b0c81a692c
|
- fileinfodetail renamed to clipboard
|
2021-04-19 09:22:50 +02:00 |
|
Peter Papp
|
fc11a38457
|
language fixes
|
2021-04-17 10:12:26 +02:00 |
|
Peter Papp
|
397b3228d0
|
User delete validation fix
|
2021-04-16 11:53:23 +02:00 |
|
Peter Papp
|
2a02716a53
|
FilePreview refactoring
|
2021-04-16 11:41:41 +02:00 |
|
Peter Papp
|
639f24fdfd
|
- SearchBar.vue refactored
|
2021-04-15 10:21:35 +02:00 |
|
Peter Papp
|
110f7b60d6
|
- New mobile navigation experience
|
2021-04-15 09:28:06 +02:00 |
|
Peter Papp
|
a7ba0719a5
|
- Mobile navigation refactored
|
2021-04-14 17:13:36 +02:00 |
|
Peter Papp
|
213d6230ca
|
- File Filter implemented
|
2021-04-14 16:49:14 +02:00 |
|
Peter Papp
|
eba8903792
|
- Mobile menu components refactoring
- Components name renaming
|
2021-04-14 11:17:29 +02:00 |
|
Peter Papp
|
a2c606e1c7
|
- Dashboard logo
- Checkout mobile fix
- Frontend build
|
2021-04-13 08:32:48 +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
|
da49a7b051
|
z-index fix in Language.vue
|
2021-04-12 06:54:47 +02:00 |
|
Peter Papp
|
1568eab905
|
Mobile language editor
|
2021-04-11 10:31:07 +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
|
b6290a0cad
|
auto-refresh after default language change
|
2021-04-10 08:47:21 +02:00 |
|
Peter Papp
|
e78f1ce731
|
- removed sign in credentials
|
2021-04-07 13:21:02 +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
|
30ae2c0a54
|
- fixes
|
2021-04-07 07:48:07 +02:00 |
|
Peter Papp
|
bf9581173c
|
- S3 storages compatibility with v2
- user profile fixes
|
2021-04-06 18:01:59 +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
|
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
|
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
|
5130082111
|
Language editor refactoring part 3 (backend + frontend)
|
2021-04-01 07:50:01 +02:00 |
|
Peter Papp
|
6ac6528243
|
Language editor refactoring part 2 (backend + frontend)
|
2021-03-28 14:06:16 +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
|
4d5cd3d80f
|
added og_image and touch_icon into admin appearance panel
|
2021-03-27 11:33: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
|
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
|
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
|
ee1a8a6719
|
- cancel/resume subscription fix
- upload into root folder fix
- custom color theme part 3
|
2021-03-25 15:46:34 +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
|
a18ceb1b4f
|
- user not found fix in SignIn.vue page
|
2021-03-24 11:59:12 +01:00 |
|
Peter Papp
|
88c134918e
|
- user not found fix in SignIn.vue page
|
2021-03-24 11:53:42 +01:00 |
|