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

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php

2018-09-04 21:35:43 +02:00

..

ajax

Fix regression in media editor in websites

2018-08-28 14:21:58 +02:00

boxes

PSR2 ClassDeclaration

2018-08-29 22:06:05 +02:00

class

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

2018-09-04 21:35:43 +02:00

db

Merge remote-tracking branch 'upstream/develop' into camelCaps

2018-09-01 13:52:51 +02:00

filemanagerdol

function declaration

2018-08-15 17:34:35 +02:00

js

remove superfluous spaces

2018-08-12 19:59:39 +02:00

lib

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

2018-09-03 14:06:51 +02:00

login

…

menus

PSR2 ClassDeclaration

2018-08-29 22:06:05 +02:00

modules

fix merge

2018-09-03 09:34:08 +02:00

tpl

Remove TODO

2018-09-02 16:46:01 +02:00

triggers

FIX remove deprecated triggers USER_LOG*

2018-09-03 09:30:36 +02:00

actions_addupdatedelete.inc.php

…

actions_builddoc.inc.php

…

actions_changeselectedfields.inc.php

…

actions_comments.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

extrafield totalizable

2018-07-26 09:41:44 +02:00

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

…

actions_massactions.inc.php

Merge pull request #9222 from pa-de-solminihac/develop

2018-08-12 18:02:55 +02:00

actions_printing.inc.php

Update actions_printing.inc.php

2018-08-21 12:54:02 +02:00

actions_sendmails.inc.php

…

actions_setmoduleoptions.inc.php

…

actions_setnotes.inc.php

Update actions_setnotes.inc.php

2018-09-02 15:59:09 +02:00

antispamimage.php

…

commonfieldsinexport.inc.php

…

datepicker.php

…

doxygen.php

…

extrafieldsinexport.inc.php

…

get_info.php

Remove TODO

2018-09-02 16:46:01 +02:00

get_menudiv.php

…

index.html

…

photos_resize.php

…

search_page.php

…

search.php

…

tools.php

…

website.inc.php

…