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.

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

Check pad deltas - Ready for Review / Merge @muxator #3717

Merged
merged 7 commits into from
Mar 27, 2020

Conversation

JohnMcLear
Copy link
Member

From ether#3717 (comment)

> Afaik I used async / await that's pretty much all, I think I had to do some
> polish because something was broken, remember stuff like pad.getPadAuthors was
> b0rked in 1.7 or so
@JohnMcLear
Copy link
Member Author

Mheh I didn't rebase but I'm pretty sure the showChat stuff is good to merge so all good to just use this.

@muxator
Copy link
Contributor

muxator commented Mar 22, 2020

So this PR just need to add bin/checkPadDeltas.js, right?

@muxator muxator force-pushed the checkPadDeltas branch 2 times, most recently from c9e81ca to 0d3e825 Compare March 22, 2020 02:04
@muxator
Copy link
Contributor

muxator commented Mar 22, 2020

So I went ahead and downloaded Marcel's original version from the url you mentioned, and then put yours on top.

This results in the following diff, which is difficult to understand: 0d3e825

Could you explain it? From the initial comment i thought it was similar or equal to the file you linked, but there are many differences.

Any pointers? Thanks

@JohnMcLear
Copy link
Member Author

Afaik I used async / await that's pretty much all, I think I had to do some polish because something was broken, remember stuff like pad.getPadAuthors was b0rked in 1.7 or so

@JohnMcLear JohnMcLear changed the title Check pad deltas Check pad deltas - Ready for Review / Merge @muxator Mar 23, 2020
muxator pushed a commit to JohnMcLear/etherpad-lite that referenced this pull request Mar 27, 2020
From ether#3717 (comment)

> Afaik I used async / await that's pretty much all, I think I had to do some
> polish because something was broken, remember stuff like pad.getPadAuthors was
> b0rked in 1.7 or so
muxator pushed a commit to JohnMcLear/etherpad-lite that referenced this pull request Mar 27, 2020
From ether#3717 (comment)

> Afaik I used async / await that's pretty much all, I think I had to do some
> polish because something was broken, remember stuff like pad.getPadAuthors was
> b0rked in 1.7 or so

Fixes ether#2107.
@muxator muxator force-pushed the checkPadDeltas branch 2 times, most recently from 564297b to d2aa265 Compare March 27, 2020 00:50
@muxator muxator merged commit 14ae2ee into ether:develop Mar 27, 2020
@muxator
Copy link
Contributor

muxator commented Mar 27, 2020

Pulled in, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants