Laurent Destailleur e9853f3cd7 Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into ...

Franck-MOREAU-develop

Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
	htdocs/projet/element.php

2017-01-07 17:45:05 +01:00

..

doctemplates

A more complete example of odt template

2016-07-29 16:33:31 +02:00

lib

…

mssql

…

mysql

Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into

2017-01-07 17:45:05 +01:00

pgsql

Move tab menu for subscription in member.lib

2016-09-24 06:48:40 +02:00

sqlite3

…

.gitignore

Package add version into xml integrity file.

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

check.php

Prepare 6.0 dev

2017-01-02 18:39:55 +01:00

default.css

Fix css install and login

2017-01-06 15:51:08 +01:00

fileconf.php

Fix css

2016-12-23 00:37:32 +01:00

inc.php

Fix css

2016-12-23 00:37:32 +01: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

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

2017-01-04 18:14:19 +01:00

robots.txt

…

step1.php

Better fix for install on distant server

2016-12-25 23:47:25 +01:00

step2.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00

step4.php

FIX security bugs

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

step5.php

FIX Warning to grant permission must be visible only if one module add

2016-09-30 18:26:32 +02:00

upgrade2.php

Debug accountancy module

2016-10-13 22:29:49 +02:00

upgrade.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00