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

CHANGELOG.md

@@ -2,7 +2,7 @@
 - Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too
 - when a category is deleted, all subcategories are deleted
 - delete products when categories are removed. Works only when the category is the default one for this product
-- Manager update exists now. Rune php Thelia thelia:update
+- Manager update exists now. Run ```php Thelia thelia:update```
 - Coupon works now
 - Improved tax rule configuration
 

UPDATE.md

@@ -0,0 +1,8 @@
+#How to update your Thelia
+
+- copy all files from the thelia new version (local/modules/* files too)
+- clear all caches running ```php Thelia cache:clear```
+- run ```php Thelia thelia:update```
+- again clear all caches in all environment :
+    - ```php Thelia cache:clear```
+    - ```php Thelia cache:clear --env=prod```

core/lib/Thelia/Command/CreateAdminUser.php

@@ -88,9 +88,10 @@ class CreateAdminUser extends ContainerAwareCommand
             ));
     }
 
-    protected function enterData($dialog, $output, $label, $error_message)
+    protected function enterData($dialog, $output, $label, $error_message, $hidden = false)
     {
-        return $dialog->askAndValidate(
+        $command = $hidden ? 'askHiddenResponse' : 'askAndValidate';
+        return $dialog->$command(
             $output,
             $this->decorateInfo($label),
             function ($answer) {
@@ -122,8 +123,8 @@ class CreateAdminUser extends ContainerAwareCommand
         $admin->setLastname($input->getOption("last_name") ?: $this->enterData($dialog, $output, "User last name : ", "Please enter user last name."));
 
         do {
-            $password = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password : ", "Please enter a password.");
-            $password_again = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password (again): ", "Please enter the password again.");
+            $password = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password : ", "Please enter a password.", true);
+            $password_again = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password (again): ", "Please enter the password again.", true);
 
             if (! empty($password) && $password == $password_again) {
 

core/lib/Thelia/Controller/Admin/ProductController.php

@@ -26,6 +26,8 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Propel\Runtime\ActiveQuery\Criteria;
 
+use Thelia\Core\Event\FeatureProduct\FeatureProductDeleteEvent;
+use Thelia\Core\Event\FeatureProduct\FeatureProductUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Event\Product\ProductUpdateEvent;
 use Thelia\Core\Event\Product\ProductCreateEvent;
@@ -49,6 +51,8 @@ use Thelia\Core\Security\AccessManager;
 
 use Thelia\Model\AccessoryQuery;
 use Thelia\Model\CategoryQuery;
+use Thelia\Model\FeatureQuery;
+use Thelia\Model\FeatureTemplateQuery;
 use Thelia\Model\FolderQuery;
 use Thelia\Model\ContentQuery;
 use Thelia\Model\AttributeQuery;

install/insert.sql

@@ -37,11 +37,11 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('store_name','', 0, 1, NOW(), NOW()),
 ('store_email','', 0, 1, NOW(), NOW()),
 ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()),
-('thelia_version','2.0.0-beta2', 1, 1, NOW(), NOW()),
+('thelia_version','2.0.0-beta3', 1, 1, NOW(), NOW()),
 ('thelia_major_version','2', 1, 1, NOW(), NOW()),
 ('thelia_minus_version','0', 1, 1, NOW(), NOW()),
 ('thelia_release_version','0', 1, 1, NOW(), NOW()),
-('thelia_extra_version','beta2', 1, 1, NOW(), NOW());
+('thelia_extra_version','beta3', 1, 1, NOW(), NOW());
 
 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
 (1, 'en_US', 'Class name of the session handler', NULL, NULL, NULL),