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

Allow different HardBreaks settings for documents and comments #11515

Merged
merged 11 commits into from
May 24, 2020
Merged

Allow different HardBreaks settings for documents and comments #11515

merged 11 commits into from
May 24, 2020

Commits on May 19, 2020

  1. Allow different HardBreaks settings for documents and comments 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed May 19, 2020
    Configuration menu
    Copy the full SHA
    8680215 View commit details
    Browse the repository at this point in the history

  2. Update web_src/js/index.js 

    Co-authored-by: silverwind <[email protected]>
    @zeripath @silverwind
    zeripath and silverwind committed May 19, 2020
    Configuration menu
    Copy the full SHA
    9fc97f7 View commit details
    Browse the repository at this point in the history

  3. Thanks @silverwind 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed May 19, 2020
    Configuration menu
    Copy the full SHA
    ec1ff9a View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. fix tests 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed May 20, 2020
    Configuration menu
    Copy the full SHA
    a105bf1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into different-hard-brea… 

    …ks-settings
    @zeripath
    zeripath committed May 20, 2020
    Configuration menu
    Copy the full SHA
    9981549 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into different-hard-breaks-settings

    @lafriks
    lafriks committed May 20, 2020
    Configuration menu
    Copy the full SHA
    de6f612 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: guillep2k <[email protected]>
    @zeripath @guillep2k
    zeripath and guillep2k committed May 20, 2020
    Configuration menu
    Copy the full SHA
    0c75afe View commit details
    Browse the repository at this point in the history

  5. Update custom/conf/app.ini.sample

    @zeripath
    zeripath committed May 20, 2020
    Configuration menu
    Copy the full SHA
    367091c View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. Merge branch 'master' into different-hard-breaks-settings

    @zeripath
    zeripath committed May 23, 2020
    Configuration menu
    Copy the full SHA
    791673e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into different-hard-breaks-settings

    @guillep2k
    guillep2k committed May 23, 2020
    Configuration menu
    Copy the full SHA
    557c07e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Merge branch 'master' into different-hard-breaks-settings

    @zeripath
    zeripath committed May 24, 2020
    Configuration menu
    Copy the full SHA
    cfb62db View commit details
    Browse the repository at this point in the history