Commit Graph

4425 Commits

Author SHA1 Message Date
Laurent Destailleur
fde856a243 Upgrade mobildetect 2.89.39 2022-04-02 19:27:48 +02:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +01:00
Sylvain Legrand
30d8174ac5 Debug TCPDF file name with spaces 2022-02-25 09:26:19 +01:00
Laurent Destailleur
59f749a65f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 18:11:09 +01:00
Laurent Destailleur
c7f99f140e Fix remove validator 2022-02-09 17:41:32 +01:00
Laurent Destailleur
9180e9a5c6 Clean code 2022-01-26 14:42:26 +01:00
Laurent Destailleur
6d04bac740 phpcs 2022-01-26 13:50:49 +01:00
Laurent Destailleur
4d2832e8a0
Merge pull request #19764 from FHenry/dev_BDD_19763
NEW: #19763 DB change only - Can invoice task time per different services
2022-01-24 12:28:11 +01:00
Laurent Destailleur
ef0a08ad1c
Merge pull request #19570 from Easya-Solutions/12.0
FIX: Update swiftmailer librairies
2022-01-23 12:15:43 +01:00
Florian HENRY
e0048c056a Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-21 19:01:42 +01:00
Laurent Destailleur
3ae63cb111 Clean code 2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25 Decode extra params of id_token 2022-01-19 22:26:31 +01:00
Laurent Destailleur
4f533c3f9d Merge 2022-01-19 16:54:00 +01:00
Florian HENRY
aa2b244bf3 fix wordpress indent 2022-01-19 13:31:51 +01:00
Laurent Destailleur
659372aa9e
Merge pull request #19645 from FHenry/dev_addOAuthWordPress
NEW: add WordPress OAuth
2022-01-19 02:26:54 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
55562eb1d8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formadmin.class.php
2021-12-21 14:36:38 +01:00
Laurent Destailleur
4f572287dd Fix remove .BAK files 2021-12-19 17:28:19 +01:00
Florian HENRY
d6ae2ae339 add WordPress OAuth 2021-12-17 12:07:04 +01:00
kamel
daf3313e49 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-12-07 17:14:19 +01:00
kamel
1ca199d796 FIX: Update swiftmailer librairies 2021-12-07 17:11:34 +01:00
Laurent Destailleur
bd9d3bb4ab Clean code 2021-11-08 18:10:35 +01:00
Laurent Destailleur
2f7e246ab3 Merge 2021-11-01 03:18:12 +01:00
Laurent Destailleur
f592318cba Merge pdf 2021-10-26 13:51:43 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
atm-florian
17773f8414 FIX tcpdf vulnerability to roman numeral bomb, cf. tecnickom/TCPDF issue #315 2021-10-22 18:26:23 +02:00
Laurent Destailleur
c038c1881a Merge 2021-10-19 21:04:19 +02:00
Laurent Destailleur
f5f8d2558c
Merge pull request #18244 from Hystepik/develop#3
Fix php debug bar for php 8.0
2021-10-19 20:59:19 +02:00
lmarcouiller
9fc6be78e0 fix tcpdi.php each to foreach 2021-10-18 15:26:18 +02:00
Laurent Destailleur
6b1fc48bd0 Fix var not initialized 2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d Fix var not defined 2021-08-08 12:57:00 +02:00
lmarcouiller
b0133224d8 Update of var_dumper package 3.0 -> 3.2 2021-07-29 10:20:01 +02:00
lmarcouiller
7836651f84 Fix debug bar for php 8.0 2021-07-27 09:51:38 +02:00
Laurent Destailleur
339fa6fbe3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-10 09:44:22 +02:00
Laurent Destailleur
9e9af8548d Responsive 2021-07-09 18:47:34 +02:00
Laurent Destailleur
0b7b9aae79 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb Code comment 2021-07-05 22:52:37 +02:00
Frédéric FRANCE
dffb244776
Update AutoLoader.php 2021-05-18 21:04:43 +02:00
Laurent Destailleur
b0fe08e411 Clean code 2021-04-26 19:21:23 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
5d0e93344b Upgrade to swagger 2.2 2021-04-25 17:41:59 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
76c3229c97 Update to phpspreadsheet 1.8.2 2021-04-08 18:32:02 +02:00
Laurent Destailleur
04536f9ec8 Fix import 2021-04-08 17:49:13 +02:00
Laurent Destailleur
d098bf412d Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
Laurent Destailleur
168e50a45b Removed unexpected files 2021-03-21 21:54:11 +01:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
Laurent Destailleur
52ee530e70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 22:03:38 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
0de06b7ef4 Fix odttopdf generation 2021-01-26 16:49:54 +01:00
Laurent Destailleur
23c0a30263 Use a better temp directory 2021-01-26 16:40:57 +01:00
Laurent Destailleur
69344a7170 Fix create temp dir 2021-01-26 16:33:47 +01:00
Laurent Destailleur
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bom/bom_card.php
2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
ptibogxiv
984c355f39 update stripe-php 7.67.0 2021-01-03 23:37:44 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Regis Houssin
325c2b03f8 FIX step by step 2020-12-29 17:02:35 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
5aae018a0b Fix for php8 2020-12-27 19:33:07 +01:00
Laurent Destailleur
93d309cdbc FIX Update Restler API to 3.1.1 to fix error with php8 2020-12-23 19:15:58 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
c97fcaec87 Better fix select2 bug https://github.com/select2/select2/issues/5832 2020-12-17 21:41:39 +01:00
Laurent Destailleur
506659a9d2 Update jsGant lib to 2.7.3 2020-12-15 03:56:08 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Laurent Destailleur
85bb3fa909 Update chart.js to 2.9.4 2020-12-07 21:57:29 +01:00
Laurent Destailleur
796fe5cd8a Update .gitignore 2020-12-07 21:47:57 +01:00
Laurent Destailleur
4bc2e791a8 Update .gitignore 2020-12-07 21:44:19 +01:00
Laurent Destailleur
f738c875d8 Update gitignore 2020-12-07 21:10:10 +01:00
Laurent Destailleur
644bac0b80 Removed gitignore 2020-12-07 20:39:59 +01:00
Laurent Destailleur
bb217db31e Ad .gitignore 2020-12-07 20:38:15 +01:00
Laurent Destailleur
d5b009a22a Add .gitignore 2020-12-07 20:36:42 +01:00
Laurent Destailleur
af040dd675 Update lib 2020-12-07 20:33:13 +01:00
Laurent Destailleur
078e395bfb Fix gitignore 2020-12-07 20:25:54 +01:00
Laurent Destailleur
8fecae7148 Update pclzip to 2.8.4 (compatible with php 8) 2020-11-01 22:49:28 +01:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-15 20:38:32 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
tests.
2020-10-15 19:36:08 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Rüdiger Hahn
3b7b4312cb
Fix for #14957 and probably a lot of other issues
Convert special characters for a valid use in xml documents
2020-10-09 11:13:11 +02:00
Rüdiger Hahn
5510f1feef
Fix for #14957 and probably a lot of other issues
Convert special characters for a valid use in xml documents
2020-10-09 10:59:06 +02:00
Laurent Destailleur
14e6d38fe8
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines
FIX: Added support for styling in lines in odt documents
2020-09-29 14:11:25 +02:00
Tim Otte
4611333ee6 Added support for styling in lines 2020-09-29 12:17:25 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level)
Conflicts:
	htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc FIX Restore multiselect (selection of prospect level) 2020-09-21 12:16:22 +02:00
Laurent Destailleur
f55ad8a51c
Merge pull request #14767 from Tim-Otte/fix-missing-hash-in-html-to-odt-converter
FIX: HTML to ODT converter
2020-09-17 23:07:10 +02:00
Tim Otte
f5c0cd25e2 Fixed html to odt converter 2020-09-17 13:19:31 +02:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
Laurent Destailleur
f567d41055 Fix php8 2020-09-08 05:16:37 +02:00
Laurent Destailleur
198b8d8d2b debugbar ok with php5.6 2020-09-08 02:59:49 +02:00
Laurent Destailleur
b5376d3322 Upgrade lib for phpdebugbar 2020-09-07 21:18:26 +02:00
Laurent Destailleur
c95e54843c Update lib debugbar
Update php-parallel-lint
2020-09-07 21:00:40 +02:00