Commit graph

1133 commits

Author SHA1 Message Date
Paweł Jędrzejewski
428ee3c6b6 Merge branch 'inventory-merge' into bundles-merging 2013-08-29 22:04:24 +02:00
Paweł Jędrzejewski
573f8f2248 Merge branch 'taxonomies-merge' into bundles-merging 2013-08-29 22:03:25 +02:00
Paweł Jędrzejewski
8b40067e3d Merge branch 'taxation-merge' into bundles-merging 2013-08-29 21:26:22 +02:00
Paweł Jędrzejewski
a746966e4e Merge branch 'variable-p-merge' into bundles-merging 2013-08-29 21:24:36 +02:00
Paweł Jędrzejewski
7bd04e6220 Merge branch 'product-merge' into bundles-merging 2013-08-29 21:23:27 +02:00
Paweł Jędrzejewski
23b2bdf39b Merge branch 'sales-merge' into bundles-merging 2013-08-29 21:22:04 +02:00
Paweł Jędrzejewski
9348844c23 Merge branch 'cart-merge' into bundles-merging 2013-08-29 21:17:06 +02:00
Paweł Jędrzejewski
2ea735f8a9 Merge branch 'promotions-merge' into bundles-merging 2013-08-29 21:09:39 +02:00
Paweł Jędrzejewski
f236c9b3a4 Merge pull request #49 from cordoval/patch-1
space cs
2013-08-28 00:16:00 -07:00
Luis Cordova
88b74feec0 space cs 2013-08-27 19:02:03 -05:00
Paweł Jędrzejewski
3a0fadc435 Merge pull request #282 from carlalexander/patch-1
Fixed typo
2013-08-26 04:20:56 -07:00
Carl Alexander
53a64fb7e3 Fixed typo 2013-08-25 16:37:09 -04:00
Paweł Jędrzejewski
da7d428d3b Merge pull request #276 from umpirsky/fix/20-08-2013
Fixes
2013-08-23 10:36:35 -07:00
umpirsky
030e06a56f Fixed #258 2013-08-20 11:30:29 +02:00
umpirsky
e4ac5594dc Fixed #274 2013-08-20 11:11:50 +02:00
Paweł Jędrzejewski
fc17cc96b6 Merge pull request #251 from headrevision/travis
Execute Behat scenarios by tag groups on Travis CI
2013-08-18 01:58:57 -07:00
Paweł Jędrzejewski
3fc192bc11 Use single connection MySQL driver in test env 2013-08-17 23:10:45 +02:00
Paweł Jędrzejewski
ebe779acc8 Merge pull request #23 from Sylius/refactor-operator
Initial operator refactoring, introduce factory
2013-08-17 10:46:43 -07:00
Paweł Jędrzejewski
d344745e7d Merge pull request #271 from amenophis/patch-1
Handle all Bootstrap alert types
2013-08-17 10:26:59 -07:00
Jérémy Leherpeur
15168f7712 Handle all Bootstrap alert types 2013-08-17 10:39:20 +02:00
Paweł Jędrzejewski
7d129c499b Merge pull request #268 from winzou/patch-1
Fix payment column name
2013-08-16 10:19:32 -07:00
Paweł Jędrzejewski
8710271161 Remove old Composer script handler, make VariantImage configurable, fix fixtures 2013-08-16 14:29:53 +02:00
Alexandre Bacco
8be6f2dfdf Fix payment column name 2013-08-15 23:16:32 +02:00
headrevision
866c981053 changed travis ci script to execute behat scenarios by tags 2013-08-13 16:42:38 +02:00
Paweł Jędrzejewski
cbab151730 Merge pull request #61 from amenophis/patch-2
Add default table name
2013-08-12 07:20:28 -07:00
Paweł Jędrzejewski
c85c68a054 Merge pull request #62 from amenophis/patch-3
Add default table name
2013-08-12 07:11:44 -07:00
LEHERPEUR Jérémy
d51189e727 Add default table name 2013-08-12 13:46:08 +02:00
LEHERPEUR Jérémy
8c94339a93 Add default table name 2013-08-12 13:41:49 +02:00
Paweł Jędrzejewski
b122ce9d95 Merge pull request #13 from winzou/improve-form
Improve form by using real names
2013-08-12 03:44:27 -07:00
Paweł Jędrzejewski
b9dacfb8ae Merge pull request #29 from winzou/patch-1
Implement needed abstract method
2013-08-12 03:44:09 -07:00
Alexandre
ef4dee1a2c Improve form by using real names 2013-08-12 12:41:50 +02:00
Alexandre Bacco
705568689a Use parent method getName 2013-08-12 12:28:56 +02:00
Paweł Jędrzejewski
77d8ff8df4 Merge pull request #263 from winzou/rtel-user2
Use RTEL for User
2013-08-12 03:26:01 -07:00
Paweł Jędrzejewski
d61f82a7e4 Merge pull request #262 from winzou/fix-mapping
Convert entities into mapped-superclass
2013-08-12 03:24:21 -07:00
Alexandre
acc6546e34 Use RTEL for User 2013-08-12 11:41:38 +02:00
Paweł Jędrzejewski
c849cc1d4d Merge pull request #261 from richardmiller/move-fixtures-to-intl
Move fixtures to using the Intl component
2013-08-12 02:35:40 -07:00
Richard Miller
0fd00abd2a Move fixtures to using the Intl component 2013-08-12 10:31:09 +01:00
Alexandre
a4a17ba227 Convert entities into mapped-superclass 2013-08-12 11:12:37 +02:00
Alexandre Bacco
64b3ef10e3 Extend the right TaxonomyChoiceType class 2013-08-12 10:29:09 +02:00
Alexandre Bacco
1a859bd5b3 Fix form name 2013-08-12 10:27:41 +02:00
Paweł Jędrzejewski
8a12c68b99 Initial operator refactoring, introduce factory 2013-08-11 21:44:46 +02:00
Paweł Jędrzejewski
65ea6d84eb Merge pull request #16 from amenophis/master
French translation
2013-08-11 08:55:24 -07:00
Paweł Jędrzejewski
d5f8d647bc Merge pull request #248 from matteodem/patch-1
Updated macros.html.twig to not show hardcoded information but actual table data
2013-08-11 08:46:21 -07:00
Paweł Jędrzejewski
85cfbb9b6f Merge pull request #246 from stewe/fix-pdf-travis-generation
Fix pdf travis generation
2013-08-11 08:41:12 -07:00
Paweł Jędrzejewski
9f2f0ef808 Merge pull request #256 from cordoval/patch-1
[RFC] improvements to spanish menu translation
2013-08-11 08:40:33 -07:00
Paweł Jędrzejewski
c79e6677aa Merge pull request #252 from matteodem/patch-2
Updated german translations
2013-08-11 08:27:17 -07:00
Paweł Jędrzejewski
157a7d22e0 Merge pull request #12 from Tobion/patch-1
Fix labelPath in VariantChoiceList
2013-08-11 08:25:14 -07:00
Paweł Jędrzejewski
378cfd5536 Merge pull request #23 from amenophis/patch-3
Error in prototype model class
2013-08-11 08:15:50 -07:00
Paweł Jędrzejewski
ac6acef1c0 Merge pull request #19 from lsmith77/patch-1
add explicit table name
2013-08-11 08:06:23 -07:00
Paweł Jędrzejewski
b9aa0f931d Merge pull request #260 from cordoval/patch-3
fix problem with how we run phpspec
2013-08-11 08:05:55 -07:00