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

Show a warning in the merge dialog when authors are the same but formatted differently #9088

Merged
merged 12 commits into from
Sep 2, 2022
Merged

Show a warning in the merge dialog when authors are the same but formatted differently #9088

merged 12 commits into from
Sep 2, 2022

Commits on Aug 23, 2022

  1. Show a warning when the authors are the same but formatted differently

    @HoussemNasri
    HoussemNasri committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    10fec83 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @HoussemNasri
    HoussemNasri committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    25941f0 View commit details
    Browse the repository at this point in the history

  3. Link issue rather than pr in the changelog

    @HoussemNasri
    HoussemNasri committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    c6d989b View commit details
    Browse the repository at this point in the history

  4. Checkstyle

    @HoussemNasri
    HoussemNasri committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    7f20d6b View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Show the warning for all fields with person names

    @HoussemNasri
    HoussemNasri committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    6bd8e70 View commit details
    Browse the repository at this point in the history

  2. Modify warning message 

    Co-authored-by: ThiloteE <73715071+thilotee@users.noreply.github.com>
    @HoussemNasri @ThiloteE
    HoussemNasri and ThiloteE committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    2206d9a View commit details
    Browse the repository at this point in the history

  3. Use an info icon rather than a warning

    @HoussemNasri
    HoussemNasri committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    1e8b0cd View commit details
    Browse the repository at this point in the history

  4. Checkstyle

    @HoussemNasri
    HoussemNasri committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    2e99c00 View commit details
    Browse the repository at this point in the history

  5. Add a comment for why InfoButton command is empty

    @HoussemNasri
    HoussemNasri committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    0dcde20 View commit details
    Browse the repository at this point in the history

  6. Delete FieldRowController.java

    @HoussemNasri
    HoussemNasri committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    fc04366 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2022

  1. Hide diffs if persons names are the same

    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    991f925 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. i18n

    @HoussemNasri
    HoussemNasri committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    b34d83c View commit details
    Browse the repository at this point in the history