frederic34 c8e6387e52 Merge remote branch 'upstream/develop' into selectbank ...

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql

2014-07-08 22:46:38 +02:00

..

antivir.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

canvas.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

CMailFile.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-06-28 14:55:04 +02:00

commondocgenerator.class.php

Fix: extra fields key.

2014-06-06 16:08:42 +02:00

commoninvoice.class.php

Removed new SQL double-debug

2014-07-02 21:29:07 +02:00

commonobject.class.php

Merge remote branch 'upstream/develop' into selectbank

2014-07-08 22:46:38 +02:00

commonobjectline.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

commonorder.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

conf.class.php

Fix: Use bad var for test

2014-06-22 13:33:31 +02:00

cookie.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

cpays.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

CSMSFile.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

ctypent.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

discount.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

doleditor.class.php

New: DolEditor can accepts percent instead of nb of cols for textarea

2014-05-05 13:41:25 +02:00

dolexception.class.php

…

dolgeoip.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

dolgraph.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

dolprintipp.class.php

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

events.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

extrafields.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-07-06 21:09:10 +02:00

fileupload.class.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-09 15:30:41 +02:00

fiscalyear.class.php

Update

2014-07-05 21:58:39 +02:00

genericobject.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

google.class.php

…

hookmanager.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

html.form.class.php

Use english for the function name

2014-07-07 20:54:41 +02:00

html.formactions.class.php

New: More option to define default filter setting of agenda views.

2014-06-29 23:35:00 +02:00

html.formadmin.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

html.formbank.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

html.formbarcode.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

html.formcompany.class.php

Fix: phpcs

2014-07-04 14:19:03 +02:00

html.formcontract.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formcron.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

html.formfile.class.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-06-25 20:22:25 +02:00

html.formmail.class.php

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

html.formmailing.class.php

camel case

2014-05-30 12:01:26 +02:00

html.formorder.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formother.class.php

Removed SQL string from call debug log

2014-06-13 01:34:39 +02:00

html.formprojet.class.php

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

html.formpropal.class.php

More substitutions

2014-06-12 11:31:53 +02:00

html.formsms.class.php

List cleaner

2014-05-11 21:59:35 +02:00

html.formsocialcontrib.class.php

More substitutions

2014-06-12 11:31:53 +02:00

index.php

…

infobox.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

interfaces.class.php

Decrease log level for disabled trigger

2014-05-13 10:36:01 +02:00

ldap.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

link.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

menu.class.php

…

menubase.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +02:00

notify.class.php

More substitutions

2014-06-12 11:31:53 +02:00

openid.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

rssparser.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

smtps.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

stats.class.php

More substitutions

2014-06-12 11:31:53 +02:00

translate.class.php

Merge branch 'develop' into syslog

2014-07-02 21:20:02 +02:00

vcard.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00