3336 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Le Goff	a6edeb691f	Merge	2011-12-20 19:58:10 +01:00
Romain	c06a2db6ec	Merge pull request #15 from bartoua/patch-1 ... fix CI	2011-12-20 10:10:20 -08:00
bartoua	94d3e058b0	Fix ant script properties	2011-12-20 18:58:22 +01:00
Nicolas Le Goff	9cd0d6d7aa	Fix bug #101	2011-12-20 18:34:19 +01:00
Nicolas Le Goff	f3afe79af7	Detect php location in system	2011-12-20 18:30:19 +01:00
Nicolas Le Goff	54c8a7a138	Fix #101 : Non graphical tasks does not update their values in database	2011-12-20 18:27:14 +01:00
Nicolas Le Goff	ff9327717e	Fix mail	2011-12-20 17:48:22 +01:00
Nicolas Le Goff	1f5606d51a	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-20 17:40:28 +01:00
Romain Neutron	fb787e864f	Merge branch 'Fix99' into 3.6	2011-12-20 17:39:11 +01:00
Romain Neutron	fb800696ba	Fix bug #99 : unable to upgrade from 3.1 without creating a config.inc file manually	2011-12-20 17:38:38 +01:00
Nicolas Le Goff	ad35d01965	add user_adapter::set_email test	2011-12-20 17:34:44 +01:00
Nicolas Le Goff	b50e6c930e	fix user_adapter::set_email	2011-12-20 17:33:41 +01:00
Romain Neutron	6913a41cd3	Merge bug archivage	2011-12-20 17:05:18 +01:00
Romain Neutron	ca6df7d28c	Merge Archiving bug	2011-12-20 16:52:32 +01:00
Romain Neutron	7d5a03f45a	Fix bug #104 : record not indexed after having been archived	2011-12-20 16:50:27 +01:00
Romain Neutron	43e874e6dc	Add tooltip template templates/web/prod/Tooltip/Basket.html.twig	2011-12-20 16:14:07 +01:00
Romain Neutron	02b120c009	Add \Entities\Basket::hasRecord to proxy	2011-12-20 16:13:52 +01:00
Romain Neutron	d12ad8dfc0	Merge with Legoff's changes	2011-12-20 14:10:53 +01:00
Romain Neutron	1d958dbf2b	Add method \Entities\Basket::hasRecord	2011-12-20 14:08:51 +01:00
Romain Neutron	39c664545d	Baskets routes	2011-12-20 14:07:48 +01:00
Romain Neutron	a656ee21d5	Add filters	2011-12-20 14:07:02 +01:00
Romain Neutron	e8f0e8a10d	Basket routes	2011-12-20 14:06:32 +01:00
Nicolas Le Goff	232d86cf8d	add cascade property on relationship	2011-12-20 13:39:50 +01:00
Nicolas Le Goff	d509139a9e	change constraint name	2011-12-20 13:39:24 +01:00
Nicolas Le Goff	cea1e026bf	add setter	2011-12-20 13:37:23 +01:00
Nicolas Le Goff	572f68cb61	use count method	2011-12-20 13:36:32 +01:00
Nicolas Le Goff	fadc0200f2	enhance basket tests	2011-12-20 13:35:15 +01:00
Nicolas Le Goff	2942472b61	add workzone tests	2011-12-20 13:32:52 +01:00
Nicolas Le Goff	bade38c5e8	add new fxtures	2011-12-20 13:32:16 +01:00
Nicolas Le Goff	157ce3a586	rename fixtures	2011-12-20 13:29:12 +01:00
Romain Neutron	31c1eb3edf	Basket route	2011-12-19 19:17:02 +01:00
Nicolas Le Goff	11543a971e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-19 19:16:29 +01:00
Romain Neutron	d839514cdd	Basket route	2011-12-19 19:14:06 +01:00
Nicolas Le Goff	d7c92a6548	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-19 19:12:35 +01:00
Romain Neutron	8b6278cb2a	Basket route	2011-12-19 19:08:44 +01:00
Nicolas Le Goff	7ee57da570	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-19 19:08:31 +01:00
Nicolas Le Goff	d4367e0944	test	2011-12-19 19:08:20 +01:00
Nicolas Le Goff	9a7c326d6c	added request	2011-12-19 19:07:53 +01:00
Romain Neutron	e1dce46c9c	Basket route	2011-12-19 18:24:16 +01:00
Romain Neutron	efb42bf2eb	Fix entity manager	2011-12-19 17:53:00 +01:00
Romain Neutron	a033f32294	Add humane.js as dependency	2011-12-19 17:51:47 +01:00
Romain Neutron	baad6dd0b5	Merge	2011-12-19 17:51:29 +01:00
Romain Neutron	4fdc965306	Add humane.js	2011-12-19 17:47:50 +01:00
Romain Neutron	979b1c5073	Add rewrite rules	2011-12-19 17:47:38 +01:00
Romain Neutron	da0bc6fb9c	Typo	2011-12-19 17:46:21 +01:00
Romain Neutron	fbe56e4936	Add	2011-12-19 17:45:30 +01:00
Romain Neutron	294c97f4f4	Basket templates	2011-12-19 17:41:33 +01:00
Romain Neutron	c117b6aec1	Add Bad Request	2011-12-19 17:40:49 +01:00
Romain Neutron	df08011365	Basket Controller	2011-12-19 17:40:32 +01:00
Romain Neutron	59852edaa3	Basket Controller	2011-12-19 17:40:07 +01:00