1702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	7c8c25e325	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 12:36:57 +01:00
Romain Neutron	793b282c7b	Some doc	2012-01-04 12:32:32 +01:00
Romain Neutron	40325cdf19	Implementation finished	2012-01-04 12:32:15 +01:00
Romain Neutron	c667799805	Doctrine UsrLists Entities	2012-01-04 12:31:51 +01:00
Romain Neutron	394eff2c7d	Doctrine UsrLists Entities	2012-01-04 12:31:35 +01:00
Nicolas Le Goff	f75e361df2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 12:14:14 +01:00
Romain Neutron	a81b6aade9	Fix JS Build	2012-01-04 11:41:58 +01:00
Nicolas Le Goff	5fbdde14b7	modfy sample	2012-01-04 11:19:04 +01:00
Romain Neutron	6cf3276af5	Fix JS Build	2012-01-04 11:15:05 +01:00
Romain Neutron	1c7c5ce701	Fix JS Build	2012-01-04 11:00:44 +01:00
Romain Neutron	39ef843a5d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 10:47:16 +01:00
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00
Romain Neutron	6a78fefea1	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 10:45:35 +01:00
Romain Neutron	8dcd5af3cc	Fix #146 : Choice button does not work in lightbox	2012-01-04 10:43:10 +01:00
Romain Neutron	8365b32206	Removed some excessive verbose	2012-01-04 10:32:54 +01:00
Romain Neutron	a7078c2e17	Fix Typo	2012-01-04 10:32:40 +01:00
Nicolas Le Goff	01c9447526	delete connexion sample	2012-01-03 19:59:52 +01:00
Nicolas Le Goff	8fd404dfd7	delete config sample	2012-01-03 19:59:27 +01:00
Nicolas Le Goff	1192a795ce	add config sample file	2012-01-03 19:56:58 +01:00
Nicolas Le Goff	b41959a5ae	add app configuration to doctrine service	2012-01-03 19:45:51 +01:00
Nicolas Le Goff	3339a304ff	add servername to setup registry	2012-01-03 19:43:44 +01:00
Nicolas Le Goff	866b47ed03	add setServername method	2012-01-03 19:43:05 +01:00
Nicolas Le Goff	ee5eaf3510	check if constant are already defined	2012-01-03 19:39:10 +01:00
Nicolas Le Goff	a1956459ac	add servername	2012-01-03 19:37:22 +01:00
Nicolas Le Goff	3f2a527e92	write servername in conf file when creating one appbox	2012-01-03 19:36:18 +01:00
Nicolas Le Goff	df494d262a	fix	2012-01-03 19:35:17 +01:00
Nicolas Le Goff	09a584078f	fix	2012-01-03 19:34:58 +01:00
Nicolas Le Goff	0755017726	fix	2012-01-03 19:34:40 +01:00
Nicolas Le Goff	680cc806f2	remove non relevant tests	2012-01-03 19:34:16 +01:00
Nicolas Le Goff	3a68eaf04b	fix	2012-01-03 19:33:17 +01:00
Nicolas Le Goff	d15f5ce71f	add classes metadatas & create a new EntityManager for each test	2012-01-03 19:32:54 +01:00
jygaulier	a14b626bfe	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 18:57:07 +01:00
jygaulier	d3c9d90bea	fix for 3.5, show sql	2012-01-03 18:56:38 +01:00
Romain Neutron	9605b5c102	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 18:37:20 +01:00
Romain Neutron	09c9e455f4	Fix #144 : Phraseanet:tf-filename metadata is wrong	2012-01-03 18:21:57 +01:00
jygaulier	d15abe329e	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 17:47:05 +01:00
Nicolas Le Goff	43a396eb8e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-03 16:35:02 +01:00
Romain Neutron	880502b7a7	Merge branch 'master' of github.com:alchemy-fr/Phraseanet 3.5.7	2012-01-03 16:30:58 +01:00
Romain Neutron	d25826eab0	Bump to version 3.5.7	2012-01-03 16:30:33 +01:00
Nicolas Le Goff	43fbee03c2	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 16:17:49 +01:00
Nicolas Le Goff	e540bd39d3	Merge branch 'fix_report' into 3.6	2012-01-03 16:15:10 +01:00
Nicolas Le Goff	6872ceb3db	fix #138 report / user downloads	2012-01-03 16:12:41 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Romain Neutron	b6899e6d3f	Update locales	2012-01-03 15:06:10 +01:00
Nicolas Le Goff	0812cb0a9b	copy the new config .yml file with user settings	2012-01-03 14:58:44 +01:00
Romain Neutron	74bb32cb8b	Fix #136 : untranslated strings	2012-01-03 14:57:52 +01:00
Romain Neutron	e288fb0189	Fix #141 : wrong report datas	2012-01-03 14:56:50 +01:00
Nicolas Le Goff	c4de980ba7	replace config.inc	2012-01-03 14:54:12 +01:00
Nicolas Le Goff	c8d1e27a5a	refactor configuration test	2012-01-03 14:50:36 +01:00
Nicolas Le Goff	9d32c3a078	load environment via configuration file	2012-01-03 14:50:15 +01:00