Merged branch 1.5 into master (EZP-31356, EZP-31395, EZP-31299, EZP-31066) #1269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alongosz
requested review from
adamwojs,
mikadamczyk,
GrabowskiM,
Nattfarinn,
webhdx,
dew326,
ViniTou,
barw4,
lucasOsti,
konradoboza,
michal-myszka and
mateuszdebinski
dew326
requested changes
Mar 6, 2020
src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-dropdown.js
Outdated
Show resolved
Hide resolved
src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-styleslist.js
Outdated
Show resolved
Hide resolved
src/bundle/Resources/views/themes/admin/ui/search/list.html.twig
Outdated
Show resolved
Hide resolved
alongosz
force-pushed
the
merge-up-to-master-ezp-31356-31395-31299-31066
branch
from
6ef03e5 to
dae1c42
Compare
webhdx
approved these changes
Mar 6, 2020
konradoboza
approved these changes
Mar 6, 2020
barw4
approved these changes
Mar 6, 2020
alongosz
force-pushed
the
merge-up-to-master-ezp-31356-31395-31299-31066
branch
from
c8082dc to
2c2f876
Compare
michal-myszka
approved these changes
Mar 9, 2020
alongosz
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a merge up of 1.5 into master for the PRs: #1256, #1248, #1223, #1267 including conflict resolution with #1265
Doc
eZ Design admin theme template (view, depending on doc convention)
@ezdesign/ui/search/list.html.twighas been removed. Use@ezdesign/ui/search/index.html.twiginstead.(plus if you need to mention anything from the above tickets separately for 3.0).