Laurent Destailleur 30b04c0d3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

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

2018-06-05 18:16:32 +02:00

..

ajax

…

boxes

FIX #8574

2018-04-13 00:54:08 +02:00

class

FIX #8858 #8860 Backport better compatibility fix

2018-05-29 10:13:34 +02:00

db

Fix info of collation is wrong on log

2018-01-19 12:10:03 +01:00

filemanagerdol

…

js

…

lib

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

2018-06-05 18:16:32 +02:00

login

Fix minor

2018-01-14 20:11:38 +01:00

menus

Fix: Bug on invoice status list on left menu

2018-05-08 09:04:04 +02:00

modules

FIX Missing extrafields in export of stock or products

2018-05-23 18:00:27 +02:00

tpl

Revert "No display object line curreny if not necessary"

2018-05-01 11:17:47 +02:00

triggers

Fix: missing User object with API REST

2018-04-10 08:07:23 +02:00

actions_addupdatedelete.inc.php

FIX: commonobject: don't require notnull field if default set

2018-04-19 10:29:48 +02:00

actions_builddoc.inc.php

FIX Make a redirect after the remove_file action to avoid deletion done

2018-03-19 11:29:36 +01:00

actions_changeselectedfields.inc.php

Fix extrafields

2018-01-31 14:01:58 +01:00

actions_comments.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

…

actions_fetchobject.inc.php

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

2018-01-26 12:10:13 +01:00

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

Fix REFLECTED XSS

2018-04-06 18:33:51 +02:00

actions_massactions.inc.php

Fix: extrafiels is not passing orders to invoice

2018-05-17 19:05:25 +02:00

actions_printing.inc.php

…

actions_sendmails.inc.php

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

2018-04-20 01:39:26 +02:00

actions_setmoduleoptions.inc.php

…

actions_setnotes.inc.php

…

antispamimage.php

Fix refreshing of captcha broken if a cache-control set by server

2018-01-24 13:40:39 +01:00

commonfieldsinexport.inc.php

…

datepicker.php

…

doxygen.php

Fix https

2018-01-17 11:41:03 +01:00

extrafieldsinexport.inc.php

…

get_menudiv.php

…

index.html

…

photos_resize.php

…

search_page.php

…

search.php

…

tools.php

…

website.inc.php

…