nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-17 15:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
726 Commits 18 Branches 32 Tags
5a9583be5b493f8dd473c5dc86f7f601acdaa997
Commit Graph

258 Commits

Author SHA1 Message Date
Peter Papp
5a9583be5b - client and invoice scaffolding 2021-04-21 15:22:54 +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
7e8511ab3f Popover refactored 2021-04-19 17:41:41 +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
131ae8109f - flush cache after language upgrade 
- Gateway fix
- extended language editor with textarea
 2021-04-06 10:32:50 +02:00
Peter Papp
90c0466cd0 - fixed setup wizard 2021-04-06 10:31:34 +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
7cefcf8dab - fixed setup wizard 
- fixed oasis UserAccountTest.php
 2021-04-06 10:10:38 +02:00
Peter Papp
737adfa91a Merge remote-tracking branch 'origin/master' into oasis 
# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json
 2021-04-06 10:02:20 +02:00
Peter Papp
13992deb41 - added function to upgrade language translations 
- maintenance gate
 2021-04-06 09:56:11 +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
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
cdb395c77f cleaning 2021-03-27 12:21:35 +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
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
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
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
1ffa569ea3 - Zero capacity storage 
- Set 0 storage capacity after creating order
 2021-03-24 08:35:43 +01:00
Peter Papp
480f518ebc - Fixed UpgradeBilling.vue 
- Fixed CreatePaymentMethod.vue
 2021-03-24 08:19:52 +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
6f7b34dd0a - removed client passport validation 
- added UpdateUserPasswordRequest.php
 2021-03-23 15:37:21 +01:00
Peter Papp
75042e0c42 - set password backend 2021-03-23 15:32:28 +01:00
Peter Papp
9566a4a830 - set password and login frontend 2021-03-23 12:03:23 +01:00
Peter Papp
7521c588fc - payment for subscription frontend 2021-03-23 11:12:41 +01:00
Peter Papp
0d4b8403ba - email template 2021-03-23 06:47:28 +01:00
Milos Holba
df5d5cb75f upgrade of __t function, add save default_language to cache 2021-03-22 20:27:47 +01:00
Peter Papp
778a94e5ba - Pay and subscribe from generated Subscription Request 2021-03-22 15:41:47 +01:00
Peter Papp
0db55b51d2 - get subscription request api 2021-03-22 12:05:45 +01:00
Peter Papp
45de6b557a - added subscriptionrequest 
- Oasis model trait
 2021-03-22 11:15:47 +01:00
Milos Holba
61635db3db make translation helper for laravel 2021-03-22 10:46:27 +01:00
Peter Papp
3c01ce5ad3 - admin client order 2021-03-22 10:43:37 +01:00
Peter Papp
80b24cd753 - added CzechRegisterSearchService 
- oasis RouteServiceProvider.php
- oasis admincontroller
 2021-03-22 08:19:50 +01:00
Milos Holba
c8dedd44c4 add cache for languages, make function to laravel translate 2021-03-19 20:17:12 +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
f4b3f1f163 - public sharing refactored part 3 2021-03-19 10:13:48 +01:00
Peter Papp
ed8ab2978f - public sharing refactored part 2 2021-03-19 09:04:18 +01:00
Peter Papp
db9900fcfb - public sharing refactored part 1 2021-03-19 07:27:15 +01:00
Milos Holba
ba7d6be249 make string in language_strings for the regular license 2021-03-18 16:41:43 +01:00
Peter Papp
816c8c3e07 - protected share authentification backend 2021-03-18 10:06:27 +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
ce477fdaf1 - authentication fix 
- demo helper
 2021-03-17 07:34:22 +01:00
Milos Holba
617f715774 add load strings for i18n from database 2021-03-16 19:26:42 +01:00
Peter Papp
f0e9c80572 frontend function consolidation part 2 2021-03-16 11:53:19 +01:00