Skip to content

Commit

Permalink
Change configuration for 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
pierallard committed Feb 22, 2016
1 parent c569e36 commit 8217433
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand Down
2 changes: 0 additions & 2 deletions app/config/config_behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ imports:

framework:
test: ~
session:
storage_id: session.storage.mock_file
csrf_protection: true

doctrine:
Expand Down
3 changes: 3 additions & 0 deletions app/config/pim_parameters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8217433

Please sign in to comment.