Commit graph

12568 commits

Author SHA1 Message Date
Paweł Jędrzejewski
859e68794b Merge pull request #6720 from SyliusBot/crowdin-translations-2016-11-14-21-37-02
[AUTO] Updated translations from Crowdin
2016-11-15 11:45:27 +01:00
Michał Marcinkowski
da50c73910 Merge pull request #6721 from inssein/fix-currency-switch-redirect
[ShopBundle] Fix redirect when referer is blank
2016-11-15 09:25:40 +01:00
Michał Marcinkowski
b6444aeff7 Merge pull request #6722 from TheMadeleine/docs/book/promotion-usage-limit
[Documentation][Book] Promotion - usageLimit clarification
2016-11-15 08:48:13 +01:00
Magdalena Banasiak
575289754b [Documentation][Book] Promotion - usageLimit clarification 2016-11-15 08:30:43 +01:00
inssein
7869b1c73c use getSchemeAndHttpHost instead of baseUrl 2016-11-14 20:19:33 -08:00
Sylius Bot
2522aad938 [Translations] Updated translations from Crowdin 2016-11-14 21:43:02 -05:00
Paweł Jędrzejewski
78305eb928 Merge pull request #6716 from TheMadeleine/docs/cook/facebook
[Documentation][Cookbook] How to add Facebook login?
2016-11-14 20:19:38 +01:00
Paweł Jędrzejewski
4ba6eae585 Merge pull request #6683 from Arminek/price-per-channel-and-currency
[Pricing] Price per channel and currency
2016-11-14 20:18:04 +01:00
Paweł Jędrzejewski
b5faef23ea Merge pull request #6688 from NeverResponse/admin/products-dimensions
[Admin] Added physical dimensions to variant/simple product views
2016-11-14 20:15:20 +01:00
Paweł Jędrzejewski
3d265c5b12 Merge pull request #6692 from venyii/use-connection-dbname
[Core] Use dbname from doctrine connection to allow custom values
2016-11-14 20:14:21 +01:00
Paweł Jędrzejewski
34c5c3fe19 Merge pull request #6684 from GSadee/orders-on-customer-page
[Admin][Customer] Browsing orders of a customer
2016-11-14 16:40:16 +01:00
Michał Marcinkowski
d591e648e2 Merge pull request #6715 from pamil/promotions-actions-rules-fixes
[Behat] Fix JS tests related to promotions actions/rules
2016-11-14 16:08:29 +01:00
Paweł Jędrzejewski
e9176e4e2b Merge pull request #6714 from TheMadeleine/oauth-user-fix
[CoreBundle] Fix OAuthUser
2016-11-14 16:07:52 +01:00
Magdalena Banasiak
d08e48d565 [Documentation][Cookbook] How to add Facebook login? 2016-11-14 15:53:07 +01:00
Paweł Jędrzejewski
97cc8ff90a Merge pull request #6707 from pamil/remove-omnipay
Remove Omnipay dependency
2016-11-14 15:20:15 +01:00
Kamil Kokot
08b33b52ce
[Behat] Fix JS tests related to promotions actions/rules 2016-11-14 15:08:52 +01:00
Magdalena Banasiak
4571111a5e [Documentation][Cookbook] How to add Facebook login? - structure 2016-11-14 14:31:34 +01:00
Paweł Jędrzejewski
1412234920 Merge pull request #6709 from NeverResponse/sorting/promotion
[Admin] Added sorting to promotions
2016-11-14 13:53:12 +01:00
Paweł Jędrzejewski
9b62063cb1 Merge pull request #6710 from Arminek/fix-wait-for-methods
[Behat] Fix wait for methods
2016-11-14 13:52:35 +01:00
Paweł Jędrzejewski
fab75b4fde Merge pull request #6711 from NeverResponse/province/disallow-independency
[Province] Ensured provinces cannot exist without a country
2016-11-14 13:52:09 +01:00
Paweł Jędrzejewski
9bbaff6e1b Merge pull request #6708 from Zales0123/decouple-mailer-from-resource-and-db
[Mailer] Decouple from Resource and database
2016-11-14 13:51:24 +01:00
Kamil Kokot
df932d7eeb
Remove Omnipay dependency 2016-11-14 13:46:59 +01:00
Magdalena Banasiak
7f2838af7f [CoreBundle] Fix OAuthUser 2016-11-14 13:11:30 +01:00
Mateusz Zalewski
871634a4d9
[Mailer] Docs fixes + build fixes + PR review fixes 2016-11-14 12:52:50 +01:00
Jan Goralski
791fc0b499
[Province] Ensured provinces cannot exist without a country 2016-11-14 12:00:14 +01:00
Arminek
d92902afda [Behat] Fix wait for methods 2016-11-14 11:19:26 +01:00
Mateusz Zalewski
8607e4481f
[Mailer] Remove coupling with Resource component and some refactoring 2016-11-14 11:12:22 +01:00
Jan Goralski
4b4fa1cbf2 [Admin] Added sorting to promotions 2016-11-14 11:12:21 +01:00
Mateusz Zalewski
51b0caf468
[Mailer] Remove everything related to db and ResourceBundle 2016-11-14 11:12:15 +01:00
Grzegorz Sadowski
062aab0e83 [Customer] Fixes after PR review 2016-11-14 10:25:20 +01:00
Grzegorz Sadowski
12d4a2acf5 [Admin][Customer] Add browsing orders of a customer 2016-11-14 10:25:20 +01:00
Grzegorz Sadowski
7b5f4b9842 [Admin][Customer] Implement scenario for browsing orders of a customer 2016-11-14 10:25:20 +01:00
Grzegorz Sadowski
863223524b [Admin][Customer] Add scenario for browsing orders of a customer 2016-11-14 10:25:20 +01:00
Arminek
f558f8b7a1 Review fixes 2016-11-14 10:19:37 +01:00
Arminek
941b482f3d [Pricing] Feature implementation 2016-11-14 09:30:07 +01:00
Arminek
f797fec0ae [Pricing] Remove unused calculators 2016-11-14 09:29:19 +01:00
Arminek
e25123dff0 [Behat] steps implementation 2016-11-14 09:29:19 +01:00
Paweł Jędrzejewski
c66308223d Merge pull request #6699 from davalb/master
removes superfluous words in documentation
2016-11-14 09:29:14 +01:00
Arminek
24984d2b5a [Pricing] Configure channel and currency based calculator 2016-11-14 09:27:12 +01:00
Paweł Jędrzejewski
05b52508b1 Merge pull request #6703 from Joypricecorp/resource-route-config-fix
[ResourceBundle] Allow array to form config.
2016-11-14 09:24:52 +01:00
Michał Marcinkowski
fbf0a5bd52 Merge pull request #6593 from Zales0123/recalculating-product-average-rating-after-rate-change-in-admin-panel
[Behat][ProductReview] Recalculate average rating after review rate change
2016-11-14 08:50:54 +01:00
venyii
21a5a2d4f7
Use dbname from doctrine connection to allow custom values 2016-11-14 08:14:55 +01:00
Mateusz Zalewski
b9880eb508
PR review fixes 2016-11-13 21:10:22 +01:00
liverbool
b357a90a12 allow array to form config. 2016-11-14 02:35:09 +07:00
David Albrecht
d2725a403f removes superfluous words in documentation
I stumbled over this sentence and thought it made more sense removing the first three words.
2016-11-13 13:00:16 +01:00
Paweł Jędrzejewski
a9431f868b Merge pull request #6690 from NeverResponse/remove/product-get-first-variant
[Core] Removed all occurrences of 'getFirstVariant' method
2016-11-12 17:09:12 +01:00
Paweł Jędrzejewski
34809af1aa Merge pull request #6697 from venyii/absolute-install-paths
[Core] Ensure writable web/ directories with absolute paths in the installer
2016-11-12 17:08:40 +01:00
Jan Goralski
13ada69590 [Admin] Added dimensions to the product forms 2016-11-11 20:02:26 +01:00
Jan Goralski
41f6cd5fac [Behat] Reduced duplications in ManagingProductVariantsContext 2016-11-11 16:06:24 +01:00
Jan Goralski
5770c5558b [Core] Removed all occurrences of 'getFirstVariant' method 2016-11-11 16:06:24 +01:00