Commit Graph

192 Commits

Author SHA1 Message Date
Romain Neutron
562744f6c7 Refactor caption_field 2012-01-18 18:20:15 +01:00
Romain Neutron
2dfe61d3b7 Fix installer :
- Service sample is wrong
 - Use RegistrySetup in connexion
 - Drop Doctrine Schema before creating (rollback)
2012-01-18 15:05:32 +01:00
Romain Neutron
4e64f9a1a2 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-18 14:24:57 +01:00
Romain Neutron
37742b67c6 Rename twig templates 2012-01-18 14:18:55 +01:00
Nicolas Le Goff
bbbe292e04 Merge with 3.6 2012-01-17 18:00:34 +01:00
Nicolas Le Goff
130a60cd5a remove exit when setup failed 2012-01-17 16:33:20 +01:00
Nicolas Le Goff
02ea562e8d add request to closure argument 2012-01-17 16:32:49 +01:00
Nicolas Le Goff
6dfbdb040c add correct json content-type 2012-01-17 16:31:18 +01:00
Nicolas Le Goff
308972b857 add adapter_action twig parameters to avoid raises of twig_exception in strict variable mode 2012-01-17 16:30:25 +01:00
Nicolas Le Goff
4a6b3ee10c use unserialize method of serchEngineOption object instead of json_decode 2012-01-17 16:28:37 +01:00
Romain Neutron
af860e2fa6 Merge with master 2012-01-16 20:19:20 +01:00
Nicolas Le Goff
9daae2306d Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-13 13:11:03 +01:00
Nicolas Le Goff
cc890c73f2 fix namespace issue 2012-01-13 13:10:05 +01:00
Nicolas Le Goff
c87f48c2e2 refactor 2012-01-13 13:05:42 +01:00
Nicolas Le Goff
4c8f0e5784 refactor 2012-01-13 13:05:08 +01:00
Romain Neutron
b37703b506 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-13 12:16:59 +01:00
Romain Neutron
6c92c7bf77 UsrLists fixes 2012-01-13 12:11:22 +01:00
Nicolas Le Goff
85a7239c82 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-12 19:01:11 +01:00
Nicolas Le Goff
9a14de2d49 change ServiceBuilder::build() 2012-01-12 19:00:13 +01:00
Romain Neutron
694b3b04e6 Move user search in push controller 2012-01-12 15:31:28 +01:00
Romain Neutron
66e5d0302a Add Alchemy\Phrasea\Controller\Exception 2012-01-12 14:25:52 +01:00
Romain Neutron
883dde944f Refactor Core::request 2012-01-12 14:25:35 +01:00
Romain Neutron
921e697620 Add documentation 2012-01-11 23:59:00 +01:00
Romain Neutron
3d32dcd2ce Merge 2012-01-11 21:06:33 +01:00
Romain Neutron
a1983b3305 Fix push bugs 2012-01-11 20:54:20 +01:00
Romain Neutron
5230289fdd Add User tooltip route 2012-01-11 20:54:11 +01:00
Nicolas Le Goff
3125bdc7af Merge 2012-01-11 15:04:52 +01:00
Nicolas Le Goff
b8dd8d4e69 recover doctrine as service 2012-01-11 12:15:43 +01:00
Romain Neutron
6156bc0cbb Renamed prod/index.html 2012-01-11 10:43:55 +01:00
Romain Neutron
869a2f614c Added WorkZone browser routes 2012-01-10 20:32:00 +01:00
Romain Neutron
1d447341d5 Enhanced Basket archive route 2012-01-10 20:31:49 +01:00
Romain Neutron
eebc52cd83 Basket Browser 2012-01-10 12:49:01 +01:00
Nicolas Le Goff
a6edc04f05 set twig service for rendering templates 2012-01-06 16:39:02 +01:00
Nicolas Le Goff
0688a9f58a Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-04 17:55:16 +01:00
Nicolas Le Goff
c7d0d78658 fix creation schema error on install 2012-01-04 17:54:50 +01:00
Nicolas Le Goff
403fa93fd7 add doctrine schema creation on install process 2012-01-04 14:38:14 +01:00
Romain Neutron
40325cdf19 Implementation finished 2012-01-04 12:32:15 +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
Nicolas Le Goff
3339a304ff add servername to setup registry 2012-01-03 19:43:44 +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
af9330b17e Merge 3.5.7 2012-01-03 15:26:07 +01:00
Nicolas Le Goff
5974a2042a remove write config add servername to registry 2012-01-03 14:31:45 +01:00
Romain Neutron
df0d6e487f Push Controller 2012-01-03 11:03:06 +01:00
Romain Neutron
eb95679e6c Implement UsrList controller 2012-01-03 11:02:46 +01:00
Romain Neutron
a1e447fe66 Push controller 2012-01-02 16:20:23 +01:00
Romain Neutron
3f559a36d7 Push Controllers 2012-01-02 12:52:46 +01:00
Romain Neutron
405b7c6cda Usr List controller 2012-01-02 12:47:12 +01:00
Romain Neutron
8f77647778 Add print log 2011-12-30 16:21:49 +01:00
Romain Neutron
71ecc1a14f Add Printer Controller 2011-12-30 16:14:49 +01:00
Nicolas Le Goff
04d24cb8da fix story lst issue 2011-12-30 14:28:20 +01:00