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

Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php

2017-06-14 10:48:34 +02:00

..

doctemplates

Work on 6.0 look and feel

2017-03-31 17:41:20 +02:00

lib

…

mssql

…

mysql

Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor

2017-06-12 17:44:27 +02:00

pgsql

Uniformize field names

2017-01-31 14:10:06 +01:00

sqlite3

…

.gitignore

Package add version into xml integrity file.

2016-09-30 15:41:08 +02:00

check.php

Better translation

2017-04-25 12:57:20 +02:00

default.css

Look and feel v6

2017-05-26 00:02:41 +02:00

fileconf.php

Look and feel v6

2017-05-26 00:02:41 +02:00

inc.php

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

2017-06-14 10:48:34 +02:00

index.php

…

install.forced.sample.php

…

phpinfo.php

…

repair.php

Fix missing thumbs images for products

2017-06-09 00:27:44 +02:00

robots.txt

…

step1.php

NEW custom dir is enabled dy default on first install.

2017-06-10 23:50:46 +02:00

step2.php

Save MAIN_VERSION_FIRST_INSTALL that is not erased.

2017-06-10 22:11:12 +02:00

step4.php

FIX security bugs

2016-12-18 13:24:06 +01:00

step5.php

FIX CVE-2017-7888

2017-06-10 22:31:22 +02:00

upgrade2.php

Fix missing init of hookmanager

2017-06-08 11:18:41 +02:00

upgrade.php

NEW Add hook doUpgrade2

2017-06-06 01:34:25 +02:00