Commit Graph

8 Commits

Author SHA1 Message Date
Romain Neutron
ecf516406a Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
2013-12-19 10:31:52 +01:00
Nicolas Le Goff
7c156f42c8 Fix neutron comments 2013-12-18 20:00:33 +01:00
Romain Neutron
8b0a73ce2d Love for unit tests 2013-12-10 01:29:02 +01:00
Romain Neutron
66e762a1d1 Fix unit test names 2013-12-10 01:29:02 +01:00
Romain Neutron
a3b1ae7163 Fix unit test names, property and function visibility 2013-12-10 01:29:02 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
31c12061ed Fix unit tests 2013-05-27 23:25:28 +02:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00