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

Merge 1.7.5.x into develop #10719

Merged
merged 35 commits into from Sep 26, 2018
Merged

Merge 1.7.5.x into develop #10719

merged 35 commits into from Sep 26, 2018

Conversation

PierreRambaud
Copy link
Contributor

@PierreRambaud PierreRambaud commented Sep 26, 2018 •
edited by eternoendless

Questions Answers
Branch? develop
Description? Get latest changes from 1.7.5.x
Type? improvement
Category? BO
BC breaks? no
Deprecations? no
How to test? Wait for Travis ci.

This change is Reviewable

lozal2244 and others added 30 commits September 11, 2018 18:18
@lozal2244
bug when advanced stock management is enabled
043c7ca
@MathiasReker @mickaelandrieu
fix tags
f2af244
@mickaelandrieu
Fixed Coding styles
8c0ac8f
@PierreRambaud
use attr('data- instead of data, weird :/
d5a7a6a
@PierreRambaud
Build assets
18d0d30
@eternoendless
Update pull request template for 1.7.5.x
1876397
@eternoendless
Merge pull request #10382 from lozal2244/patch-18
ed3f1f2 
Bug when advanced stock management is enabled in Product Shipping page
@eternoendless
Merge pull request #10448 from Mreker/fix-tags
7be7adf 
Fatal error while adding tags
@Quetzacoalt91
Merge pull request #10601 from PierreRambaud/fix/10598
0dfc590 
Use attr('data-') instead of data
Update native modules
db369e0
Use closest instead of parent to find input bulk actions
fe93249
Merge pull request #10662 from eternoendless/update-native-modules
853d7f0 
Update native modules
Fix height and available modules
9b92d5e
Address @eternoendless comments
3a88405
Fix survival tests
4c5f720
@sarjon
update grid id in migrated js
48d40a2
@sarjon
lowercase grid id in presenter
739d05c
@sarjon
build assets
47a4a6f
Merge pull request #10656 from sarjon/fix-grid-id-in-js
973a5b4 
Fix grid ids in migrated JS
@PierreRambaud
Move updateText function
8d988a0
@PierreRambaud
Fix unable to configure with recent SF routes
d71288d
@PierreRambaud
Build assets
b322a48
@PierreRambaud
Module button bottom alignment
3dcf556
@PierreRambaud
Build assets
d809081
@jolelievre
move position template in the appropriate folder
be3706a
@PierreRambaud
Address @matks comments
b6740bd
@PierreRambaud
Build assets
89a3459
@PierreRambaud
Isolate modules & tests
229e967
@PierreRambaud
Use static method instead public property
dfc3953
@PierreRambaud
Remove is_null to make @Quetzacoalt91 not angry
a6c00c8
@prestonBot prestonBot added develop Branch Improvement Type: Improvement Waiting for wording Status: action required, waiting for wording labels Sep 26, 2018
@Quetzacoalt91 Quetzacoalt91 merged commit 4b7bd7c into develop Sep 26, 2018
@PierreRambaud PierreRambaud removed the Waiting for wording Status: action required, waiting for wording label Sep 26, 2018
@PierreRambaud PierreRambaud added this to the 1.7.6.0 milestone Oct 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Quetzacoalt91 Quetzacoalt91 Quetzacoalt91 approved these changes

Assignees
No one assigned
Labels
develop Branch Improvement Type: Improvement
Projects
None yet
Milestone
1.7.6.0
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@PierreRambaud @Quetzacoalt91 @prestonBot @lozal2244 @MathiasReker @mickaelandrieu @eternoendless @sarjon @jolelievre @matks