Commit Graph

322 Commits

Author SHA1 Message Date
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
e0dd31389c Prepare 11.0.1 2020-02-13 18:05:02 +01:00
Mufeed VH
a2bd77ef58
Fix for the Cross-site Scripting (XSS) Vulnerability 2020-02-04 01:02:16 +05:30
Laurent Destailleur
d398917294 Prepare final version 2020-01-02 15:47:31 +01:00
Laurent Destailleur
e1446d10d5 Prepare v12 2019-12-23 13:52:15 +01:00
Laurent Destailleur
819c9ccbca Start v11 beta 2019-11-28 12:44:18 +01:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
70ffd6270f More details in log for CSRF error. 2019-09-13 13:51:26 +02:00
Laurent Destailleur
a746075dbe Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2019-08-16 17:04:28 +02:00
Laurent Destailleur
1e93d3d790 Prepare v10.0.2 2019-08-16 17:03:11 +02:00
Laurent Destailleur
b63c4b74b8 Code comment 2019-08-16 16:56:28 +02:00
Laurent Destailleur
edd4d0751b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:28:44 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
Laurent Destailleur
5f32b5e23e Prepare v11 alpha 2019-06-20 03:54:11 +02:00
Laurent Destailleur
6c6c353177 Prepare 10.0 2019-06-03 16:47:43 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00
Laurent Destailleur
f91cc2e2d3 Prepare beta 2019-05-11 14:36:19 +02:00
Laurent Destailleur
14b11b3cc5 Prepare 9.0.4 2019-05-10 14:43:01 +02:00
Laurent Destailleur
50563ab126 Prepare 9.0.3 2019-05-08 22:03:16 +02:00
Laurent Destailleur
2cd09aaf09 Prepare version 9.0.2 2019-03-07 10:57:15 +01:00
Frédéric FRANCE
390766babf
replace html code by html5 2019-02-23 23:36:21 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
2686062031 Prepare version 9.0.1 2019-02-08 10:30:07 +01:00
Laurent Destailleur
43fbcf7081 Prepare 8.0.5 2019-02-08 10:28:59 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
5c2b9e3078 NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
Laurent Destailleur
232875f105 Prepare 10.0 2018-12-04 16:09:49 +01:00
Laurent Destailleur
b359afd084 Prepare 9.0 2018-12-04 16:08:36 +01:00
Laurent Destailleur
f0305a7beb Prepare 8.0.4 2018-11-05 13:50:12 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
8eb1af2b40 Start beta 2018-10-24 13:29:59 +02:00
Laurent Destailleur
dc7c27b162 Release 8.0.2 2018-09-19 14:53:39 +02:00
Laurent Destailleur
6ce37e588d Prepare 8.0.2 2018-09-04 00:22:14 +02:00
Laurent Destailleur
15144a2473 Prepare 8.0.1 2018-08-15 14:42:34 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
ias-ceo
740f35966c installation default port number if missing 2018-07-12 05:15:09 +03:00
Laurent Destailleur
0490807f9b Prepare 9.0 2018-06-28 18:36:08 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
16f940b637 Prepare 7.0.4 2018-06-23 14:55:33 +02:00
Laurent Destailleur
a46362a71f Prepare 7.0.3 2018-05-14 15:17:10 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
ebb418fe3a Fix CSRF test 2018-04-06 20:06:05 +02:00
Laurent Destailleur
2d1183cbb7 FIX can bypass the CSRF protection with url with domain inside 2018-04-06 17:58:30 +02:00
Laurent Destailleur
83b6dd4cb9 Prepare 7.0.2 2018-03-23 16:17:56 +01:00
Laurent Destailleur
fe94562a56 Prepare 7.0.1 2018-03-16 01:33:11 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
c513ffe1f7 Fix debian package 2018-02-16 18:21:18 +01:00
Laurent Destailleur
6d52676600 Prepare 7.0 2018-02-05 20:50:15 +01:00
Laurent Destailleur
b9d5ed37dd Prepare 8.0 2018-01-26 12:46:44 +01:00
Laurent Destailleur
755b7a2717 Start 7.0 beta 2017-11-29 09:34:55 +01:00
Laurent Destailleur
2188135fb2 Prepare 7.0 alpha 2017-07-14 14:41:25 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices.
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
d9794f942d Prepare 5.0.4 2017-06-03 01:17:33 +02:00
Laurent Destailleur
199b4dfeb5 Merge pull request #6816 from Gecka-Apps/5.0-fixes
Add local taxes support to predefined invoices
2017-05-10 14:52:23 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Dinclaux
6cac627117 Add support for localtaxes to predefined invoices 2017-05-09 23:19:16 +11:00
Laurent Destailleur
4f292d1247 Prepare 5.0.2 2017-04-04 13:01:53 +02:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
17eee4e141 Prepare 5.0.1 2017-03-13 02:11:03 +01:00
Laurent Destailleur
b3a127519b Prepare final 5.0 2017-02-21 12:03:08 +01:00
Laurent Destailleur
c8957a9184 Prepare rc2 2017-01-18 12:49:36 +01:00
Laurent Destailleur
e57f834434 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-01-04 17:06:02 +01:00
Laurent Destailleur
212f200454 Fix phpcs 2017-01-03 11:38:31 +01:00
Laurent Destailleur
466dfc85a3 Prepare RC1 2017-01-03 10:36:27 +01:00
Laurent Destailleur
53137e53fe Fix prepare RC 2017-01-03 10:33:56 +01:00
Laurent Destailleur
67c513a9c1 Prepare 6.0 dev 2017-01-02 18:38:22 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Laurent Destailleur
7fdd6ccbd2 Prepare 4.0.3 2016-12-15 22:50:20 +01:00
Laurent Destailleur
645eee57db Fix syntax error 2016-11-12 11:22:18 +01:00
Laurent Destailleur
bcd3a1a888 NEW Default collation for mysql is now utf8_unicode_ci 2016-11-07 01:53:34 +01:00
Laurent Destailleur
24420edd46 Prepare 4.0.2 2016-10-11 14:36:13 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
9affdc0886 Prepare 4.0.1 2016-09-08 11:23:26 +02:00
Regis Houssin
36110da4bf Fix: Warning: preg_match(): No ending delimiter '/' found 2016-09-06 17:22:56 +02:00
Laurent Destailleur
11ddc722f1 Release 4.0 2016-08-28 20:17:53 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
2016-08-05 13:12:43 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
Laurent Destailleur
45d354ad82 Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN... 2016-07-29 22:58:39 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
86e4340287 FIX: More robust autodetection of relative url to redirect to make
install when conf file does not exists yet.
2016-07-27 10:57:05 +02:00
Laurent Destailleur
c0d8bce2df Prepare 3.8.5 2016-07-21 19:44:25 +02:00
Laurent Destailleur
87c31d0761 Prepare 3.9.3 2016-07-16 19:38:58 +02:00
Laurent Destailleur
ec03ea8f70 Dev branch is now 5.0 alpha 2016-07-14 15:33:17 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
phf
b3a36688d1 Fix #2666 2016-06-04 14:31:53 +02:00
Laurent Destailleur
755b994750 Prepare 3.9.2 2016-04-29 20:40:00 +02:00
Laurent Destailleur
0ef1be9364 Prepare 3.9.1 2016-04-22 18:07:34 +02:00