5312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	adf7e62f20	Fix build	2011-12-29 18:30:58 +01:00
Romain Neutron	13128aed9a	Fix build	2011-12-29 18:27:41 +01:00
Romain Neutron	d327e5f4f9	Fix templates	2011-12-29 18:26:10 +01:00
Romain Neutron	5112c19235	Fix templates	2011-12-29 18:25:43 +01:00
Romain Neutron	87337473fa	Fix build	2011-12-29 18:24:42 +01:00
Romain Neutron	753c9ba3d3	Fix build	2011-12-29 18:23:22 +01:00
Romain Neutron	de2f34721d	Merge	2011-12-29 14:07:47 +01:00
Romain Neutron	32ddd4aee8	Task do not have a correct return value when abox connection is lost	2011-12-29 14:03:52 +01:00
Romain Neutron	567c6c95fd	Bump to version 3.5.5 3.5.5	2011-12-28 23:14:50 +01:00
Romain Neutron	9b740a19dd	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 23:12:39 +01:00
Romain Neutron	647946e802	Merge branch 'RequiredField' into 3.6	2011-12-28 23:12:23 +01:00
Romain Neutron	d0761afae1	Fix #129 : setup a databox field as required	2011-12-28 23:11:49 +01:00
Romain Neutron	c7e0dd378c	Merge branch 'FixSeparator' into 3.6	2011-12-28 23:05:46 +01:00
Romain Neutron	28736fb20c	Fix #131 : use first separator as main separator	2011-12-28 23:02:53 +01:00
Romain Neutron	88552650a0	JY changes	2011-12-28 22:55:11 +01:00
Nicolas Le Goff	c85d708e65	add enhancement	2011-12-28 20:54:14 +01:00
Nicolas Le Goff	947dbd43ad	move to Alchemy/Phrasea	2011-12-28 20:42:48 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Nicolas Le Goff	bfa8e851c6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 19:32:21 +01:00
Nicolas Le Goff	bcd6719845	add enhancement	2011-12-28 19:31:38 +01:00
Nicolas Le Goff	5e07d736e2	split into smaller function to reduce the crap	2011-12-28 19:30:30 +01:00
Nicolas Le Goff	59f8029d0c	dependency injection refactor	2011-12-28 19:29:41 +01:00
Nicolas Le Goff	0411a943ae	add ::loadConf & some comments	2011-12-28 19:29:05 +01:00
Nicolas Le Goff	266d9021e7	add config parameter class	2011-12-28 19:27:49 +01:00
Nicolas Le Goff	45aa313db7	add configuration & service testes	2011-12-28 19:27:26 +01:00
Romain Neutron	ebdf23f1a3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 15:00:44 +01:00
Romain Neutron	607974edcb	Merge branch '3.5.5' into 3.6	2011-12-28 15:00:18 +01:00
Romain Neutron	f4814e1fe8	Fix #127 : tasks crash counter is reseted on task start	2011-12-28 14:55:40 +01:00
Romain Neutron	52dba2b3a0	Fix #126 : render of ftp export fails	2011-12-28 14:51:49 +01:00
Romain Neutron	742befa16a	Fix #128 ; highlight on multivalued fields fails	2011-12-28 14:47:24 +01:00
Nicolas Le Goff	52c971f1a8	merge	2011-12-28 13:26:05 +01:00
Nicolas Le Goff	42ce345fe8	configuration file system integration	2011-12-28 13:24:26 +01:00
Romain Neutron	4ab9a2563b	Fix #123 : Databox injected rights are removed everytime you logout.	2011-12-28 13:07:17 +01:00
Romain Neutron	b38f1f1227	Fix basket_adapter	2011-12-28 13:02:37 +01:00
Nicolas Le Goff	5a0ed13223	add empty conf to doctrine service object	2011-12-28 13:01:16 +01:00
Nicolas Le Goff	e56279037c	replace setParticipant by setUser	2011-12-28 12:58:44 +01:00
Nicolas Le Goff	dccdf9c209	replace setParticipant by setUser	2011-12-28 12:58:21 +01:00
Nicolas Le Goff	74c556ec32	fix method name, fix ::findElementsByRecord	2011-12-28 12:57:02 +01:00
Nicolas Le Goff	69916c03e6	fix reminded property	2011-12-28 12:55:40 +01:00
Nicolas Le Goff	84fee9c14a	add fixtures, refactor database creation system	2011-12-28 12:55:00 +01:00
Nicolas Le Goff	adfd069481	Fix Controller testes	2011-12-28 12:54:03 +01:00
Romain Neutron	32a7b2bfe8	Fix basket_adapter	2011-12-27 20:36:42 +01:00
Romain Neutron	763cceb4d1	Fix basket_adapter	2011-12-27 20:36:14 +01:00
Romain Neutron	5e568b0062	Merge branch 'FixCollDisplay' into 3.6	2011-12-27 19:51:17 +01:00
Romain Neutron	1774110a33	Fix #125 : Databox details are missing in admin	2011-12-27 19:48:32 +01:00
Romain Neutron	4ab724b8de	Merge AdminFix	2011-12-27 19:25:13 +01:00
Romain Neutron	85d338217f	Fix admin CSS	2011-12-27 19:19:55 +01:00
Romain Neutron	458dc822ec	Selection is active on click, not mousedown	2011-12-27 19:18:11 +01:00
Romain Neutron	069ec209aa	Fix typo	2011-12-27 19:17:55 +01:00
Romain Neutron	ff7a5d2128	Basket refactor	2011-12-27 19:17:36 +01:00