Laurent Destailleur b267402df6 Merge remote-tracking branch 'origin/4.0' into develop ...

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php

2016-08-01 15:15:32 +02:00

..

ajax

Save the virtualhost so we can test without entering it each time.

2016-07-14 19:42:04 +02:00

boxes

Fix doxygen

2016-07-27 17:41:21 +02:00

class

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +02:00

db

Better error management

2016-07-23 10:25:31 +02:00

filemanagerdol

Fix PHPCS

2016-07-06 11:23:32 +02:00

js

A fix to make editinplace working better

2016-07-28 15:29:46 +02:00

lib

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +02:00

login

…

menus

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +02:00

modules

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-01 15:15:32 +02:00

tpl

fix : extrafield required & defaut value disabled

2016-08-01 09:56:41 +02:00

triggers

Fix: restore logout and logged translation key

2016-07-27 17:00:14 +02:00

actions_builddoc.inc.php

…

actions_changeselectedfields.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

…

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

…

actions_massactions.inc.php

NEW Mutualize mass action. So "Send by email" is also avavilable on

2016-07-25 21:50:41 +02:00

actions_printing.inc.php

…

actions_sendmails.inc.php

…

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

…

doxygen.php

Use https links

2016-07-30 11:40:55 +02:00

extrafieldsinexport.inc.php

…

get_menudiv.php

…

index.html

…

photos_resize.php

…

search_page.php

…

search.php

…

tools.php

…