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

Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php

2018-02-14 22:08:18 +01:00

..

ajax

Fix search link

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

boxes

Fix for multicompany

2018-02-06 10:57:53 +01:00

class

Fix search field at wrong column

2018-02-13 15:48:29 +01:00

db

Fix info of collation is wrong on log

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

filemanagerdol

Clean code

2017-10-20 23:49:20 +02:00

js

Code comment

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

lib

Fix svg image preview ko

2018-02-13 18:15:39 +01:00

login

Fix minor

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

menus

Fix menu visible in dev only

2018-02-12 10:15:58 +01:00

modules

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

2018-02-14 22:08:18 +01:00

tpl

Fix bad escaping

2018-02-13 14:30:14 +01:00

triggers

Debug blockedlog with various payments

2018-01-29 18:22:26 +01:00

actions_addupdatedelete.inc.php

Fix generic GETPOST

2017-12-13 13:19:15 +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

Invert left and right (my own comment on left)

2017-10-04 13:17:16 +02:00

actions_dellink.inc.php

…

actions_extrafields.inc.php

Fix 'separate' extrafields must be visible by default.

2017-10-29 11:23:20 +01:00

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 rename files with accents

2017-11-25 00:48:19 +01:00

actions_massactions.inc.php

Several fixes

2017-12-12 16:11:40 +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 trackid

2018-01-22 17:15:44 +01:00

actions_setmoduleoptions.inc.php

Enhance modulebuilder

2017-08-26 15:22:13 +02:00

actions_setnotes.inc.php

Work on modulebuilder

2017-09-23 01:45:03 +02:00

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

Can export Websites pages.

2017-07-28 14:54:13 +02:00

datepicker.php

…

doxygen.php

Fix https

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

extrafieldsinexport.inc.php

Can export Websites pages.

2017-07-28 14:54:13 +02:00

get_menudiv.php

Fix menu with smartphone

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

index.html

…

photos_resize.php

NEW Can sort joined files on thirdparty and user card.

2017-11-10 18:14:29 +01:00

search_page.php

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

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

search.php

…

tools.php

NEW All search boxes are available on smartphone

2017-10-20 01:18:21 +02:00

website.inc.php

Clean code

2017-10-20 23:49:20 +02:00