Commit graph

6180 commits

Author SHA1 Message Date
Michał Marcinkowski
7f8711f5ba Merge pull request #3740 from pjedrzejewski/remove-web-installer
Remove web installer and clean up InstallerBundle
2015-12-18 11:03:27 +01:00
Michał Marcinkowski
51f7b2cdce Merge pull request #3741 from ReissClothing/pw-fix-zone-fixtures
Zone Fixtures - Fix US being added to Rest of World zone
2015-12-18 11:02:40 +01:00
Michał Marcinkowski
488899f9a6 Merge pull request #3739 from pjedrzejewski/remove-bundle-default-templates
Remove useless default templates
2015-12-18 09:38:21 +01:00
Peter Ward
b7c2f85be5 Fix for sample fixtures to prevent US being added to Rest of World zone as intended. 2015-12-18 07:48:27 +00:00
Paweł Jędrzejewski
3887f270a7 Remove web installer and clean up InstallerBundle 2015-12-18 02:13:38 +01:00
Paweł Jędrzejewski
a3a596ed96 Remove useless default templates 2015-12-18 01:56:11 +01:00
Paweł Jędrzejewski
39dd3547d6 Merge pull request #3723 from tuka217/immutable-code-taxon
[Taxonomy] Introduce code for Taxon
2015-12-17 23:34:30 +01:00
Paweł Jędrzejewski
41aa883b8b Merge pull request #3735 from lingoda/issue-3695-permissions
[PaymentBundle] Fix file permission
2015-12-17 15:46:51 +01:00
Arturs Vonda
453bf18992 Fix file permission
Fixes #3695
2015-12-17 13:12:41 +01:00
Michał Marcinkowski
db6cb3f898 Merge pull request #3721 from pjedrzejewski/rework-resource-bundle-drivers
Rework SyliusResourceBundle drivers
2015-12-17 12:47:58 +01:00
tuka217
b4929c9026 [Taxonomy] Introduce code for taxon
[TaxonomyBundle] Add AddCodeFormSubscriber to TaxonType and TaxonomyType
2015-12-17 11:36:05 +01:00
Paweł Jędrzejewski
1bf65c27d6 Fixes after review, update CHANGELOG and UPGRADE 2015-12-17 11:22:47 +01:00
Paweł Jędrzejewski
341c82b5d9 Merge pull request #3733 from pamil/test-kernel-aww
TestKernel restores default values on services' properties
2015-12-17 09:17:37 +01:00
Paweł Jędrzejewski
88d8feb9c8 Merge pull request #3709 from ReissClothing/pw-add-dev-vagrant
Permit access to app_dev.php through system environment variable
2015-12-17 09:06:48 +01:00
Kamil Kokot
7e57edc843 TestKernel restores default values on services' properties 2015-12-16 22:03:16 +01:00
Paweł Jędrzejewski
6be08f847f Introduce resource metadata 2015-12-16 13:27:25 +01:00
Magdalena Banasiak
5434de22a5 fix fields mapping in configurations 2015-12-16 13:27:22 +01:00
Paweł Jędrzejewski
64b444fe7c Fix the slug generation issue on translations 2015-12-16 13:27:14 +01:00
Magdalena Banasiak
d7c3eac67b Configuration trees update 2015-12-16 13:26:38 +01:00
Paweł Jędrzejewski
91d5e5fab8 Merge pull request #3726 from pamil/doctrine-252
Support for Doctrine ORM >=2.5
2015-12-16 10:50:31 +01:00
Kamil Kokot
c692c59bc6 [Resource] Use output walkers in DoctrineORMAdapter 2015-12-16 10:34:53 +01:00
Kamil Kokot
e431b1669a [Composer] Removed constraint to keep Doctrine ORM under 2.5 version 2015-12-16 10:34:53 +01:00
Paweł Jędrzejewski
16c1ba0e25 Tweak sample configuration trees 2015-12-15 18:58:05 +01:00
Paweł Jędrzejewski
c8c8a4ea00 Merge pull request #3724 from starspire/hotfix-invalid-emails-backend-menu-item-permission
[Permissions] Fixed permission for emails back-end menu item
2015-12-15 16:10:03 +01:00
Paweł Jędrzejewski
a725b6789d Merge pull request #3719 from gonzalovilaseca/patch-6
Update TestKernel.php
2015-12-15 15:45:17 +01:00
Paweł Jędrzejewski
409d9abe5c Merge pull request #3725 from pamil/etc-build-to-gitignore
Updated .gitignore - removed deploy related ones, updated build directory
2015-12-15 15:43:25 +01:00
Kamil Kokot
71ea82fd82 Updated .gitignore - removed deploy related ones, renamed travis/build-output to etc/build 2015-12-15 15:41:17 +01:00
Krzysztof Wędrowicz
8896f0ecd7 [Permissions] Fixed permission for emails backend menu item 2015-12-15 13:16:00 +01:00
Paweł Jędrzejewski
4b022f7672 Merge pull request #2804 from rvanlaak/patch-3
2.7 Defintion deprecation fix
2015-12-15 12:46:06 +01:00
Gonzalo Vilaseca
69fd3b1418 Update TestKernel.php 2015-12-15 09:51:12 +00:00
Richard van Laak
a2eb62dfce 2.7 Definition deprecation fix 2015-12-15 10:17:54 +01:00
Paweł Jędrzejewski
01a1d1cb29 Merge pull request #3722 from pamil/cmf-pages
[CMF Integration] StaticContent/show template can be used with both ContentController and ResourceController
2015-12-15 10:09:24 +01:00
Kamil Kokot
d08c3173ad [CMF Integration] StaticContent/show template can be used with CMF's ContentController and Sylius' ResourceController 2015-12-15 09:46:36 +01:00
Paweł Jędrzejewski
e45127d88b Merge pull request #3714 from steffenbrem/bugfix/phpcr-name-criteria
[BugFix][PHPCR] Fix criteria "name" for DocumentRepository
2015-12-15 01:28:02 +01:00
Paweł Jędrzejewski
71d708dd01 Merge pull request #3718 from ReissClothing/pw-dont-flush-explicit
Avoid flushing only a single resource when not required
2015-12-14 18:09:06 +01:00
Paweł Jędrzejewski
d25444435a Merge pull request #3716 from pamil/hotfix-invalid-log-path-behat
[Behat] Renamed build path
2015-12-14 18:07:15 +01:00
Peter Ward
c96a72a90a Avoid flushing only a single resource when not required 2015-12-14 16:21:42 +00:00
Kamil Kokot
35eb6c23a2 [Behat] Renamed build path 2015-12-14 16:38:41 +01:00
Paweł Jędrzejewski
174ed5ac69 Merge pull request #3269 from ravaj-group/fix/settings-unknown-params
[Settings] Missing parameters issues in twig templates and settings loading
2015-12-14 16:22:45 +01:00
Paweł Jędrzejewski
c005abec21 Merge pull request #3427 from umpirsky/fix/shipping-method-choice-channel
ShippingMethodChoiceType is not channel aware
2015-12-14 15:57:59 +01:00
Paweł Jędrzejewski
0fdb84a2e5 Merge pull request #3461 from fbourigault/fix-flow-bundle-readme
[Flow] Use AbstractContainerAwareStep in README.md
2015-12-14 15:53:04 +01:00
Michał Marcinkowski
cde7573ccd Merge pull request #2926 from ravaj-group/fix/fixtures-visibility
[FixturesBundle]: Make some properties and methods protected for easier override
2015-12-14 15:49:30 +01:00
Steffen Brem
053e9dca23 Fix bug where you could not select phpcr documents with criteria "name" (it would throw: Cannot use nodename property "name" of class "Xyz" as a dynamic operand use "localname()" instead.) 2015-12-14 15:34:24 +01:00
Paweł Jędrzejewski
421809a7bb Merge pull request #3648 from peteward/pw-ondelete-cascade-orders
[DB] Allow orders to be deleted directly through DB with correct onDelete=CASCADEs
2015-12-14 15:28:07 +01:00
Paweł Jędrzejewski
f3de392fd7 Merge pull request #3711 from pamil/etc-directory
[Travis] Etc directory + bunch of fixes
2015-12-14 11:19:29 +01:00
Kamil Kokot
b526cb6e89 [Travis] Simplified build configuration, new cache management, moved build directory, made javascripts more fail-safe 2015-12-14 10:39:44 +01:00
Peter Ward
ea0a58b327 Permit access to app_dev.php through system environment variable (for people using Vagrant) 2015-12-13 10:38:17 +00:00
Paweł Jędrzejewski
3eed85b108 Merge pull request #3706 from afurculita/patch-1
[Registry] Update README.md
2015-12-11 13:19:44 +01:00
Kamil Kokot
89eb4f4bed Moved PHPCS-specific files to etc/phpcs 2015-12-11 13:01:46 +01:00
Adam Elsodaney
8901de630d Create the "etc" directory for environment specific configuration.
With the introduction of AppVeyor continuous integration and
improved setup of Travis, the root directory may start to become
disorganised or cluttered, especially if there are more tools to
be integrated in the future. Moving files for AppVeyor, Travis and
Vagrant into an "etc" directory will help estabish a new location
for similar files.
2015-12-11 12:55:55 +01:00