Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html

core/lib/Thelia/Form/AddressCreateForm.php

@@ -24,7 +24,6 @@
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-
 /**
  * Class AddressCreateForm
  * @package Thelia\Form
@@ -130,4 +129,4 @@ class AddressCreateForm extends BaseForm
     {
         return "thelia_address_creation";
     }
-}
+}

core/lib/Thelia/Form/AddressUpdateForm.php

@@ -24,14 +24,13 @@
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-
 /**
  * Class AddressUpdateForm
  * @package Thelia\Form
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class AddressUpdateForm extends AddressCreateForm {
-
+class AddressUpdateForm extends AddressCreateForm
+{
     /**
      *
      * in this function you add all the fields you need for your Form.
@@ -56,7 +55,6 @@ class AddressUpdateForm extends AddressCreateForm {
     {
         parent::buildForm();
 
-
     }
 
     /**
@@ -66,4 +64,4 @@ class AddressUpdateForm extends AddressCreateForm {
     {
         return "thelia_address_update";
     }
-}
+}

core/lib/Thelia/Form/CategoryModificationForm.php

@@ -22,9 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 use Thelia\Core\Translation\Translator;
 
@@ -52,4 +49,4 @@ class CategoryModificationForm extends CategoryCreationForm
     {
         return "thelia_category_modification";
     }
-}
+}

core/lib/Thelia/Form/ConfigCreationForm.php

@@ -60,7 +60,7 @@ class ConfigCreationForm extends BaseForm
                     new Constraints\NotBlank()
                 )
             ))
-            ->add("value", "text", array(                
+            ->add("value", "text", array(
                 "label" => "Value *",
                 "label_attr" => array(
                     "for" => "value"

core/lib/Thelia/Form/ConfigModificationForm.php

@@ -23,8 +23,6 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class ConfigModificationForm extends BaseForm

core/lib/Thelia/Form/CouponCreationForm.php

@@ -139,7 +139,7 @@ class CouponCreationForm extends BaseForm
             )
             ->add(
                 'locale',
-                'hidden', 
+                'hidden',
                 array(
                     'constraints' => array(
                         new NotBlank()

core/lib/Thelia/Form/CurrencyModificationForm.php

@@ -22,9 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class CurrencyModificationForm extends CurrencyCreationForm
@@ -42,4 +39,4 @@ class CurrencyModificationForm extends CurrencyCreationForm
     {
         return "thelia_currency_modification";
     }
-}
+}

core/lib/Thelia/Form/CustomerLogin.php

@@ -22,12 +22,9 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Email;
-use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Translation\Translator;
-use Thelia\Model\CustomerQuery;
 
 class CustomerLogin extends BaseForm
 {

core/lib/Thelia/Form/MessageModificationForm.php

@@ -23,8 +23,6 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class MessageModificationForm extends BaseForm
@@ -41,7 +39,7 @@ class MessageModificationForm extends BaseForm
                 )
             ))
             ->add("secured"      , "text"  , array(
-                "label" => "Prevent mailing template modification or deletion, except for super-admin"                
+                "label" => "Prevent mailing template modification or deletion, except for super-admin"
             ))
             ->add("locale"       , "text"  , array())
             ->add("title"        , "text"  , array(

core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php

@@ -89,4 +89,4 @@ trait StandardDescriptionFieldsTrait
                     )
                 ));
      }
-}
+}