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.

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

Multiple integration bugfixes #5865

Merged
merged 9 commits into from Jul 25, 2016

Conversation

@nihco2
Copy link
Contributor

commented Jul 12, 2016

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 nihco2:feat/classic branch 5 times, most recently Jul 20, 2016

@@ -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'),

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu Jul 21, 2016

Member

ping @AlexEven (just in case)

This comment has been minimized.

Copy link
@AlexEven

AlexEven Jul 25, 2016

Contributor

Thanks! I updated it in another PR #5901

@nihco2 nihco2 removed the waiting for QA label Jul 22, 2016

@nihco2 nihco2 force-pushed the nihco2:feat/classic branch to 94ac420 Jul 25, 2016

@vincentbz

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2016

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

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

@maximebiloe maximebiloe merged commit 7357d5e into PrestaShop:develop Jul 25, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@vincentbz

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2016

Status : 'PM approved'

@prestonBot prestonBot added PM ✔️ and removed QA ✔️ labels Jul 25, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.