Commit Graph

1425 Commits

Author SHA1 Message Date
Nicolas Le Goff
ccda8a86a9 Temporary revert 2011-12-27 16:27:04 +01:00
Romain Neutron
2c850bf74f Syntax corrections 2011-12-27 15:51:19 +01:00
Romain Neutron
1617d3e561 Fix events loader 2011-12-27 15:46:23 +01:00
Romain Neutron
1358f79012 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2011-12-27 15:35:30 +01:00
Romain Neutron
affd3e28e0 Fix Core load event manager 2011-12-27 15:35:03 +01:00
Nicolas Le Goff
1bde45bf93 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2011-12-27 14:20:24 +01:00
Nicolas Le Goff
d18653789f fix 2011-12-27 14:19:32 +01:00
Romain Neutron
9d965538b4 Refactor basket_adapter 2011-12-27 14:07:09 +01:00
Nicolas Le Goff
c7e9161c7f merge 2011-12-27 13:06:51 +01:00
Nicolas Le Goff
1ffc9ef1f0 delete 2011-12-27 13:02:42 +01:00
Nicolas Le Goff
a11994a5e6 configuration & environnement return null if not installed 2011-12-27 13:01:11 +01:00
Nicolas Le Goff
6858bc4c69 fix core::getEnv 2011-12-27 12:58:33 +01:00
Nicolas Le Goff
c8ed0004a2 Add configuration getter 2011-12-27 12:56:57 +01:00
Nicolas Le Goff
a1ad46cabf fix & cleanup 2011-12-27 12:46:57 +01:00
Nicolas Le Goff
9ca7f61d68 cleanup 2011-12-27 12:45:20 +01:00
Nicolas Le Goff
540a3a8145 cleanup 2011-12-27 12:44:55 +01:00
Nicolas Le Goff
c5a6d65fd1 add configuration systeme 2011-12-26 22:21:32 +01:00
Romain Neutron
d8644f0ad9 Fix Dev Install 2011-12-26 20:39:34 +01:00
Romain Neutron
dc1ef6a3bf Core should work when Phraseanet is not installed 2011-12-26 20:38:29 +01:00
Romain Neutron
0661d25cff Add bootstrap to setup 2011-12-26 20:25:38 +01:00
Romain Neutron
e3294e6f47 Merge with master 2011-12-26 18:39:41 +01:00
Romain Neutron
ae51a396cd Refactor basket_adapter 2011-12-26 12:11:23 +01:00
Romain Neutron
d90998ac12 Menage 2011-12-26 12:09:58 +01:00
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 Neutron
2a3186c10f Fix version numbers 2011-12-23 17:18:00 +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
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
Romain Neutron
59852edaa3 Basket Controller 2011-12-19 17:40:07 +01:00
Nicolas Le Goff
b3012cee04 fix minor issues 2011-12-19 17:13:56 +01:00
Nicolas Le Goff
52c8c18b5f add a doctrine service for env test 2011-12-19 17:10:26 +01:00
Romain Neutron
10f74f0265 Refactor 2011-12-16 20:00:16 +01:00
Romain Neutron
e2ab10b47e Add new modal box 2011-12-16 17:56:12 +01:00
Romain Neutron
6167678f52 Fix Typo 2011-12-16 17:35:03 +01:00
Romain Neutron
0910d7d436 Renamed RequestHandler => Helper 2011-12-16 17:20:52 +01:00
Romain Neutron
c21b960f6b Renamed RequestHandler => Helper 2011-12-16 17:20:30 +01:00
Romain Neutron
57bcd3b971 Renamed RequestHandler => Helper 2011-12-16 17:20:17 +01:00