Release branch #2
Draft
Conversation
This file contains hidden or 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
…rser into backports-php5.6 � Conflicts: � src/BlockListener.php � src/Lexer.php � src/Line.php � src/listener/Blockquote.php � src/listener/Bold.php � src/listener/Color.php � src/listener/Heading.php � src/listener/Italic.php � src/listener/Link.php � src/listener/Lists.php � src/listener/Mention.php � src/listener/Strike.php � src/listener/Text.php � src/listener/Underline.php � src/listener/Video.php
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.
Do not merge into
master. To use in Respondens, commit torelease-editor.This is a continuous PR with adjustments we need from other PRs.
To bring up-to-date with upstream changes (order matters):
masterup-to-date withupstream/master(see first few steps of Backports php5.6 #1 for commands)Bring Fix rendering multiple types of the same listener in the same document #3 Fix rendering multiple types of the same listener in the same document #8 up-to-datenot needed anymoreBring Fix rendering lists with block level element in between #4 up-to-datemerged in upstreamBring Fixes issues with #30 Issue with multiple ul-li lists where ul-li lists #5 up-to-datemerged in upstreamBring Rendering inserts with unknown attributes #7 up-to-datenot needed anymoregit checkout release-editorgit merge backports-php5.6git merge allow-listener-class-reusagegit merge allow-listener-class-reusage-freshgit merge block-level-inside-listsgit merge fix_singleitemlist_issuegit merge rendering_inserts_with_unknown_attributesgit push