Laurent Destailleur ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php

2014-02-10 00:38:10 +01:00

..

doctemplates

On going sync/merge from other repo

2013-07-17 19:17:54 +02:00

lib

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mssql

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

2013-01-13 19:33:54 +01:00

mysql

Fix: Removed large comment into migration script

2014-02-08 12:16:27 +01:00

pgsql

Fix install with PostgreSQL

2013-06-01 00:02:13 +02:00

background.png

…

check.php

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

2014-02-10 00:38:10 +01:00

default.css

CSS fixes

2013-09-05 20:54:19 +02:00

etape1.php

Fixed install generated $dolibarr_main_url_root_alt path

2013-11-29 17:28:17 +01:00

etape2.php

Some users report they need more time

2013-09-27 11:04:21 +02:00

etape4.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

etape5.php

New: Make some changes to allow usage of alternative

2013-07-07 03:26:51 +02:00

fileconf.php

Fixed installer with DoliDB abstract class

2013-09-11 15:48:25 +02:00

headbg.jpg

…

inc.php

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

2013-07-19 14:01:47 +02:00

index.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

phpinfo.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

repair.php

I killed <td nowrap>. Hello <td class="nowrap"> !

2013-07-19 14:23:42 +02:00

robots.txt

…

upgrade2.php

Fix: Avoid error in migration from 3.1 version.

2014-02-08 14:55:27 +01:00

upgrade.php

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

2014-01-18 01:13:29 +01:00