13 Commits

Author	SHA1	Message	Date
Laurent Destailleur	25dfa0c5b9	Work on website	2016-05-07 16:38:32 +02:00
Laurent Destailleur	bf09e4a0b9	PHPdoc	2016-05-06 21:28:06 +02:00
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
Laurent Destailleur	d69904c14d	Can set the home page of web sites	2016-05-02 15:51:18 +02:00
Laurent Destailleur	5823055cdf	Work on website module.	2016-05-01 21:19:29 +02:00
Florian HENRY	b01c7572f7	FIX travis	2016-04-29 10:21:39 +02:00
Florian HENRY	717eaa3d81	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/class/websitepage.class.php	2016-04-28 10:32:31 +02:00
Laurent Destailleur	7770d95b18	FIX PHPCS	2016-04-27 16:56:09 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
Laurent Destailleur	c2de7adb32	Minor PHPCS fixes	2016-04-21 03:18:42 +02:00
Laurent Destailleur	4619040983	Work on website module	2016-04-19 18:41:05 +02:00
Laurent Destailleur	87702f89fc	Work on website module	2016-04-12 19:17:50 +02:00