Merge pull request #1 from Sylius/master

Update
Sylius · Nov 20, 2014 · 3242129 · 3242129
2 parents 989d459 + 0707ea8
commit 3242129
Show file tree

Hide file tree

Showing 699 changed files with 17,057 additions and 6,739 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@ app/*.cache
 app/cache
 app/logs
 
+app/check.php
+app/SymfonyRequirements.php
+
 app/config/parameters.yml
 app/config/*.local.yml
 app/config/deploy.rb

diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,8 @@ before_script:
 script:
     - bin/phpspec run -f dot
 
+    - bin/phpunit -c app/phpunit.xml.dist
+
     - bin/behat --stop-on-failure --suite=account
     - bin/behat --stop-on-failure --suite=addressing
     - bin/behat --stop-on-failure --suite=cart

diff --git a/README.md b/README.md
@@ -1,5 +1,10 @@
-Sylius [![Build status...](https://secure.travis-ci.org/Sylius/Sylius.png?branch=master)](http://travis-ci.org/Sylius/Sylius) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Sylius/Sylius/badges/quality-score.png?s=f6d89b8aad6e15cab61134e7c0544ee1313f7f31)](https://scrutinizer-ci.com/g/Sylius/Sylius/)
-======
+![Sylius](https://dl.dropboxusercontent.com/u/46579820/sylius-logo.jpg)
+
+[![Gitter chat](https://badges.gitter.im/Sylius/Sylius.png)](https://gitter.im/Sylius/Sylius)
+[![License](https://poser.pugx.org/sylius/sylius/license.svg)](https://packagist.org/packages/sylius/sylius)
+[![Build status...](https://secure.travis-ci.org/Sylius/Sylius.png?branch=master)](http://travis-ci.org/Sylius/Sylius)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Sylius/Sylius/badges/quality-score.png?s=f6d89b8aad6e15cab61134e7c0544ee1313f7f31)](https://scrutinizer-ci.com/g/Sylius/Sylius/)
+[![HHVM Status](http://hhvm.h4cc.de/badge/sylius/sylius.svg)](http://hhvm.h4cc.de/package/sylius/sylius)
 
 Sylius is an open source e-commerce solution for **PHP**, based on the [**Symfony2**](http://symfony.com) framework.
 

diff --git a/app/Resources/CmfBlockBundle/views/Block/block_imagine.html.twig b/app/Resources/CmfBlockBundle/views/Block/block_imagine.html.twig
@@ -0,0 +1,11 @@
+{% if block.filter %}
+    {% set filter = block.filter %}
+{% else %}
+    {% set filter = "cmf_block" %}
+{% endif %}
+
+{% block block %}
+    <a href="{{ block.image.id | imagine_filter(filter) }}" title="{{ block.label|default('') }}">
+    <img src="{{ block.image.id | imagine_filter(filter) }}" alt="{{ block.label }}" />
+    </a>
+{% endblock %}
diff --git a/app/Resources/CmfBlockBundle/views/Block/block_slideshow.html.twig b/app/Resources/CmfBlockBundle/views/Block/block_slideshow.html.twig
@@ -0,0 +1 @@
+{% extends 'SyliusWebBundle::gallery.html.twig' %}
diff --git a/app/Resources/FOSUserBundle/serializer/Model.User.yml b/app/Resources/FOSUserBundle/serializer/Model.User.yml
@@ -0,0 +1,11 @@
+FOS\UserBundle\Model\User:
+    exclusion_policy: ALL
+    properties:
+        id:
+            expose: true
+        email:
+            expose: true
+            type: string
+        username:
+            expose: true
+            type: string
diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig
@@ -9,7 +9,7 @@
 
 {% if error %}
     <div class="alert alert-danger">
-        {{ error }}
+        {{ error.messageKey|trans(error.messageData, 'security') }}
     </div>
 {% endif %}