Merge pull request #266 from akeneo/tag-1.5.0-beta1

Preparing 1.5.0-BETA1
akeneo · Feb 23, 2016 · b275dd8 · b275dd8
2 parents 5e53550 + 8217433
commit b275dd8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG-1.5.md b/CHANGELOG-1.5.md
@@ -1,4 +1,17 @@
-# 1.5.x
+# 1.5.0-BETA1 (2016-02-22)
+
+## Bug fixes
+
+- PIM-5508: Variant group edition fix
+
+## BC breaks
+
+- Change constructor of `Pim\Bundle\CommentBundle\Normalizer\Structured\CommentNormalizer` to add `Pim\Component\Localization\Presenter\PresenterInterface` and `Pim\Component\Localization\LocaleResolver`
+- Change constructor of `Pim\Bundle\EnrichBundle\Normalizer\VersionNormalizer` to add `Pim\Component\Localization\Presenter\PresenterInterface`
+- Change constructor of `Pim\Bundle\DashboardBundle\Widget\LastOperationsWidget` to add `Pim\Component\Localization\Presenter\PresenterInterface` and `Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface`
+- Removed `Pim\Bundle\EnrichBundle\AbstractController\AbstractDoctrineController` and `Pim\Bundle\EnrichBundle\AbstractController\AbstractController`.
+- Change constructor of `Pim\Bundle\EnrichBundle\Filter\ProductEditDataFilter` to add `Pim\Bundle\CatalogBundle\Filter\CollectionFilterInterface` and to remove `Oro\Bundle\SecurityBundle\SecurityFacade`, `Pim\Bundle\CatalogBundle\Filter\ObjectFilterInterface`, `Pim\Component\Catalog\Repository\AttributeRepositoryInterface`, `Pim\Component\Catalog\Repository\LocaleRepositoryInterface` and `Pim\Component\Catalog\Repository\ChannelRepositoryInterface`
+- Change constructor of `Pim\Bundle\EnrichBundle\MassEditAction\Operation\EditCommonAttributes` to add `Pim\Bundle\CatalogBundle\Filter\CollectionFilterInterface`
 
 # 1.5.0-ALPHA1 (2016-01-26)
 

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -90,6 +90,7 @@ pim_localization:
     decimal_separators:
         - { value: '.', label: 'dot (.)' }
         - { value: ',', label: 'comma (,)' }
+        - { value: '٫', label: 'arabic decimal separator (٫)' }
     date_formats:
         - { value: 'yyyy-MM-dd', label: 'yyyy-mm-dd' }
         - { value: 'yyyy/MM/dd', label: 'yyyy/mm/dd' }

diff --git a/app/config/config_behat.yml b/app/config/config_behat.yml
@@ -4,8 +4,6 @@ imports:
 
 framework:
     test: ~
-    session:
-        storage_id: session.storage.mock_file
     csrf_protection: true
 
 doctrine:

diff --git a/app/config/pim_parameters.yml b/app/config/pim_parameters.yml
@@ -21,6 +21,9 @@ parameters:
 
     installed:            ~
 
+    # You can use installer_data to install an outside catalog (like one from akeneo/catalogs)
+    # installer_data: %kernel.root_dir%/../vendor/akeneo/catalogs/master/community/small/fixtures
+    # or you can use one of the provided catalogs
     # use PimInstallerBundle:minimal for minimal data set
     installer_data:       PimInstallerBundle:icecat_demo_dev
 

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     },
     "require": {
-        "akeneo/pim-community-dev": "v1.5.0-ALPHA1@alpha",
+        "akeneo/pim-community-dev": "v1.5.0-BETA1@beta",
         "sensio/generator-bundle": "2.3.5"
     },
     "require-dev": {
@@ -81,7 +81,8 @@
             }
         },
         "branch-alias": {
-            "dev-master": "1.5.x-dev",
+            "dev-master": "1.6.x-dev",
+            "dev-1.5": "1.5.x-dev",
             "dev-1.4": "1.4.x-dev",
             "dev-1.3": "1.3.x-dev",
             "dev-1.2": "1.2.x-dev",