Commit graph

1743 commits

Author SHA1 Message Date
Paweł Jędrzejewski
34a50e0aec Typo 2013-08-30 00:36:33 +02:00
Paweł Jędrzejewski
6d5ed0630e Update README.md 2013-08-30 00:36:13 +02:00
Paweł Jędrzejewski
0baf1638f0 Merge pull request #289 from Sylius/bundles-merging
Bundles merging
2013-08-29 14:50:45 -07:00
Paweł Jędrzejewski
6de98aee98 Update composer files 2013-08-29 23:24:13 +02:00
Paweł Jędrzejewski
5b0ffadc6f Merge branch 'installer-merge' into bundles-merging 2013-08-29 22:47:34 +02:00
Paweł Jędrzejewski
70e1031f6d Merge branch 'omnipay-merge' into bundles-merging 2013-08-29 22:37:15 +02:00
Paweł Jędrzejewski
3fd190e78b Merge branch 'settings-merge' into bundles-merging 2013-08-29 22:33:07 +02:00
Paweł Jędrzejewski
f438628d62 Merge branch 'flow-merge' into bundles-merging 2013-08-29 22:30:35 +02:00
Paweł Jędrzejewski
dff5d2032e Merge branch 'payments-merge' into bundles-merging 2013-08-29 22:29:02 +02:00
Paweł Jędrzejewski
47abed8e76 Merge branch 'addressing-merge' into bundles-merging 2013-08-29 22:26:27 +02:00
Paweł Jędrzejewski
8379a5aeb3 Merge branch 'resource-merge' into bundles-merging 2013-08-29 22:23:11 +02:00
Paweł Jędrzejewski
1603a03948 Merge branch 'money-merge' into bundles-merging 2013-08-29 22:14:51 +02:00
Paweł Jędrzejewski
f5a0b333bd Merge branch 'shipping-merge' into bundles-merging 2013-08-29 22:12:23 +02:00
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
f774905ec4 Merge pull request #59 from KernelFolla/master
added it translation and fixed en
2013-08-29 04:33:03 -07:00
Paweł Jędrzejewski
9091227321 Merge pull request #14 from cordoval/feature/fix-inverse-side
plug inversed by on transaction to make for a valid query
2013-08-29 04:31:04 -07:00
Paweł Jędrzejewski
2b3d58a645 Merge pull request #56 from amenophis/master
[WIP] Add possibility to stopPropagation
2013-08-29 04:22:37 -07:00
Jérémy Leherpeur
62fe451969 Replace stopWith* by stop 2013-08-29 12:32:23 +02:00
Jérémy Leherpeur
47e783a18f CS Fixes 2013-08-28 20:37:05 +02:00
Jérémy Leherpeur
5d7ce219fa Leave line before return 2013-08-28 20:35:03 +02:00
Paweł Jędrzejewski
6cf9f46275 Merge pull request #286 from winzou/assets-path
Set output parameter to all javascripts blocks
2013-08-28 09:13:06 -07:00
Alexandre
149bbf3201 Fix typo 2013-08-28 15:28:24 +02:00
Alexandre
04b37efee7 Set output parameter to frontend last view 2013-08-28 15:21:30 +02:00
Alexandre
673323a81b Set output parameter to all javascripts blocks 2013-08-28 15:11:59 +02:00
Jérémy Leherpeur
38891d578e Remove .DS_Store 2013-08-28 09:46:30 +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
b224c9a9e5 plug inversed by on transaction to make for a valid query 2013-08-27 19:33:03 -05:00
Luis Cordova
88b74feec0 space cs 2013-08-27 19:02:03 -05:00
Marino Uff
87a4983af4 added it translation and fixed en 2013-08-27 18:31:26 +00: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
2a1ccbb972 Merge pull request #59 from shatzibitten/master
Update ResourceServicesFactory.php
2013-08-25 08:22:28 -07:00
Alex Polorotov
81d3d1952f Update ResourceServicesFactory.php
Pass templates in controller when mongodb has chosen as driver.
2013-08-25 11:59:12 +06:00
Paweł Jędrzejewski
da7d428d3b Merge pull request #276 from umpirsky/fix/20-08-2013
Fixes
2013-08-23 10:36:35 -07:00
amenophis
a19b468a28 Add DS_Store to gitignore 2013-08-22 00:53:06 +02: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
amenophis
9b063398a4 Code style corrections 2013-08-19 21:54:13 +02:00
amenophis
7bd35f1392 Camelize properties names 2013-08-19 21:48:09 +02:00
amenophis
1cdfbcc377 Remove getFlashName and use getFlashMessage
This method can be deleted, we can used directly the existing
getFlashMessage
2013-08-19 21:45:08 +02:00
Paweł Jędrzejewski
2d4e35bb45 Merge pull request #58 from molchanoviv/master
Russian translation style fix
2013-08-19 01:47:00 -07:00
molchanoviv
28e35a23ae Russian translation style fix 2013-08-19 12:33:03 +04:00
Paweł Jędrzejewski
48146e7b95 Merge pull request #45 from AntonTyutin/master
Adding Russian translations
2013-08-19 01:28:28 -07:00