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.6.x to develop - 10/05/2019 #13755

Merged
merged 91 commits into from May 10, 2019
Merged

Merge 1.7.6.x to develop - 10/05/2019 #13755

merged 91 commits into from May 10, 2019

Conversation

matks
Copy link
Contributor

@matks matks commented May 10, 2019 •
edited by eternoendless

Questions Answers
Branch? develop
Description? Daily 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

zuk3975 and others added 30 commits April 23, 2019 11:06
@zuk3975
Extends core and domain exceptions in Core and Core/Domain ns and add…
3e30f0d 
…s missing docblocks
@jolelievre
Add a test mail action in theme preview (for current theme only), ref…
f7c6abd 
…acto variables injection in preview using awesome hook listener
@jolelievre
Add a preview variables builder to debug efficiently the templates, a…
5fbc1a0 
…dd two transformations to clean specific contents for html and txt exports, fix modern and classic layouts to correctly integrate products
@jolelievre
Cs fixer and rename camelcase variables
a3e7d8d
@jolelievre
Fix init of class field
c9d34d8
@jolelievre
Add unit tests for new transformations
36f11a4
@jolelievre
Remove html-only and tx-only cleaning, use templateType in layouts in…
731f112 
…stead
@jolelievre
Fix alerts mail templates
d0c1b41
@jolelievre
A few classic templates html fixed, use twig conditions in classic or…
0f46b5f 
…der_conf
@jolelievre
Update classic templates to use twig conditions
1959a4a
@jolelievre
Fix test for renderer
ea7f781
@jolelievre
Fix templates with quotes, a few translation domains and use const in…
2dc9f1b 
… MailPreviewVariablesBuilder
@jolelievre
Update domain
34886c8
@boubkerbribri
Add function Goto URL
3e9d6fb
@boubkerbribri
Add selectors for Onboarding in navbar
b77ffd6
@boubkerbribri
Add close Onboarding in NavBar
245e706
@boubkerbribri
Update method for Goto list of employees
414fb42
@boubkerbribri
Delete function gotoURL with javascript method
42b58c2
@boubkerbribri
Click on Catalog before going to Employee Page
27e306b
add welcome modal fix for test 6
93ca8a7
add welcome modal fix for test 7
a4da23d
add welcome modal fix for test 9
d864c36
add welcome modal fix for step 10
63eed25
add welcome modal fix for step 11 and pause to check downloaded files
0c8d0d2
add welcome modal fix for step 11
1097d47
add welcome modal fix for test 13
5783940
@nesrineabdmouleh
Fix the success message when create and delete a currency
88e8510
add welcome modal fix for test 14
648d22e
add welcome modal fix for test 15
0784ba3
add welcome modal fix for test 16
610ebd0
boubkerbribri and others added 19 commits May 9, 2019 10:27
@boubkerbribri
Add close welcome Module for 7_discover_module
25a7460
@boubkerbribri
Can't do normal click on 'view my shop' because its under green message
815b51b
@boubkerbribri
Add dni to textToCheck (can't be removed 13691)
976ed0e
@Quetzacoalt91
Merge pull request PrestaShop#13680 from boubkerbribri/customer_welco…
e741883 
…meModule

Fix tests customer
@Quetzacoalt91
Merge pull request PrestaShop#13683 from boubkerbribri/10_module_welc…
73530c5 
…omeModule

Add close welcome module for tests 10_modules
@Quetzacoalt91
Merge pull request PrestaShop#13686 from boubkerbribri/international_…
db4f8e7 
…welcomeModule

Add close welcome module for tests 11_international
Update default translation catalogue for 1.7.6
86527dc
@PierreRambaud
Merge pull request PrestaShop#13734 from eternoendless/update-catalog
329dbd6 
Update translations catalogue for 1.7.6
Update native modules
d125207
@Quetzacoalt91
Merge pull request PrestaShop#13735 from eternoendless/update-native-…
c431db6 
…modules

Update native modules
@PierreRambaud
Merge pull request PrestaShop#13381 from matks/use-tinymce-in-sf-pages
21d6665 
Use tinymce in migrated pages
@boubkerbribri
Add function to set innerHTML of an iframe (for tinymce)
8878755
@boubkerbribri
Replace selectors of textarea by selectors of iFrame
d6a7ebc
@boubkerbribri
Change setting value method for textarea tinymce
f35cbb9
Escape errors messages and remove useless javascript
eeeae5a
@mbadrani
Merge pull request PrestaShop#13739 from boubkerbribri/fix_for_tinymce
d4e9daa 
Fix after merge of PR tinymce
@matks
Merge pull request PrestaShop#13522 from zuk3975/fix-extend-core-exce…
011df7a 
…ption

Fix core exceptions extending and add missing doc-blocks
@matks
Merge pull request PrestaShop#13738 from PierreRambaud/install-escape
f7e4546 
Escape strings in installation assistant plus remove unwanted javascript
@matks
Merge branch '1.7.6.x' of github.com:PrestaShop/PrestaShop into merge…
d03dd0d 
…176xtodevelop-14
@matks matks requested a review from a team as a code owner May 10, 2019 15:26
@prestonBot prestonBot added develop Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels May 10, 2019
@matks matks removed the Waiting for wording Status: action required, waiting for wording label May 10, 2019
@jolelievre jolelievre merged commit c5b9f72 into PrestaShop:develop May 10, 2019
@jolelievre
Copy link
Contributor

Thanks @matks

@eternoendless eternoendless added this to the 1.7.7.0 milestone May 13, 2019
@matks matks deleted the merge176xtodevelop-14 branch May 23, 2019 08:24
@prestonBot prestonBot added the Waiting for wording Status: action required, waiting for wording label Feb 17, 2020
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
Bug Type: Bug develop Branch Waiting for wording Status: action required, waiting for wording
Projects
None yet
Milestone
1.7.7.0
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@matks @jolelievre @Quetzacoalt91 @eternoendless @prestonBot @zuk3975 @boubkerbribri @nesrineabdmouleh @PierreRambaud @mbadrani