Commit Graph

28 Commits

Author SHA1 Message Date
Nicolas Le Goff
9882095b80 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-21 16:42:01 +01:00
Nicolas Le Goff
194359503e fix basketStealElementTest 2012-02-21 16:41:35 +01:00
Romain Neutron
65f79dd096 Merge before update 2012-02-20 09:14:43 +01:00
Romain Neutron
2717a76675 Update template 2012-02-17 19:47:11 +01:00
Romain Neutron
2590ab6ddd Add control on BasketRepo 2012-02-17 16:08:00 +01:00
Nicolas Le Goff
371b21371d fix cach & fix #398 move service fallback 2012-02-16 18:52:44 +01:00
Romain Neutron
9135de65cf Push & Feedback templates 2012-02-02 15:21:51 +01:00
Romain Neutron
afb42193e7 Merge with master 2012-01-31 12:09:07 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
921e697620 Add documentation 2012-01-11 23:59:00 +01:00
Romain Neutron
1d447341d5 Enhanced Basket archive route 2012-01-10 20:31:49 +01:00
Nicolas Le Goff
a6edc04f05 set twig service for rendering templates 2012-01-06 16:39:02 +01:00
Romain Neutron
1319a01c0b Cleanup Helpers 2011-12-24 03:15:19 +01:00
Romain Neutron
bdc3ca2ea0 Cleanup + redorder route 2011-12-21 17:45:14 +01:00
Romain Neutron
d12ad8dfc0 Merge with Legoff's changes 2011-12-20 14:10:53 +01:00
Romain Neutron
e8f0e8a10d Basket routes 2011-12-20 14:06:32 +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
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
baad6dd0b5 Merge 2011-12-19 17:51:29 +01:00
Romain Neutron
df08011365 Basket Controller 2011-12-19 17:40:32 +01:00
Nicolas Le Goff
b3012cee04 fix minor issues 2011-12-19 17:13:56 +01:00
Romain Neutron
10f74f0265 Refactor 2011-12-16 20:00:16 +01:00
Romain Neutron
bc505910a2 Renamed RequestHandler => Helper 2011-12-16 17:19:52 +01:00
Nicolas Le Goff
cc6c0aa5cd Basket controller 2011-12-15 19:53:13 +01:00
Romain Neutron
d704c92ad0 Add Basket controller 2011-12-15 11:55:54 +01:00