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

Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php

2017-09-15 11:02:34 +02:00

..

doctemplates

Work on 6.0 look and feel

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

lib

…

mssql

…

mysql

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

2017-09-15 11:02:34 +02:00

pgsql

Fix migration on pgsql

2017-07-19 16:31:15 +02:00

sqlite3

…

.gitignore

Package add version into xml integrity file.

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

check.php

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

2017-09-15 11:02:34 +02:00

default.css

Look and feel v6

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

fileconf.php

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

2017-06-25 02:31:38 +02:00

inc.php

Fix log file name not set during install

2017-07-17 16:24:45 +02:00

index.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

install.forced.sample.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

phpinfo.php

…

repair.php

Fix typo

2017-08-02 13:46:56 +02:00

robots.txt

…

step1.php

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

2017-08-26 21:58:29 +02:00

step2.php

Save MAIN_VERSION_FIRST_INSTALL that is not erased.

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

step4.php

Fix migration of version that is not a final version

2017-07-08 12:48:17 +02:00

step5.php

Fix migration of version that is not a final version

2017-07-08 12:48:17 +02:00

upgrade2.php

Fix: missing salaries upgrade reload module

2017-09-09 16:49:26 +02:00

upgrade.php

Fix migration of version that is not a final version

2017-07-08 12:48:17 +02:00