Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple integration bugfixes #5865

Merged
merged 9 commits into from
Jul 25, 2016
Merged

Multiple integration bugfixes #5865

merged 9 commits into from
Jul 25, 2016

Conversation

nihco2
Copy link
Contributor

@nihco2 nihco2 commented Jul 12, 2016 •
edited
Loading

Questions Answers
Branch? develop
Description? multiple bugfixes
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? filtered bug list here: http://bit.ly/29sWf3I
How to test? Check the bug list link above

@nihco2 nihco2 added the WIP label Jul 12, 2016
@nihco2 nihco2 force-pushed the feat/classic branch 5 times, most recently from 7255df6 to 62dbd32 Compare July 21, 2016 15:31
@nihco2 nihco2 added Waiting for PM Status: action required, waiting for product feedback Waiting for QA Status: action required, waiting for test feedback and removed WIP labels Jul 21, 2016
mickaelandrieu
mickaelandrieu reviewed Jul 21, 2016
View reviewed changes
src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php
@@ -124,7 +124,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'options' => array(),
'locales' => $this->locales,
'hideTabs' => true,
'label' => $this->translator->trans('Label when out of stock', array(), 'Admin.Catalog.Feature'),
'label' => $this->translator->trans('Displayed text when out of stock', array(), 'Admin.Catalog.Feature'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @AlexEven (just in case)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I updated it in another PR #5901

@nihco2 nihco2 removed the Waiting for QA Status: action required, waiting for test feedback label Jul 22, 2016
@vincentbz
Copy link
Contributor

Status : 'QA approved'
Status : 'PM approved'

Cool thanks :) All the tickets have been tested and closed

@prestonBot prestonBot added the QA ✔️ Status: check done, code approved label Jul 25, 2016
@maximebiloe maximebiloe removed the Waiting for PM Status: action required, waiting for product feedback label Jul 25, 2016
@maximebiloe maximebiloe merged commit 7357d5e into PrestaShop:develop Jul 25, 2016
@vincentbz
Copy link
Contributor

Status : 'PM approved'

@prestonBot prestonBot added PM ✔️ Status: check done, behavior approved and removed QA ✔️ Status: check done, code approved labels Jul 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
PM ✔️ Status: check done, behavior approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nihco2 @vincentbz @mickaelandrieu @AlexEven @maximebiloe @prestonBot