Paweł Jędrzejewski
|
39bb857a02
|
Merge pull request #7705 from GSadee/move-emails
[Core][Shop][Admin] Move emails
|
2017-03-09 13:07:37 +01:00 |
|
Paweł Jędrzejewski
|
5ca37768ca
|
Merge pull request #7668 from tuka217/api-docs-fix
[Documentation][API] Fix not working curl commands
|
2017-03-09 13:07:05 +01:00 |
|
Paweł Jędrzejewski
|
8aea47cfcc
|
Merge pull request #7713 from TheMadeleine/docs/grid-bundle
[Documentation][SyliusGridBundle] Filters - fix
|
2017-03-09 12:54:11 +01:00 |
|
Magdalena Banasiak
|
5ebc6a9537
|
[Documentation][SyliusGridBundle] Filters - fix
|
2017-03-09 11:59:41 +01:00 |
|
Michał Marcinkowski
|
52bf052475
|
Merge pull request #7706 from pamil/travis-remove-commented
[Travis] Remove commented out job specification
|
2017-03-08 16:41:47 +01:00 |
|
Kamil Kokot
|
55729f6774
|
Make test methods naming consistent
|
2017-03-08 15:50:36 +01:00 |
|
Arminek
|
be0c05a6d6
|
[Behat] Improve choosing taxon from tree feature
|
2017-03-08 13:53:00 +01:00 |
|
Grzegorz Sadowski
|
097c9da7e3
|
[Core] Update UPGRADE file
|
2017-03-08 13:16:15 +01:00 |
|
Grzegorz Sadowski
|
8955a3fa47
|
[Core][Admin] Move shipment confirmation email from core to admin
|
2017-03-08 13:16:15 +01:00 |
|
Grzegorz Sadowski
|
4ae8e1ce7a
|
[Core][Shop] Move emails from core to shop
|
2017-03-08 13:16:15 +01:00 |
|
Kamil Kokot
|
5e790ed61b
|
[Travis] Remove commented out job specification
|
2017-03-08 12:56:16 +01:00 |
|
Paweł Jędrzejewski
|
7ff0532451
|
Merge pull request #7087 from gorkalaucirica/feature/variant-original-price
[WIP] Bring back original price in product variants
|
2017-03-08 12:04:29 +01:00 |
|
Gorka Laucirica
|
3d7771bbf4
|
Merge pull request #2 from pamil/pull-request/7087
[Behat] Fix pricing-related validation message assertions
|
2017-03-08 10:51:57 +01:00 |
|
Kamil Kokot
|
0e723bc2a2
|
[Behat] Fix pricing-related validation message assertions
|
2017-03-08 10:45:59 +01:00 |
|
Paweł Jędrzejewski
|
a026a75389
|
Merge pull request #7612 from Arminek/js-tree-prototype-2
[Product] Lazy tree choice type
|
2017-03-07 17:54:12 +01:00 |
|
Paweł Jędrzejewski
|
5f93535fbc
|
Merge pull request #7690 from GSadee/grid-enabled-x
[Grid] Add methods for getting only enabled fields, actions and filters
|
2017-03-07 17:50:26 +01:00 |
|
Paweł Jędrzejewski
|
5598c7e248
|
Merge pull request #7679 from gorkalaucirica/ui/ordered-country-choice
Ordered CountryChoiceType
|
2017-03-07 17:49:26 +01:00 |
|
Paweł Jędrzejewski
|
66c575149a
|
Merge pull request #7691 from gonzalovilaseca/patch-10
Remove unncesessary `use`
|
2017-03-07 17:48:44 +01:00 |
|
Paweł Jędrzejewski
|
8aacf0d94d
|
Merge pull request #7692 from SyliusBot/crowdin-translations-2017-03-06-21-37-01
[AUTO] Updated translations from Crowdin
|
2017-03-07 17:48:23 +01:00 |
|
Paweł Jędrzejewski
|
6094df2343
|
Merge pull request #7693 from lchrusciel/remove-token-controller
[API] Remove token controller
|
2017-03-07 17:47:03 +01:00 |
|
Michał Marcinkowski
|
e715422ee6
|
Merge pull request #7685 from lchrusciel/feature-improvement
[Behat] [Promotion] Semantical fixes
|
2017-03-07 13:59:38 +01:00 |
|
Gorka Laucirica
|
c3d6e8b7f7
|
Merge pull request #1 from pamil/pull-request/7087
Make channel pricing translatable
|
2017-03-07 13:13:44 +01:00 |
|
Kamil Kokot
|
542b0679f5
|
Make channel pricing translatable
|
2017-03-07 12:31:36 +01:00 |
|
Łukasz
|
91e401b03f
|
[Behat] [Promotion] Semantical fixes
|
2017-03-07 11:05:21 +01:00 |
|
Arminek
|
8e62a7b480
|
[Js][Product] Main taxon and product taxon Tree choice
|
2017-03-07 11:01:15 +01:00 |
|
Arminek
|
95b1cbc000
|
[Taxon] Change taxon serialization group
|
2017-03-07 11:01:15 +01:00 |
|
tuka217
|
b05def8c78
|
[Documentation] Fix api docs
|
2017-03-07 10:42:41 +01:00 |
|
Gonzalo Vilaseca
|
98cdefc9ef
|
Translatable fields are no longer used
Translatable fields were removed from resource bundle config, `setTranslatableFields` and `setLocaleProvider` aren't called from anywhere.
|
2017-03-07 09:41:04 +00:00 |
|
Łukasz
|
ec6f0e4d90
|
[API] Remove token controller
|
2017-03-07 09:14:31 +01:00 |
|
Sylius Bot
|
ae3b8f4127
|
[Translations] Updated translations from Crowdin
|
2017-03-06 21:40:26 -05:00 |
|
Gorka Laucirica
|
c3cc07817b
|
Added missing scenario to ChannelPricingSpec
|
2017-03-06 22:54:22 +01:00 |
|
Gorka Laucirica
|
698fa96f55
|
Changed %channel% to %channelName% in Behat pages as requested
|
2017-03-06 22:54:22 +01:00 |
|
Gorka Laucirica
|
642b1c7b0f
|
Renamed migration and change "original price" column name
|
2017-03-06 22:54:22 +01:00 |
|
Gorka Laucirica
|
01e77a35d6
|
Removed method added by mistake after rebase
|
2017-03-06 22:54:22 +01:00 |
|
gorkalaucirica
|
dd7a4a0a4c
|
Fixes after code review
|
2017-03-06 22:54:22 +01:00 |
|
gorkalaucirica
|
389a00d75d
|
Original price for variants, changed related model, form and admin ui
|
2017-03-06 22:54:22 +01:00 |
|
Gorka Laucirica
|
b28ecce503
|
Overcome PHP5.6 bug with usort
|
2017-03-06 20:46:52 +01:00 |
|
Gonzalo Vilaseca
|
a0efc875a8
|
Remove unncesessary use
This is not needed?
`use Sylius\Component\Resource\Translation\TranslatableEntityLocaleAssignerInterface;`
|
2017-03-06 16:51:05 +00:00 |
|
Paweł Jędrzejewski
|
fc5086838e
|
Merge pull request #7530 from NeverResponse/image-variant-love-hate-relationship
[Image][Variant] Brought back variant images
|
2017-03-06 16:49:32 +01:00 |
|
Paweł Jędrzejewski
|
b5c95537e2
|
Merge pull request #7667 from TheMadeleine/docs/book/rules-actions-configuration
[Documentation][Book] Promotion - Rules and Actions configuration reference
|
2017-03-06 16:48:33 +01:00 |
|
Grzegorz Sadowski
|
2f44f78885
|
[Grid] Add methods for getting only enabled fields, actions and filters
|
2017-03-06 15:54:05 +01:00 |
|
Paweł Jędrzejewski
|
8d710a58b3
|
Merge pull request #7664 from pamil/channels-collection-type
Introduce ChannelCollectionType
|
2017-03-06 14:04:30 +01:00 |
|
Paweł Jędrzejewski
|
3cb08c2c24
|
Merge pull request #7675 from ktzouno/channel-fixture-default-tax-zone
[Fixtures] adding default_tax_zone in the ChannelFixture configuration
|
2017-03-06 14:03:36 +01:00 |
|
Paweł Jędrzejewski
|
d7fe8def0a
|
Merge pull request #7682 from TheMadeleine/docs/payments-update
[Documentation][Book] Payments - custom gateways
|
2017-03-06 14:03:14 +01:00 |
|
Paweł Jędrzejewski
|
983966a6b7
|
Merge pull request #7683 from RomainSanchez/patch-2
Removed hardcoded 'customer' relation
|
2017-03-06 14:02:12 +01:00 |
|
Paweł Jędrzejewski
|
e5d0b8dcd7
|
Merge pull request #7670 from GSadee/docs-customization-guide-fixes
[Documentation][CustomizationGuide] Fixes
|
2017-03-06 14:01:48 +01:00 |
|
Grzegorz Sadowski
|
64d0648818
|
[Documentation][CustomizationGuide] Fixes after PR review
|
2017-03-06 12:03:46 +01:00 |
|
tuka217
|
365a296041
|
[Documentation] Fix documentation for carts, checkouts and countries api
[Documentation] fix docs for api customer, exchange rates, locales
|
2017-03-06 11:55:34 +01:00 |
|
Grzegorz Sadowski
|
67934b8876
|
[Documentation][CustomizationGuide] Fixes
|
2017-03-06 11:33:20 +01:00 |
|
Romain Sanchez
|
84760466fe
|
Removed hardcoded 'customer' relation
Replaced `findBy(['customer' => $options['customer']])` in favor of `findByCustomer($options['customer'])`
|
2017-03-06 10:43:50 +01:00 |
|