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

..

ACL

Add basket converter

2013-11-13 17:52:12 +01:00

Application

Use short array declaration

2013-11-18 13:57:33 +01:00

Authentication

Add missing headers

2013-11-20 19:03:55 +01:00

Border

Use short array declaration

2013-11-18 13:57:33 +01:00

Cache

Remove license comments

2013-11-20 16:49:29 +01:00

Command

Add missing headers

2013-11-20 19:03:55 +01:00

Controller

Merge branch '3.8'

2013-12-02 18:17:38 +01:00

Core

Update User entity

2013-11-28 18:00:05 +01:00

Exception

Cleanup

2013-10-29 18:42:47 +01:00

Feed

Add missing headers

2013-11-20 19:03:55 +01:00

Form

Use short array declaration

2013-11-18 13:57:33 +01:00

Helper

Remove license comments

2013-11-20 16:49:29 +01:00

Http

Use configuration property accessor

2013-11-18 18:48:27 +01:00

Media

Remove license comments

2013-11-20 16:49:29 +01:00

Metadata

Add missing headers

2013-11-20 19:03:55 +01:00

Model

Update User entity

2013-11-28 18:00:05 +01:00

Notification

Use short array declaration

2013-11-18 13:57:33 +01:00

Out

Remove license comments

2013-11-20 16:49:29 +01:00

Plugin

Add missing headers

2013-11-20 19:03:55 +01:00

SearchEngine

Remove license comments

2013-11-20 16:49:29 +01:00

Security

Add missing headers

2013-11-20 19:03:55 +01:00

Setup

Add missing headers

2013-11-20 19:03:55 +01:00

TaskManager

Use configuration property accessor

2013-11-18 18:48:27 +01:00

Twig

Add missing headers

2013-11-20 19:03:55 +01:00

Utilities

Add missing headers

2013-11-20 19:03:55 +01:00

Vocabulary

Remove license comments

2013-11-20 16:49:29 +01:00

Application.php

Add UrlGenerator trait

2013-11-22 09:32:21 +01:00

CLI.php

Merge branch '3.8'

2013-11-14 13:32:47 +01:00