Laurent Destailleur be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php

2014-08-17 19:34:12 +02:00

..

ajax

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

boxes

Fix: col balance

2014-08-14 13:25:54 +02:00

class

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

2014-08-17 19:34:12 +02:00

db

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

2014-08-17 19:34:12 +02:00

filemanagerdol

phpcs

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

js

Fix: broken feature: add param for use only "disabled" with delConstant

2014-08-17 15:20:43 +02:00

lib

Fix: broken feature: add param for use only "disabled" with delConstant

2014-08-17 15:20:43 +02:00

login

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

menus

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

2014-07-29 01:17:00 +02:00

modules

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

2014-08-14 01:04:15 +02:00

tpl

Maj squelette

2014-08-14 17:27:28 +02:00

triggers

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

2014-08-04 00:02:00 +02:00

actions_extrafields.inc.php

Removed closing php tag

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

actions_sendmails.inc.php

New: Prepare to be able to defined a bcc for each type of email sent

2014-08-05 09:26:40 +02:00

actions_setnotes.inc.php

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

2014-07-08 01:12:55 +02:00

antispamimage.php

Removed closing php tag

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

datepicker.php

Revert "Scrutinizer Auto-Fixes"

2014-07-21 19:07:56 +02:00

doxygen.php

Removed closing php tag

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

get_menudiv.php

Removed closing php tag

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

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

photos_resize.php

Removed closing php tag

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

search_page.php

Removed closing php tag

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

tools.php

Removed closing php tag

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