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

Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang

2017-02-21 10:34:52 +01:00

..

ajax

Debug of feature for browser notifications

2017-02-14 18:20:01 +01:00

boxes

Fix bank account box

2016-12-11 14:01:04 +01:00

class

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

2017-02-21 10:34:52 +01:00

db

FIX #4758 PHP warning when installing to PostgreSQL with incorrect credentials

2017-01-29 23:05:20 +01:00

filemanagerdol

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

js

Debug of feature for browser notifications

2017-02-14 18:20:01 +01:00

lib

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

2017-02-17 17:14:00 +01:00

login

…

menus

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

2017-02-21 10:34:52 +01:00

modules

NEW Introduce fields that can be computed during export in export

2017-02-17 00:19:28 +01:00

tpl

$usemargins not used on global

2017-02-15 01:11:25 +01:00

triggers

Fix dead code

2016-10-25 21:04:49 +02:00

actions_builddoc.inc.php

Debug module variant

2017-02-08 12:52:31 +01:00

actions_changeselectedfields.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

…

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

Work on sorting/indexing upload files

2016-12-31 03:43:22 +01:00

actions_massactions.inc.php

Backport a file to make migration easier

2016-11-17 19:28:19 +01:00

actions_printing.inc.php

…

actions_sendmails.inc.php

FIX #6270

2017-01-16 13:06:26 +01:00

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

doxygen.php

…

extrafieldsinexport.inc.php

FIX : Do not include separate extrafields into export cause "separate"

2016-12-09 17:17:58 +01:00

get_menudiv.php

…

index.html

…

photos_resize.php

Work on sorting/indexing upload files

2016-12-31 03:43:22 +01:00

search_page.php

…

search.php

…

tools.php

…