Commit graph

4293 commits

Author SHA1 Message Date
Gonzalo Vilaseca
bb22cc3f22 Sylius i18n 2014-12-16 13:22:31 +00:00
Paweł Jędrzejewski
983bab140d Merge pull request #2239 from aRn0D/promotion
[PromotionBundle] The collection form type uses the new CollectionExtension
2014-12-16 10:01:19 +01:00
Paweł Jędrzejewski
213f8341bb Merge pull request #2247 from steffenbrem/fix-options-persist
[Product][Easy] Add cascade to product options field (doctrine mapping)
2014-12-16 09:59:43 +01:00
Steffen Brem
aba4b5883d Add cascade to product options field (doctrine mapping)
Change cascade from all to persist
2014-12-15 19:46:10 +01:00
Arnaud Langlade
0eb0887d8e [PromotionBundle] Behat fixes 2014-12-13 11:28:59 +01:00
Arnaud Langlade
d8ec1513d4 [PromotionBundle] Collection type refactoring 2014-12-13 11:20:29 +01:00
Arnaud Langlade
0d663697c5 [PromotionBundle] The collection form type uses the new CollectionExtension 2014-12-13 11:20:29 +01:00
Paweł Jędrzejewski
0f4e22f689 Merge pull request #2248 from stloyd/feature/bundle_prefix
Don't force bundles to define prefix when extending `AbstractResourceBundle`
2014-12-12 15:13:32 +01:00
Paweł Jędrzejewski
7a43eb4dfb Merge pull request #2246 from stloyd/patch-1
Disable GC in PHP on Travis-CI for performance improvements
2014-12-12 15:09:25 +01:00
stloyd
6fb57296c4 Don't force bundles to define prefix when extending AbstractResourceBundle 2014-12-12 10:54:03 +01:00
Joseph Bielawski
09276ce928 Disable GC in PHP on Travis-CI for performance improvemnts 2014-12-11 13:31:14 +01:00
Paweł Jędrzejewski
e67ea1dbc7 Version bump 2014-12-11 12:05:11 +01:00
Paweł Jędrzejewski
6f7c9e9c4e Merge pull request #2218 from aRn0D/form-country
[AddressingBundle] The collection form type uses the new CollectionExtension
2014-12-11 09:30:16 +01:00
Paweł Jędrzejewski
454dea0e72 Merge pull request #1675 from stloyd/bugfix/translation_keys
One of ideas how we could fix problem with those translation keys
2014-12-11 09:26:45 +01:00
Arnaud Langlade
68fa99cad7 Merge pull request #2240 from spike31/patch-1
[OrderBundle] Update OrderItem table name
2014-12-10 13:48:37 +01:00
Gilles Gauthier
3288c10781 Add order table name 2014-12-10 13:13:42 +01:00
Gilles Gauthier
838ceaf739 [OrderBundle] Update OrderItem table name 2014-12-10 12:11:35 +01:00
Arnaud Langlade
68c2def782 [AddressingBundle] The collection form type uses the new CollectionExtension 2014-12-10 09:16:25 +01:00
Paweł Jędrzejewski
4ac59dad6e Merge pull request #2237 from michalmarcinkowski/issue-1543
[Taxonomy] Fixed #1543 creating taxons with the same name
2014-12-09 21:29:10 +01:00
Arnaud Langlade
aceb18d118 Merge pull request #2188 from aRn0D/sequence_spec
[Sequencebundle] Missing spec
2014-12-09 20:59:22 +01:00
Paweł Jędrzejewski
1cfe44560f Merge pull request #2238 from rskuipers/patch-1
[WebBundle] Properly close javascripts block and remove superfluous endblock
2014-12-09 20:44:18 +01:00
Rick Kuipers
af25094864 Properly close javascripts block and remove superfluous endblock 2014-12-09 14:21:54 +01:00
michalmarcinkowski
26ae819193 [Taxonomy] Fixed #1543 creating taxons with the same name 2014-12-09 13:27:02 +01:00
Arnaud Langlade
e1cc1cf1ee [SequenceSpec] Missing spec 2014-12-09 13:16:11 +01:00
Paweł Jędrzejewski
315def4f17 Merge pull request #2226 from adamelso/spec-coverage-on-metadata-manipulation
[AttributeBundle][VariationBundle] Spec coverage on Doctrine metadata subscribers and container extensions
2014-12-09 13:10:58 +01:00
Paweł Jędrzejewski
4e1e857f3c Merge pull request #2096 from stloyd/bugfix/payments_forms
[WebBundle] Fix invalid html markup for payments forms
2014-12-09 10:45:38 +01:00
Alexandre Bacco
98bcb16bff Merge pull request #2231 from winzou/fix/payum
Fix legacy payum getNotification
2014-12-09 09:24:22 +08:00
Paweł Jędrzejewski
f534e579ea Fix the formatting discount bug on travis 2014-12-08 23:41:58 +01:00
Paweł Jędrzejewski
e9361f08f3 Fix free product promotion scenario 2014-12-08 22:52:43 +01:00
Paweł Jędrzejewski
59b1c9a07c Fix language switching 2014-12-08 22:20:47 +01:00
Paweł Jędrzejewski
ab4a95370d Tweak the pdf generation 2014-12-08 21:10:11 +01:00
Paweł Jędrzejewski
39067ead21 Fix exit code for travis scripts 2014-12-08 15:58:43 +01:00
Alexandre Bacco
c27172f172 Fix legacy payum getNotification 2014-12-08 14:57:22 +08:00
Paweł Jędrzejewski
b8bcdd432e Merge pull request #2229 from rvanlaarhoven/patch-1
Removed duplicate stripe.secret_key parameter
2014-12-07 21:58:12 +01:00
Adam Elsodaney
90e5a242b9 [VariationBundle] Write common spec example for the container extension 2014-12-07 19:49:45 +00:00
Adam Elsodaney
0d44e0b1d7 [AttributeBundle] Write specs for the container extension 2014-12-07 16:24:14 +00:00
Rick van Laarhoven
8e026c8d1e Removed duplicate stripe.secret_key parameter 2014-12-07 14:28:39 +01:00
Paweł Jędrzejewski
3c7de013f3 Merge pull request #2228 from Sylius/split-travis
Split travis
2014-12-07 11:15:36 +01:00
Paweł Jędrzejewski
d4a1da536a Fix spec and make test suite executables 2014-12-07 10:34:24 +01:00
Paweł Jędrzejewski
5103b8d614 Test split up running 2014-12-07 01:05:32 +01:00
Paweł Jędrzejewski
605a913599 Fix promotion scenarios and nth order rule checker 2014-12-07 00:55:13 +01:00
Adam Elsodaney
6f4def00d2 [VariationBundle] Write specs for the LoadMetadataSubscriber 2014-12-06 23:26:14 +00:00
Adam Elsodaney
8af1d1523b [AttributeBundle] Write specs for the LoadMetadataSubscriber 2014-12-06 23:25:52 +00:00
Paweł Jędrzejewski
98d7dc7cf8 Fix specs 2014-12-06 21:49:01 +01:00
Alexandre Bacco
9945c6f136 Set differentBillingAddress field optional 2014-12-05 15:34:18 +08:00
Paweł Jędrzejewski
46846d13fc Merge pull request #2217 from sudent/fix-order-billing-address
Change billing address mapping to cascade-persist
2014-12-04 13:34:01 +01:00
sudent
63ff440d2c cascade-all for billing address preventing deletion of orders and cart resulting integrity constraint violation 2014-12-04 11:22:06 +00:00
Paweł Jędrzejewski
e956e3249e Merge pull request #2210 from antonioperic/addingVolumeForShipping
Added Volume based shipping calculator
2014-12-04 11:22:23 +01:00
Paweł Jędrzejewski
030f8d5700 Merge pull request #2213 from stloyd/bugfix/cs
Fix some CS issues
2014-12-04 11:03:07 +01:00
stloyd
5c81f8edc7 Fix some CS issues 2014-12-04 10:25:08 +01:00