Commit Graph

110939 Commits

Author SHA1 Message Date
Laurent Destailleur
cc9765c7bd Clean code 2022-08-22 13:01:17 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/ajax/onlineSign.php
2022-08-21 23:48:44 +02:00
Laurent Destailleur
94bd42d3b8
Merge pull request #21773 from ksar-ksar/patch-14
FIX #21772
2022-08-19 02:28:27 +02:00
Laurent Destailleur
2e36533a2a
Merge pull request #21794 from hregis/fix_multicompany_security
FIX security for Multicompany
2022-08-18 22:24:51 +02:00
Regis Houssin
293ad34ca8 FIX security for Multicompany 2022-08-18 17:02:20 +02:00
ksar
1d1228286c
FIX #21772 2022-08-17 09:45:27 +02:00
Laurent Destailleur
5de76e27b9
Merge pull request #21767 from frederic34/patch-4
remove duplicate
2022-08-16 20:19:47 +02:00
Frédéric FRANCE
545db83ecd
remove duplicate 2022-08-16 20:17:44 +02:00
Laurent Destailleur
c6ae2bb051 Typo 2022-08-16 18:31:20 +02:00
Laurent Destailleur
6cf47d0ed1 Fix trans 2022-08-15 02:35:17 +02:00
Laurent Destailleur
ebc8823202 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/ajax/onlineSign.php
2022-08-14 21:41:25 +02:00
Laurent Destailleur
3d73f210fb Debug feature for signature 2022-08-14 21:31:53 +02:00
Laurent Destailleur
57fea5151d Fix regression in online signature
Conflicts:
	htdocs/core/ajax/onlineSign.php
	htdocs/public/onlinesign/newonlinesign.php
2022-08-14 20:50:28 +02:00
Laurent Destailleur
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
61739cc338 FIX online signature, better error management. 2022-08-14 20:03:13 +02:00
Laurent Destailleur
5621a77187 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-14 19:15:24 +02:00
Laurent Destailleur
a0d56b6db7 FIX the online signature feature 2022-08-14 19:14:20 +02:00
Laurent Destailleur
b3656c21bc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-14 19:12:28 +02:00
Laurent Destailleur
9732c3c06a Fix error code 2022-08-14 15:25:06 +02:00
Laurent Destailleur
35822d9431 css 2022-08-13 15:08:36 +02:00
Laurent Destailleur
2c95d8d5cd FIX #18425 2022-08-13 13:54:32 +02:00
Laurent Destailleur
168f07933e FIX #18425 2022-08-13 13:51:47 +02:00
Laurent Destailleur
5b74f1d3dc Fix duplicate string
Conflicts:
	htdocs/public/members/new.php
2022-08-13 12:35:07 +02:00
Laurent Destailleur
498ed449e9 Fix label of invoice status 2022-08-13 12:03:41 +02:00
Laurent Destailleur
ef387e1a02 Fix token 2022-08-12 23:19:36 +02:00
Laurent Destailleur
c2c4401bea css 2022-08-12 17:31:47 +02:00
Laurent Destailleur
326686794a Fix when log handler has been removed 2022-08-12 17:09:14 +02:00
Laurent Destailleur
5fa110ce74 Fix trans 2022-08-12 15:58:29 +02:00
Laurent Destailleur
85fb7c1d5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-12 15:56:15 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Laurent Destailleur
0d68c0ba14 Debug v16 2022-08-12 15:07:15 +02:00
Laurent Destailleur
3c65841e19 Debug v16 2022-08-12 14:41:44 +02:00
Laurent Destailleur
d01d04f704 FIX .jpeg extension was no more supported by dol_imageResizeOrCrop() 2022-08-12 14:31:58 +02:00
Laurent Destailleur
79a5a2b3ab Transifex sync 2022-08-12 14:02:18 +02:00
Laurent Destailleur
3f8b67e619 Doc 2022-08-12 12:56:03 +02:00
Laurent Destailleur
0b3f781618 Complete ignore file 2022-08-12 12:49:53 +02:00
Laurent Destailleur
6ed053e0d0 Clean v16 2022-08-12 12:48:49 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
Laurent Destailleur
01484757aa Debug v16 2022-08-12 11:31:40 +02:00
Laurent Destailleur
daf3b928c7 Debug v16 2022-08-11 22:31:01 +02:00
Laurent Destailleur
b36838f103 Prepare v16 2022-08-11 22:11:33 +02:00
Laurent Destailleur
deabc0c09d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/files.lib.php
2022-08-11 02:15:31 +02:00
Laurent Destailleur
c21597e839
Merge pull request #21492 from atm-GregM/FIX_dol_compress_dir_relativePath
FIX dol_compress_dir names files on archives
2022-08-11 02:13:17 +02:00
Laurent Destailleur
457b5cdfc4
Merge pull request #21665 from ymollard/layout-fix
Fix layout of Incomes-Expenses + Claims-Debts accounting tables
2022-08-11 01:38:18 +02:00
Laurent Destailleur
c089fe124c
Update clientfourn.php 2022-08-11 01:37:53 +02:00
Laurent Destailleur
ead7bd91fe
Update clientfourn.php 2022-08-11 01:36:31 +02:00
Laurent Destailleur
a0f5c69ccd Debug v16 2022-08-10 14:45:21 +02:00
Laurent Destailleur
ec042b1701 css 2022-08-10 14:32:26 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00