added goToRevisionEvent hook, regexp support for pre and post values in ep.json - WONT MERGE #3408
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
getLineHTMLForExport - Fixes #2486 but breaks plugins
|
I would prefer to have PRs submitted as a linear series (== without merges and sync commits) on top of current develop. I understand this is a new requirement, still without an explicit guideline. The reason for which I am going to ask this is that bisecting a bug when the history is full of spurious commits becomes extremely slow, and impairs maintainability in the long run. |
|
As promised, here is some documentation for pull requests. Drop a line if not clear / need help. |
|
@muxator, thank you |
|
If we want to merge this PR, it should be rebased on current revision. |
JohnMcLear
changed the title
|
Note that the plugin work can't be merged due to conflicts with the async changes. I will try pick out what I can. |
|
Both of these contributions are now in separate PRs so this can be closed. |
muxator
pushed a commit
to JohnMcLear/etherpad-lite
that referenced
this pull request
Apr 23, 2020
This is comes from a section of PR ether#3408
muxator
pushed a commit
to JohnMcLear/etherpad-lite
that referenced
this pull request
Apr 23, 2020
This is comes from a section of PR ether#3408
muxator
pushed a commit
to JohnMcLear/etherpad-lite
that referenced
this pull request
Apr 25, 2020
This is comes from a section of PR ether#3408
muxator
pushed a commit
to JohnMcLear/etherpad-lite
that referenced
this pull request
Apr 25, 2020
The pre/post sections of ep.json configures the execution order of a plugin. After this change, a regex can be used. If there is a conflict, the stricter specification takes precedence. This change comes from a subsection of PR ether#3408
muxator
pushed a commit
to JohnMcLear/etherpad-lite
that referenced
this pull request
Apr 25, 2020
The pre/post sections of ep.json configures the execution order of a plugin. After this change, a regex can be used. If there is a conflict, the stricter specification takes precedence. This change comes from a subsection of PR ether#3408
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.
Added this hook to run custom functions in timeline view. For example currently ep_resize plugin does not work in that view and some of the content is displayed outside of the frame. That happens when during the editing process text has been longer than it is in the final version. Fixed htmlExport test: #3425