Laurent Destailleur 2493c2468d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php

2017-11-24 16:51:59 +01:00

..

antivir.class.php

More powerfull dol_move function.

2017-05-21 14:06:43 +02:00

canvas.class.php

…

ccountry.class.php

…

CMailFile.class.php

Fix substitution of __EMAIL__

2017-08-28 12:49:57 +02:00

commondocgenerator.class.php

Other fix

2017-08-18 11:35:20 +02:00

commoninvoice.class.php

FIX Calculation in the activity box

2017-09-17 20:20:48 +02:00

commonobject.class.php

FIX A lot of several fix on local taxes and NPR tax

2017-11-13 14:24:40 +01:00

commonobjectline.class.php

…

commonorder.class.php

…

commonstickergenerator.class.php

…

conf.class.php

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

2017-11-24 16:51:59 +01:00

cookie.class.php

…

coreobject.class.php

…

CSMSFile.class.php

Fix nostop option

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

cstate.class.php

…

ctypent.class.php

…

ctyperesource.class.php

…

discount.class.php

FIX #7593

2017-10-13 01:03:33 +02:00

doleditor.class.php

Fix ckeditor is now ok since there is no more jmobile.

2017-07-23 18:52:30 +02:00

dolexception.class.php

…

dolgeoip.class.php

…

dolgraph.class.php

Fix: avoid error "A non-numeric value encountered"

2017-08-23 21:01:14 +02:00

dolprintipp.class.php

…

dolreceiptprinter.class.php

…

events.class.php

FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes

2017-07-26 21:22:53 +02:00

extrafields.class.php

FIX #7531 #7537

2017-10-04 15:18:15 +02:00

fileupload.class.php

…

fiscalyear.class.php

Standardize picto status

2017-06-20 02:29:29 +02:00

genericobject.class.php

…

google.class.php

…

hookmanager.class.php

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

2017-06-09 12:50:56 +02:00

html.form.class.php

Merge pull request #7621 from atm-ph/fix_distinct_credit_note

2017-10-13 13:32:04 +02:00

html.formaccounting.class.php

Fix usage of constant. No need to have a dedicated setup as it should be

2017-06-22 14:48:13 +02:00

html.formactions.class.php

FIX Several problem with the last event box on project/tasks

2017-09-13 15:16:06 +02:00

html.formadmin.class.php

…

html.formbank.class.php

…

html.formbarcode.class.php

…

html.formcompany.class.php

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

2017-06-03 11:45:15 +02:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

FIX Bad link in ECM

2017-08-04 13:45:57 +02:00

html.formintervention.class.php

…

html.formmail.class.php

Fix text

2017-08-23 19:34:26 +02:00

html.formmailing.class.php

Fix phpcs

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

html.formmargin.class.php

Look and feel v6

2017-05-20 20:59:54 +02:00

html.formorder.class.php

…

html.formother.class.php

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

2017-06-18 21:13:48 +02:00

html.formprojet.class.php

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

2017-06-03 11:45:15 +02:00

html.formpropal.class.php

…

html.formsms.class.php

Fix nostop option

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

html.formsocialcontrib.class.php

…

index.html

…

infobox.class.php

Merge 5.0

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

interfaces.class.php

Reduce verbosity

2017-08-04 11:50:30 +02:00

ldap.class.php

…

link.class.php

Fix against SQL injection. Add phpunit to detect missing escapement.

2017-05-12 16:55:11 +02:00

menu.class.php

Fix position of top menu does not follow 'position' field.

2017-06-27 04:25:41 +02:00

menubase.class.php

Fix warning when module position is not correct

2017-07-11 12:54:49 +02:00

notify.class.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

openid.class.php

…

rssparser.class.php

…

smtps.class.php

FIX link in to email and option for tls

2017-08-28 00:09:21 +02:00

stats.class.php

…

translate.class.php

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

2017-05-11 00:03:06 +02:00

utils.class.php

Fix the delete dir functions does not return real nb of deleted files.

2017-07-13 00:26:05 +02:00

vcard.class.php

…

workboardresponse.class.php

…