Laurent Destailleur d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php

2016-02-20 04:25:39 +01:00

..

ajax

Fix do not show warehouse for shipment on not predefined product

2016-01-08 18:15:53 +01:00

boxes

Fix sql forging error

2016-02-19 19:11:54 +01:00

class

FIX Missing carriage return when phone is into property ->phone

2016-02-20 02:31:42 +01:00

db

[Qual] Mysqli: constructor cannot return a value

2016-01-13 11:55:59 +01:00

filemanagerdol

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-12-13 16:09:09 +01:00

js

Fix bad name

2016-02-05 12:23:16 +01:00

lib

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

2016-02-20 04:25:39 +01:00

login

Fix #3542

2015-11-13 11:17:23 +01:00

menus

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

2016-02-19 04:46:11 +01:00

modules

Secure migration for people using a RC

2016-02-20 03:14:29 +01:00

tpl

Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output

2016-02-16 15:41:55 +01:00

triggers

Fix: fields added into 3.8 to store email event was not enough. To late

2016-01-08 13:05:56 +01:00

actions_builddoc.inc.php

[Qual] Uniformize code

2015-11-19 13:59:58 +01:00

actions_changeselectedfields.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

FIX phpcs

2016-02-04 19:03:25 +01:00

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_printing.inc.php

Merge remote branch 'upstream/develop' into printgcp

2015-11-02 11:43:34 +01:00

actions_sendmails.inc.php

Fix message so it is more clear what the feature can do or not.

2015-12-18 12:48:20 +01:00

actions_setnotes.inc.php

[Qual] Uniformize code

2015-11-19 13:59:58 +01:00

antispamimage.php

…

datepicker.php

NEW Factorized price2numjs into lib_head.js.php

2015-12-10 17:03:00 +01:00

doxygen.php

…

extrafieldsinexport.inc.php

Fix: when doing an export of extrafields, we must use different table

2015-12-17 20:40:33 +01:00

get_menudiv.php

…

index.html

…

photos_resize.php

[Qual] Uniformize code

2015-11-19 13:59:58 +01:00

search_page.php

Fix search forms

2016-01-03 18:46:10 +01:00

search.php

FIX The search on user/group was not using new code. Fiels used for

2016-02-07 02:55:56 +01:00

tools.php

…