4967 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	ae5d083e25	Add Phraseanet Core to apps	2011-12-24 03:16:02 +01:00
Romain Neutron	1319a01c0b	Cleanup Helpers	2011-12-24 03:15:19 +01:00
Romain Neutron	70c762e93d	Cleanup Helpers	2011-12-24 03:14:19 +01:00
Romain Neutron	1fc83e6019	Cleanup Helpers	2011-12-24 03:08:30 +01:00
Romain	315cf05e6f	Merge pull request #18 from bartoua/patch-1 ... Fix CI for nginx	2011-12-23 09:59:41 -08:00
Jonathan Schneider	22c0fe82ed	Fix CI (again ...)	2011-12-23 18:34:45 +01:00
Romain Neutron	9afa0b02c0	Fix version numbers	2011-12-23 17:19:29 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +01:00
Romain Neutron	02c9d77af6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-21 17:50:43 +01:00
Romain Neutron	c7be5710a6	Fix upload page	2011-12-21 17:50:17 +01:00
Romain Neutron	e1626b20ad	Fix grouping methods	2011-12-21 17:49:41 +01:00
Romain Neutron	903809cff9	CLeanup	2011-12-21 17:48:12 +01:00
Romain Neutron	612593e090	Story controller mount in prod	2011-12-21 17:45:46 +01:00
Romain Neutron	9570890d98	Story tooltip controller	2011-12-21 17:45:23 +01:00
Romain Neutron	bdc3ca2ea0	Cleanup + redorder route	2011-12-21 17:45:14 +01:00
Romain Neutron	04108f66d5	Story controller	2011-12-21 17:44:30 +01:00
Romain Neutron	574da8c092	Story rewrite rules	2011-12-21 17:44:15 +01:00
Romain Neutron	18cbd18d02	Baskets routes	2011-12-21 17:43:26 +01:00
Romain Neutron	2db39e45eb	WorkZone baskets templates	2011-12-21 17:42:21 +01:00
Romain Neutron	89c0009b22	Story WorkZone Element macro	2011-12-21 17:41:49 +01:00
Romain Neutron	78784ef11a	Story WorkZone template	2011-12-21 17:41:40 +01:00
Romain Neutron	3b68d9370a	Story Tooltip template	2011-12-21 17:41:23 +01:00
Romain Neutron	c215bb2f9f	Story Create template	2011-12-21 17:41:09 +01:00
Romain Neutron	9a519b9361	Baskets templates	2011-12-21 17:40:54 +01:00
Romain Neutron	ff5e62b413	Fix getRecord method	2011-12-21 17:40:19 +01:00
Romain Neutron	b620408176	Add \Repositories\StoryWZERepositopry::getUserStory method	2011-12-21 17:39:45 +01:00
Romain Neutron	e3b176a6e5	Bump to version 3.5.3 3.5.3	2011-12-21 14:00:52 +01:00
Nicolas Le Goff	7745560828	add a test to check persistence on cascade operations	2011-12-21 13:20:04 +01:00
Nicolas Le Goff	dc81c6adde	add fixture to load one basket with relations	2011-12-21 13:19:28 +01:00
Nicolas Le Goff	98d803d56f	persistence: add cascade operations	2011-12-21 13:18:56 +01:00
Nicolas Le Goff	ed92922842	Merge	2011-12-20 20:00:52 +01:00
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