Commit graph

12632 commits

Author SHA1 Message Date
Michał Marcinkowski
f863b1be85 Merge pull request #6680 from Arminek/fix-taxon-auto-complete
[Taxon] Fix auto complete
2016-11-10 07:14:04 +01:00
Arminek
961472803b [Taxon] Fix auto complete 2016-11-09 23:52:08 +01:00
Jan Goralski
fe3227242a
[Order] Changed OrderRepository queries to rely on cart state 2016-11-09 22:44:53 +01:00
Michał Marcinkowski
a2203cac97 Merge pull request #6677 from lchrusciel/patch-3
[Github] Yet another pull request template fix
2016-11-09 22:34:17 +01:00
Paweł Jędrzejewski
b47b2e588d Merge pull request #6675 from Zales0123/reset-customer-password-from-admin-panel
[Admin][Customer] Reset customer's password from Admin panel
2016-11-09 19:49:19 +01:00
Mateusz Zalewski
30020de0f1
[Admin][Customer] Reset customer's password from admin panel 2016-11-09 18:53:36 +01:00
Michał Marcinkowski
5c6bcde7ea Merge pull request #6678 from Zales0123/disable-editing-base-currency-exchange-rate
[Admin] Disable editing base currency exchange rate
2016-11-09 17:41:13 +01:00
Michał Marcinkowski
4a029cfff5 Merge pull request #6671 from NeverResponse/order/rename-completed-at
[Order] Renamed 'completedAt' to 'checkoutCompletedAt'
2016-11-09 17:37:56 +01:00
Mateusz Zalewski
d5c130b103
[Admin] Disable editing base currency exchange rate 2016-11-09 16:18:42 +01:00
Łukasz Chruściel
463dc5148f Yet another pull request template fix 2016-11-09 16:04:14 +01:00
Mateusz Zalewski
2d6ced5069
[Behat][Admin] Reset customer's password from admin panel scenario 2016-11-09 15:12:06 +01:00
Magdalena Banasiak
0564ad7c38 [Documentation][Cookbook] How to add a custom promotion rule? - structure 2016-11-09 15:08:39 +01:00
Jan Goralski
c39912a845
[Order] Renamed 'completedAt' to 'checkoutCompletedAt' 2016-11-09 14:39:16 +01:00
Paweł Jędrzejewski
b21cb4ea15 Merge pull request #6661 from NeverResponse/admin/locale-choose-from-all
[Admin] All locales selectable on AdminUser's edit
2016-11-09 14:22:34 +01:00
Michał Marcinkowski
40cf8ef469 Merge pull request #6670 from Zales0123/lower-max-waiting-time
[Behat] Lower maximum waiting time for slug generation
2016-11-09 13:02:14 +01:00
Mateusz Zalewski
cb20e667b8
[Behat] Lower maximum waiting time for slug generation 2016-11-09 11:58:28 +01:00
Paweł Jędrzejewski
6a6aa6c36b Merge pull request #6657 from Zales0123/edit-taxons-slug
[Taxon] Edit taxon slug
2016-11-09 09:27:32 +01:00
Mateusz Zalewski
78cfc2c544
[Admin] Some build and UI fixes 2016-11-09 01:04:06 +01:00
Mateusz Zalewski
435a6052be
[Taxon][Behat] Rest of scenarios implementation 2016-11-08 22:44:22 +01:00
Mateusz Zalewski
45755d0ad4
[Taxon] Taxon slug generation logic + fixtures fixes 2016-11-08 22:44:22 +01:00
Mateusz Zalewski
b3d58009a6
[Taxon][Behat] Editing taxon's slug without generation 2016-11-08 22:44:22 +01:00
Mateusz Zalewski
5f09c09b45
[Taxon] Remove unneeded permalink property 2016-11-08 22:42:14 +01:00
Mateusz Zalewski
98b10e971e
[Behat][Taxon] Editing taxon's slug scenario 2016-11-08 22:42:13 +01:00
Mateusz Zalewski
c3edfa4a72
[Taxonomy] Taxon slug generator 2016-11-08 22:42:13 +01:00
Jan Goralski
b4efb2d5cd
Admin's Tower of Babel 2016-11-08 21:39:00 +01:00
Jan Goralski
0ba54e586d [Behat] Extracted setup AddressBookContext 2016-11-08 21:26:11 +01:00
Jan Goralski
3033d3dc9b [Behat] Fixed address's IndexPage 2016-11-08 21:22:27 +01:00
Jan Goralski
a53e388537 [Core] Fixed address related forms 2016-11-08 21:22:27 +01:00
Paweł Jędrzejewski
89b442defb Merge pull request #6625 from pamil/to-be-a-hat-or-not-to-be-kuhwa
Outsource Behat extensions to FriendsOfBehat (and add support for Symfony 3 there)
2016-11-08 16:18:31 +01:00
Paweł Jędrzejewski
570d66b1b0 Merge pull request #6660 from NeverResponse/merge/product-association
[Association] Assimilated with Product
2016-11-08 15:42:22 +01:00
Paweł Jędrzejewski
8cc7818963 Merge pull request #6659 from michalmarcinkowski/michalmarcinkowski-patch-1
[BugFix] Correct total in payment description
2016-11-08 15:40:40 +01:00
Jan Goralski
a80347f30d [AssociationBundle] Merged into ProductBundle 2016-11-08 15:12:33 +01:00
Jan Goralski
ea8c3b35a2 [Association] Merged into Product component 2016-11-08 15:11:45 +01:00
Michał Marcinkowski
561d3d2df7 [BugFix] Correct total in payment description
Issue mentioned https://github.com/Sylius/Sylius/pull/6600#discussion_r85987264
2016-11-08 13:25:28 +01:00
Kamil Kokot
1b618918a4
Update Behat guide 2016-11-08 13:16:33 +01:00
Kamil Kokot
e84c486981
Customise Behat configurations to FOB extensions 2016-11-08 13:08:20 +01:00
Kamil Kokot
9f1c8bbadc
Delete custom Behat extensions and replace them with FOB ones 2016-11-08 13:06:59 +01:00
Kamil Kokot
890ca84a51
Require FriendsOfBehat packages that can replace custom extensions 2016-11-08 13:06:58 +01:00
Paweł Jędrzejewski
c7c5a7fdef Merge pull request #6658 from Zales0123/slug-generation-ui-fixes
[Admin][UI] Small fixes in slug generation UI
2016-11-08 12:33:28 +01:00
Mateusz Zalewski
b1a9a849c0 [Admin][UI] Small fixes in slug generation UI 2016-11-08 11:49:46 +01:00
Paweł Jędrzejewski
c1d953ee25 Merge pull request #6656 from TheMadeleine/docs/cook/taxons-list
[Documentation][Cookbook] How to render a menu of taxons?
2016-11-08 11:04:50 +01:00
Magdalena Banasiak
8f36be24e2 [Documentation][Cookbook] How to render a menu of taxons? 2016-11-08 10:58:42 +01:00
Michał Marcinkowski
f817c9f649 Merge pull request #6653 from SyliusBot/crowdin-translations-2016-11-07-21-37-02
[AUTO] Updated translations from Crowdin
2016-11-08 10:20:40 +01:00
Michał Marcinkowski
10b4584277 Merge pull request #6633 from Zales0123/fix-default-pr-description-template
[Github] Fix default PR description template
2016-11-08 09:12:18 +01:00
Michał Marcinkowski
ded40eb651 Merge pull request #6649 from loic425/rename_taxon_table
[TaxonomyBundle] rename the taxon table on TaxonomyBundle
2016-11-08 09:11:48 +01:00
Michał Marcinkowski
413f80b3f9 Merge pull request #6654 from carbide20/SYL-1
Grammar updates to docs customization section
2016-11-08 09:04:17 +01:00
Daniel Hennion
e2c8abcdef Grammar updates to docs customization section 2016-11-08 00:06:38 -05:00
Sylius Bot
7d57cf8a09 [Translations] Updated translations from Crowdin 2016-11-07 21:43:26 -05:00
Loic Fremont
5bbd520642 rename taxon table on TaxonomyBundle 2016-11-07 17:36:24 +01:00
Paweł Jędrzejewski
1202e0dd5c Merge pull request #6607 from Arminek/moving-taxon-leafs
[Taxon] Changing order of the taxon
2016-11-07 16:05:59 +01:00