Commit Graph

27 Commits

Author SHA1 Message Date
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8'
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
2013-12-02 18:17:38 +01:00
Nicolas Le Goff
e2fcd816cc Add block to override menu bar title 2013-11-28 12:38:24 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
8abc87f084 Fix menubar in case no modules are defined 2013-10-29 18:41:44 +01:00
Romain Neutron
cdd1a21c71 Fix #1302 : redirect mechanism does not work as expected 2013-07-17 14:35:39 +02:00
Romain Neutron
b326758ff3 Fix #1305 : Classic does not work 2013-07-11 17:12:05 +02:00
Nicolas Le Goff
0bc951baba Fix #847 About link in lightbox 2013-06-24 16:16:42 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Nicolas Le Goff
53cafa7117 Fix #1189 notifications display is broken 2013-05-30 18:59:59 +02:00
Romain Neutron
e798618b1b Fix login/logout routes 2013-05-29 14:23:04 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
7343b164c1 Thesaurus refactor 2013-02-28 16:14:33 +01:00
Nicolas Le Goff
6b662710d7 Change report link in main menu bar 2013-02-14 20:09:50 +01:00
Romain Neutron
4677f0e9a2 Remove providers instanciation in Twig setup 2012-10-04 15:44:48 +02:00
Romain Neutron
284f281958 Remove user var from templates 2012-10-04 15:43:36 +02:00
Romain Neutron
2535a34efa Update menubar 2012-10-04 15:43:32 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Romain Neutron
832867a2b2 Fix template name 2012-09-27 15:35:19 +02:00
Romain Neutron
9dd1575dc9 Move Events Manager to service 2012-09-27 14:19:48 +02:00
Nicolas Le Goff
623469063f refactor /prod/order/
add tests

fix tests

use url_generator & remove debug variable

remove jquery.order.js from  minify

use proper way to pass parameters when building URL with url_generator
2012-09-07 12:06:05 +02:00
Romain Neutron
b162057f37 Merge 3.7 2012-09-06 14:30:55 +02:00
Romain Neutron
d178b1ad27 Bump to version 3.8.0a2 2012-07-24 13:21:02 +02:00
Romain Neutron
4dcb9b8be1 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
be3b098747 Rename twig templates 2012-07-24 13:12:22 +02:00