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

Disallow undo on "clear authorship colors" #3801

Merged
merged 15 commits into from
Apr 8, 2020
Merged

Disallow undo on "clear authorship colors" #3801

merged 15 commits into from
Apr 8, 2020

Commits on Mar 15, 2020

  1. Merge pull request #2 from ether/develop 

    sdf
    @JohnMcLear
    JohnMcLear authored Mar 15, 2020
    Configuration menu
    Copy the full SHA
    9ea5ad9 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge pull request #3 from ether/develop 

    update
    @JohnMcLear
    JohnMcLear authored Mar 17, 2020
    Configuration menu
    Copy the full SHA
    c696165 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Merge pull request #4 from ether/develop 

    Updating
    @JohnMcLear
    JohnMcLear authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    a59d48c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0cf1692 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    f5a47db View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    a2400ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    d1cb72e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge pull request #6 from ether/develop 

    update
    @JohnMcLear
    JohnMcLear authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    099d186 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    387d55c View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    550aff6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    c19ddd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    59d5c4a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    371be0a View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Merge branch 'develop' of github.com:ether/etherpad-lite into develop

    @JohnMcLear
    JohnMcLear committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    16daaa5 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. undomodule: disallow undoing "clear authorship colors" 

    Clearing the authorship colors of a document with at least two authors, and then
undoing that action caused a disconnect from the pad.
This change disallows undoing clearing authorship colors in order to prevent
the problem from affecting users, and adds the relative test coverage.

This is a change of behaviour, and is documented in the changelog.

Fixes ether#2802 (sidestepping it).
    @JohnMcLear
    JohnMcLear committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    b56de2d View commit details
    Browse the repository at this point in the history