Commit Graph

76 Commits

Author SHA1 Message Date
Peter Papp
73672bc023 i18n implementation into invoice module 2021-05-07 11:32:48 +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
69deafeda0 Set up billing profile 2021-05-06 09:15:37 +02:00
Peter Papp
599b238ab4 Edit invoice 2021-05-05 17:07:36 +02:00
Peter Papp
3c3e82758d Create invoice form part 1. 2021-04-30 17:53:19 +02:00
Peter Papp
31dd782bae Resource refactoring 2021-04-29 12:53:17 +02:00
Peter Papp
834b0ba5e0 Edit client detail 2021-04-29 10:54:10 +02:00
Peter Papp
19bce195b4 Create client frontend 2021-04-29 08:57:53 +02:00
Peter Papp
b37edd298a Billing profile implementation 2021-04-28 15:55:01 +02:00
Peter Papp
5b70066900 Invoice wrapper 2021-04-22 08:29:00 +02:00
Peter Papp
4b0e4da013 - Client list
- Context menu
2021-04-22 07:36:52 +02:00
Peter Papp
4dfc5bcc35 Invoice create menu 2021-04-20 15:51:01 +02:00
Peter Papp
af571317ff Invoice Desktop Toolbar 2021-04-20 09:09:52 +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
110f7b60d6 - New mobile navigation experience 2021-04-15 09:28:06 +02:00
Peter Papp
a2c606e1c7 - Dashboard logo
- Checkout mobile fix
- Frontend build
2021-04-13 08:32:48 +02:00
Peter Papp
87b3625b27 - frontend build 2021-04-06 18:08:12 +02:00
Peter Papp
57bab1a225 - frontend build
- fixes
2021-04-06 10:46:32 +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
790da00420 - added OasisContact.vue
- Mobile responsivenes
2021-04-05 07:07:28 +02:00
Peter Papp
377c471a6c Oasis landingpage scaffolding 2021-04-03 07:50:57 +02:00
Peter Papp
b2d133e5a3 Merge remote-tracking branch 'origin/v2'
# Conflicts:
#	config/content.php
#	config/vuefilemanager.php
#	public/mix-manifest.json
#	resources/js/views/Mobile/AdminMobileMenu.vue
#	resources/js/views/Shared/SharedPage.vue
2021-04-03 07:40:32 +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
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
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
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
97f13c0b62 - added payment page 2021-03-23 09:07:31 +01:00
Peter Papp
4b97c674ba - creating user frontend 2021-03-23 08:20:54 +01:00
Peter Papp
a90311593b - added not found page
- Fixed admin menu in regular license
- allow_homepage default setting in regular license
- frontend build
2021-03-21 11:16:36 +01:00
Peter Papp
ed8ab2978f - public sharing refactored part 2 2021-03-19 09:04:18 +01:00
Peter Papp
1d52186f17 - shared pages refactored 2021-03-17 10:39:45 +01:00
Peter Papp
87e05d9521 - App container 2021-03-17 08:25:44 +01:00
Peter Papp
2c69553582 - route 401 redirection
- guest & user view consolidation
2021-03-16 15:53:34 +01:00
Peter Papp
803cc089bd Admin & User account frontend consolidation 2021-03-15 16:56:26 +01:00
Milos Holba
63ba4d3a1d Merge branch 'language-translation' into version-1.8.3 2021-03-02 16:38:48 +01:00
Milos Holba
9a1a9ee206 add Language component 2021-02-21 12:09:24 +01:00
Peter Papp
b38333bb64 Trash moved to file page 2020-11-21 18:02:46 +01:00
nourisk
f0e0103d81 Update router.js (#31)
Capital i missing
2020-10-06 17:03:26 +02:00
Peter Papp
13de58fdbd - relative chunks path 2020-08-14 10:21:57 +02:00
Peter Papp
40111b95c1 - frontend build with included chunks 2020-08-14 10:13:57 +02:00
Peter Papp
f03c6edec1 - code splitting with vue router 2020-08-14 10:02:24 +02:00
carodej
eeada5468b v1.7 beta.1 2020-07-16 10:26:41 +02:00
carodej
b1860eac21 alpha v1.7 alpha.1 2020-07-14 17:31:04 +02:00
carodej
2ae60003d6 index options added 2020-07-13 09:49:25 +02:00
carodej
a74c1c7b6e translations update 2020-07-12 11:02:21 +02:00