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

Jump to bottom

Merge 1.7.6.x to develop - 28/06/2019 #14425

Merged
merged 16 commits into from Jul 1, 2019
Merged

Merge 1.7.6.x to develop - 28/06/2019 #14425

merged 16 commits into from Jul 1, 2019

Conversation

matks
Copy link
Contributor

@matks matks commented Jun 28, 2019 •
edited by eternoendless

Questions Answers
Branch? develop
Description? Merge of bug fixes from 1.7.6.x branch to develop as we are in code freeze
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Travis should be green

This change is Reviewable

PierreRambaud and others added 16 commits June 25, 2019 15:36
@PierreRambaud
View button doesn't have href
c49db7e
@matks
Merge pull request PrestaShop#14364 from PierreRambaud/fix/14359
563e6d1 
View button doesn't have href
@matks
// Changelog 1.7.6.0 RC 1
a57c7bb
@matks
Merge pull request PrestaShop#14367 from matks/publish-1760-rc1
72351cb 
Update contributors and changelog for 1.7.6.0 RC 1
Force all type number to don't have arrows
63f94f2
Build assets
9f95602
use positive pattern to retrieve price specification data
1fb95cc
Use positive pattern to retrieve decimals informations
3ef935d
Missing comment for decimals
88bd963
@jolelievre
Remove special case for customers, instead fix overflow on tables and…
dabda25 
… fix calendar cropping properly
@jolelievre
Build assets
d4250fc
@matks
Merge pull request PrestaShop#14400 from PierreRambaud/fix/14392
c3b9a85 
Wrong way to retrieve CLDR information
@matks
Handle code review feedbacks for datepicker
d9c6f5e
@matks
Merge pull request PrestaShop#14395 from PierreRambaud/fix/14389
0739c48 
Classic theme force all type number to don't have arrows
@matks
Merge pull request PrestaShop#14401 from jolelievre/fix-grid-calendar
48338b0 
Fix grid calendar
@matks
Merge branch '1.7.6.x' of github.com:PrestaShop/PrestaShop into merge…
a25de12 
…176xtodevelop-30
@matks matks requested a review from a team as a code owner June 28, 2019 15:10
@PrestaShop PrestaShop deleted a comment from prestonBot Jun 28, 2019
@matks
Copy link
Contributor Author

matks commented Jul 1, 2019

Thanks @PierreRambaud

@matks matks added this to the 1.7.7.0 milestone Jul 1, 2019
@matks matks merged commit 401451a into PrestaShop:develop Jul 1, 2019
@matks matks deleted the merge176xtodevelop-30 branch July 1, 2019 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PierreRambaud PierreRambaud PierreRambaud approved these changes

Assignees
No one assigned
Labels
Bug Type: Bug develop Branch
Projects
None yet
Milestone
1.7.7.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@matks @PierreRambaud @prestonBot @jolelievre