Laurent Destailleur 291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/core/class/commonobject.class.php

2018-09-27 12:47:48 +02:00

..

antivir.class.php

Fix: use GETPOST

2017-10-03 17:11:42 +02:00

canvas.class.php

…

ccountry.class.php

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

CMailFile.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-09-27 12:47:48 +02:00

comment.class.php

fix comment task

2018-03-07 08:47:34 +01:00

commondocgenerator.class.php

Update commondocgenerator.class.php

2018-08-22 17:29:05 +02:00

commoninvoice.class.php

Fix text in payment area of crabe pdf

2018-07-02 11:33:33 +02:00

commonobject.class.php

FIX: showOptionals: column mismatches

2018-09-26 17:19:06 +02:00

commonobjectline.class.php

FIX #7679

2017-10-22 03:47:36 +02:00

commonorder.class.php

…

commonstickergenerator.class.php

…

conf.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-04-20 01:39:26 +02:00

cookie.class.php

…

coreobject.class.php

Work on inventory module debug

2017-05-06 22:28:07 +02:00

CSMSFile.class.php

Fix nostop option

2017-09-01 17:08:47 +02:00

cstate.class.php

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

ctypent.class.php

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

ctyperesource.class.php

fix travis

2017-04-19 14:49:12 +02:00

discount.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-10-13 22:01:56 +02:00

doleditor.class.php

Fix javascript error

2017-12-10 19:54:04 +01:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

Replace deprecated dol_print_graph with DolGraph

2017-11-23 20:24:05 +01:00

dolreceiptprinter.class.php

…

emailsenderprofile.class.php

Work on module builder

2017-10-25 22:02:07 +02:00

events.class.php

NEW Can send email from contract card

2017-09-16 01:34:15 +02:00

extrafields.class.php

FIX : extrafieldkey

2018-07-31 15:02:51 +02:00

fileupload.class.php

…

fiscalyear.class.php

Debug accountancy

2017-11-28 11:49:11 +01:00

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

FIX #8488

2018-04-05 13:13:45 +02:00

html.form.class.php

Update html.form.class.php

2018-09-01 14:41:44 +02:00

html.formaccounting.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-05-05 14:34:54 +02:00

html.formactions.class.php

Update html.formactions.class.php

2018-07-06 14:26:21 +02:00

html.formadmin.class.php

Work on website

2017-10-26 14:49:30 +02:00

html.formbank.class.php

…

html.formbarcode.class.php

Clean code used for autocompletion

2017-11-24 09:23:18 +01:00

html.formcompany.class.php

FIX javascript showempty error

2018-05-22 19:43:28 +02:00

html.formcontract.class.php

better test

2017-04-07 14:55:59 +02:00

html.formcron.class.php

…

html.formfile.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-05-18 11:52:48 +02:00

html.formintervention.class.php

…

html.formmail.class.php

FIX Get templates in a forced language

2018-08-22 13:22:49 +02:00

html.formmailing.class.php

Fix phpcs

2017-07-13 23:46:01 +02:00

html.formmargin.class.php

Update sql image file for 7.0 stable

2018-03-16 11:19:58 +01:00

html.formorder.class.php

…

html.formother.class.php

CSS

2018-03-06 11:54:05 +01:00

html.formprojet.class.php

Fix morecss not provided

2018-03-10 18:17:54 +01:00

html.formpropal.class.php

…

html.formsms.class.php

Mutualize code for forms to send emails. Remove thousand line of code.

2017-09-17 17:12:14 +02:00

html.formsocialcontrib.class.php

Use autocompletion on list of taxes

2017-11-23 15:46:52 +01:00

html.formwebsite.class.php

Removed duplicate code

2017-11-26 22:06:14 +01:00

index.html

…

infobox.class.php

Merge 5.0

2017-06-12 18:22:51 +02:00

interfaces.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-08-04 15:39:00 +02:00

ldap.class.php

Fix: better compatibility with all hostname syntax

2018-03-19 17:59:23 +01:00

link.class.php

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

menu.class.php

Fix responsive

2017-12-01 12:55:28 +01:00

menubase.class.php

Fix substition for menus title and urls

2017-12-09 15:35:01 +01:00

notify.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-02-03 19:33:24 +01:00

openid.class.php

…

rssparser.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-09-27 12:47:48 +02:00

smtps.class.php

FIX File name not visible in email preview

2018-04-20 11:20:56 +02:00

stats.class.php

Fix scrutinizer reported bugs

2017-12-11 11:48:11 +01:00

translate.class.php

Fix SQLi

2018-03-15 02:12:01 +01:00

utils.class.php

FIX Infinite loop on deletion of temp file when there is symbolic links

2018-03-03 11:57:10 +01:00

vcard.class.php

FIX #6479

2017-03-03 14:04:40 +01:00

workboardresponse.class.php

…