Commit graph

6152 commits

Author SHA1 Message Date
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
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
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
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
Alexandru Furculita
1850d3e7d9 Update README.md 2015-12-11 13:06:48 +02:00
Paweł Jędrzejewski
471dbd96fc Merge pull request #3692 from tuka217/immutable-code-promotion
[Promotion] Introduce code for Promotion
2015-12-11 11:02:36 +01:00
Paweł Jędrzejewski
79d7511f02 Merge pull request #3704 from PWalkow/add-checker-for-promotion-coupons
CoreBundle: checker for promotion coupons added
2015-12-10 19:28:22 +01:00
Paweł Jędrzejewski
f09093f85d Merge pull request #3702 from tuka217/immutable-code-archetype
[Archetype] Introduce code for archetype
2015-12-10 19:26:52 +01:00
Piotr Walkow
13a347ad50 empty 2015-12-10 17:38:54 +00:00
Piotr Walkow
8f2269d177 CoreBundle: checker for promotion coupons added 2015-12-10 16:37:15 +00:00
tuka217
89a5e7a829 [Archetype] Introduce code to archetype
[ArchetypeBundle] Add AddCodeFormEventSubscriber to ArchetypeType
2015-12-10 16:51:30 +01:00
tuka217
200b9030da [Promotion] Introduce code for Promotion, CouponInterface now implements CodeAwareInterface
[PromotionBundle] add AddCodeFormSubscriber to PromotionType and to CouponType
2015-12-10 15:55:52 +01:00
Paweł Jędrzejewski
6bdbdb0a80 Merge pull request #3666 from tuka217/immutable-code-payment
[Payment][PaymentBundle] Add immutable code to Payment entities
2015-12-10 14:46:42 +01:00
Paweł Jędrzejewski
d7276a74af Merge pull request #3700 from tuka217/immutable-code-channel
[Channel] Introduce code for channel
2015-12-10 14:46:08 +01:00
tuka217
89c39637e0 [Channel] ChannelInterface extends CodeAwareInterface
[ChannelBundle] Add AddCodeFormSubscriber to ChannelType
2015-12-10 14:28:24 +01:00
tuka217
80aa11d548 [Payment] Add new field 'code' to PaymentMethod, PaymentMethodInterface extends CodeAwareInterface
[PaymentBundle]  PaymentMethodType add AddCodeFormSubscriber to builder
2015-12-10 13:34:34 +01:00
Michał Marcinkowski
5f73329da8 Merge pull request #3699 from tuka217/immutable-code-mailer
[Mailer] Introduce code to Mailer
2015-12-10 13:04:48 +01:00
tuka217
f6e1e1c83e [Mailer] Introduce code to email
[MailerBundle] Add AddCodeFormSubscriber to EmailType
2015-12-10 12:03:07 +01:00
tuka217
ac3e643ed6 [Mailer] Introduce code for Email 2015-12-10 11:47:11 +01:00
Paweł Jędrzejewski
26c7bb4d9d Merge pull request #3667 from tuka217/immutable-code-taxation
[Taxation][TaxationBundle] Add immutable code to Taxation entities
2015-12-10 11:22:10 +01:00
tuka217
ffb4779283 [TaxationBundle] Add event subscriber AddCodeFormSubscriber to TaxRateType and TaxCategoryType
[TaxationBundle] Add validation  for filed 'code' from TaxRate and TaxCategory
[Taxation] Add field 'code' to TaxCategory and TaxRate, TaxCategoryInterface and TaxRateInterface extend AwareCodeInterface
[WebBundle] Add code filed to TaxCategory views and to TaxRate views
2015-12-10 10:15:31 +01:00
Paweł Jędrzejewski
e559c86836 Merge pull request #3675 from tuka217/immutable-code-currency
[Currency] Introduce immutable code for Currency
2015-12-09 20:34:47 +01:00
Paweł Jędrzejewski
059f90d167 Merge pull request #3678 from tuka217/immutable-code-report
[Report] Introduce immutable code for Report
2015-12-09 20:30:40 +01:00
tuka217
0969333f54 Add immutable code to Report
[Report] Introduce code for Report
[ResportBundle] Add AddCodeFormSubscriber to ReportType
2015-12-09 14:17:25 +01:00
Paweł Jędrzejewski
7254d93abc Merge pull request #3694 from pamil/stable-phpcr-odm
[Composer] Using stable doctrine/phpcr-odm
2015-12-09 13:07:49 +01:00
tuka217
3ce46f7404 Add immutable code to Currency
[CurrencyBundle] Add AddCodeFormSubscriber to CurrencyType
[ResourceBundle] Modify AddCodeFormSubscriber to make possible passing type of code field
[Currency] Introduce code for Currency
2015-12-09 11:36:40 +01:00
Kamil Kokot
0e5bd6e18f [Composer] Removed values alignment 2015-12-09 10:51:18 +01:00
Kamil Kokot
508f34c48a [Composer] Using stable doctrine/phpcr-odm 2015-12-09 10:45:49 +01:00
Paweł Jędrzejewski
08084a1055 Merge pull request #3681 from axelvnk/issue_3671
#3671 add defaultLocale and defaultCurrency to Channel model
2015-12-08 16:27:59 +01:00
Paweł Jędrzejewski
99fad5f698 Merge pull request #3690 from fred-jan/response-fix
Responses generated by ProcessValidators now get processed.
2015-12-08 16:26:40 +01:00
Paweł Jędrzejewski
27fdb3006f Merge pull request #3691 from fred-jan/phpdoc-fix
Updated PHPDoc to allow ProcessValidatorInterface instances to be passed
2015-12-08 16:25:14 +01:00
Fred-Jan van der Eijken
7414c0ae0f Updated PHPDoc to allow ProcessValidatorInterface instances to be passed 2015-12-08 13:32:17 +00:00