Laurent Destailleur 3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php

2016-04-29 20:42:35 +02:00

..

ajax

Merge pull request #4921 from FHenry/3.9

2016-04-04 00:25:56 +02:00

boxes

FIX Box disabled because bugged

2016-04-07 19:24:29 +02:00

class

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

2016-04-29 20:42:35 +02:00

db

Fix doc and mysql min version

2015-12-27 17:05:56 +01:00

filemanagerdol

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

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

js

Fix conflict with the div #dialog used for popup cut and paste of

2016-01-02 00:27:14 +01:00

lib

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

2016-04-21 02:42:43 +02:00

login

Fix #3542

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

menus

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

2016-04-12 15:03:19 +02:00

modules

Update printgcp.modules.php

2016-04-21 07:53:22 +02:00

tpl

Merge pull request #4998 from FHenry/3.9

2016-04-15 13:05:40 +02: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

Work on the feature to select which field to show

2015-10-14 18:48:03 +02:00

actions_dellink.inc.php

…

actions_extrafields.inc.php

[Qual] Uniformize code

2015-11-19 13:59:58 +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 bad link

2016-04-03 12:46:34 +02: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

…