Laurent Destailleur a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php

2018-03-06 09:20:45 +01:00

..

ajax

Fix search link

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

boxes

Fix scrutinizer errors

2018-03-04 11:09:53 +01:00

class

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

2018-03-06 09:20:45 +01:00

db

Fix info of collation is wrong on log

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

filemanagerdol

…

js

NEW Show total of time consumed in week in time spent entry page

2018-02-26 14:09:56 +01:00

lib

Fix scrutinizer errors

2018-03-04 11:09:53 +01:00

login

NEW Add password_hash as hash algorithm

2018-01-15 00:33:25 +01:00

menus

NEW Accept anonmymous events (no user assigned)

2018-03-04 19:39:46 +01:00

modules

Merge pull request #8242 from hregis/develop_multicompany

2018-03-02 17:49:25 +01:00

tpl

Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl

2018-03-02 18:00:52 +01:00

triggers

FIX Subscription not correctly log in blockedlog

2018-03-06 09:08:45 +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

…

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

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

2018-03-06 09:20:45 +01:00

actions_massactions.inc.php

Fix: Parameter must be an array or an object that implements Countable

2018-02-24 14:20:53 +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

Hook 'maildao' was renamed into 'mail' into the method sendfile that

2018-02-03 17:36:33 +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

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

…

website.inc.php

…