Commit Graph

921 Commits

Author SHA1 Message Date
Peter Papp
c52c576f7c Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json
2021-06-29 18:38:53 +02:00
Peter Papp
5215d7d38d Merge remote-tracking branch 'origin/master' 2021-06-29 18:31:28 +02:00
Peter Papp
dd271ea8cc composer upgrade 2021-06-29 18:31:21 +02:00
MakingCG
6397ce9a67 Application Build 2021-06-23 16:17:49 +00:00
Peter Papp
8568a815a0 Merge remote-tracking branch 'origin/master' 2021-06-23 18:15:52 +02:00
Peter Papp
6fc29eac8e language fix 2021-06-23 18:15:44 +02:00
MakingCG
449724e78a Fix backend code styling 2021-06-18 15:35:41 +00:00
Peter Papp
e5de408ab0 Merge remote-tracking branch 'origin/master' 2021-06-18 17:35:16 +02:00
Peter Papp
1c057e9f86 Mobile navigation fix with hidden back button 2021-06-18 17:35:05 +02:00
Peter Papp
f6f9199b87 Filename as original 2021-06-18 17:23:40 +02:00
MakingCG
cb99e105c0 Fix backend code styling 2021-06-15 16:37:41 +00:00
Peter Papp
24676e2392 Merge remote-tracking branch 'origin/master' 2021-06-15 18:37:11 +02:00
Peter Papp
c0da1b0b07 Alibaba OSS support 2021-06-15 18:37:03 +02:00
MakingCG
d7b8214406 Fix backend code styling 2021-06-15 16:04:53 +00:00
Peter Papp
3fc11b781b Merge remote-tracking branch 'origin/master' 2021-06-15 18:04:23 +02:00
Peter Papp
f2be4059cf Set app locale 2021-06-15 18:04:02 +02:00
MakingCG
081a69450a Fix backend code styling 2021-06-07 15:43:26 +00:00
Peter Papp
b50e0041e0 - chunking translations query
- language translations fallback
2021-06-07 17:42:53 +02:00
Peter Papp
847221d385 - chunking translations query 2021-06-07 16:42:18 +02:00
MakingCG
1a63f3aa07 Application Build 2021-05-27 10:37:31 +00:00
Peter Papp
f29a93f77b Merge remote-tracking branch 'origin/oasis' into oasis
# Conflicts:
#	public/mix-manifest.json
2021-05-27 12:34:24 +02:00
Peter Papp
f294c8f4a1 separated advance invoice number 2021-05-27 12:34:12 +02:00
MakingCG
959beae9e9 Application Build 2021-05-24 14:53:16 +00:00
Peter Papp
524b5a94df Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-24 16:51:14 +02:00
Peter Papp
05dc227650 composer vuefilemanager-invoicing 2021-05-24 16:51:07 +02:00
MakingCG
350f130d98 Fix backend code styling 2021-05-24 14:48:13 +00:00
Peter Papp
99b4b030d2 Merge remote-tracking branch 'origin/oasis' into oasis
# Conflicts:
#	public/mix-manifest.json
2021-05-24 16:47:34 +02:00
Peter Papp
8a2af11f6a - invoice fixes
- optimization for new invoicing module
2021-05-24 16:47:21 +02:00
Peter Papp
26636dffab php cs fixer fix 2021-05-24 09:58:03 +02:00
Peter Papp
3dae2a72c9 configured private repository 2021-05-21 10:15:00 +02:00
MakingCG
38fadeec5e Application Build 2021-05-21 08:07:00 +00:00
Peter Papp
31954767b7 changeable frontend invoicing currency 2021-05-21 10:04:37 +02:00
Peter Papp
c760116cbf Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-20 17:27:35 +02:00
Peter Papp
49131ddf97 - makingcg/vuefilemanager-invoicing to dev-master 2021-05-20 17:27:27 +02:00
MakingCG
fb7338c2bb Application Build 2021-05-20 14:46:50 +00:00
Peter Papp
d2391afb14 - frontpage redirect
- remove default login
2021-05-20 16:44:42 +02:00
Peter Papp
8e66900d8d Merge remote-tracking branch 'origin/oasis' into oasis
# Conflicts:
#	public/mix-manifest.json
2021-05-20 16:25:32 +02:00
Peter Papp
1a77ccdb9d makingcg/vuefilemanager-invoicing v1.0 included 2021-05-20 16:25:19 +02:00
MakingCG
50a96d9051 Application Build 2021-05-20 08:46:02 +00:00
Peter Papp
7baf8f0ec9 Merge remote-tracking branch 'origin/oasis' into oasis
# Conflicts:
#	public/mix-manifest.json
2021-05-20 10:43:12 +02:00
Peter Papp
8389f7a4d6 fixed invoice discount 2021-05-20 10:42:58 +02:00
MakingCG
b74f93a271 Application Build 2021-05-19 14:25:05 +00:00
Peter Papp
ed9c80eb74 Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-19 16:22:49 +02:00
Peter Papp
147f82e9a8 Total widget in invoice editor 2021-05-19 16:22:41 +02:00
MakingCG
15a6ad6166 Application Build 2021-05-19 13:35:56 +00:00
Peter Papp
3fbf0ca093 Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-19 15:33:54 +02:00
Peter Papp
2586e65cf9 - vuefilemanager-invoicing from git 2021-05-19 15:33:48 +02:00
MakingCG
b8731a108b Fix backend code styling 2021-05-19 13:31:18 +00:00
Peter Papp
2f238c90d9 Merge remote-tracking branch 'origin/oasis' into oasis 2021-05-19 15:30:46 +02:00
Peter Papp
6f9ae7ebfe - added new invoice strings 2021-05-19 15:30:36 +02:00