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

Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php

2018-03-12 19:02:30 +01:00

..

ajax

Fix search link

2018-01-10 11:08:52 +01:00

boxes

CSS

2018-03-06 11:54:05 +01:00

class

fix commonobject isInt for module builder capabilities

2018-03-10 19:02:06 +01:00

db

Fix info of collation is wrong on log

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

filemanagerdol

…

js

Code comment

2018-01-08 00:05:26 +01:00

lib

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

2018-03-08 16:35:12 +01:00

login

Fix minor

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

menus

Update eldy.lib.php

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

modules

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

2018-03-12 19:02:30 +01:00

tpl

bettre syntax

2018-03-09 19:16:06 +01:00

triggers

FIX Subscription events not recorded into agenda

2018-03-06 12:36:39 +01:00

actions_addupdatedelete.inc.php

fix type date

2018-03-09 14:25:37 +01:00

actions_builddoc.inc.php

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

2017-12-21 14:35:33 +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: check if file name already exists

2018-03-02 18:59:30 +01:00

actions_massactions.inc.php

Fix by adding a redirect to avoid the order2billing being done twice.

2018-03-07 19:15:23 +01:00

actions_printing.inc.php

Fux utf8 trouble on direct printing message

2017-11-27 14:34:29 +01:00

actions_sendmails.inc.php

FIX #8277

2018-03-07 15:52:58 +01: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

Fix menu with smartphone

2017-12-08 19:23:13 +01:00

index.html

…

photos_resize.php

…

search_page.php

Fix on search all (trim search + search from smartphone).

2017-12-12 11:31:30 +01:00

search.php

…

tools.php

…

website.inc.php

…