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

Merge identical group color indicators #6768

Merged
merged 10 commits into from
Aug 19, 2020
Merged

Merge identical group color indicators #6768

merged 10 commits into from
Aug 19, 2020

Conversation

calixtus
Copy link
Member

fixes #6175

This PR finishes the PRs of @WangAooa (see #6566 ) and does some cleanup in the MainTableColumnFactory: LinkedIdentifierColumn, FileColumn and SpecialFieldColumn is now extracted in separate classes.

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

@calixtus calixtus added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 18, 2020
@github-actions
Copy link
Contributor

The JabRef maintainers will add the following name to the AUTHORS file. In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits.

WangAooa

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@github-actions
Copy link
Contributor

The JabRef maintainers will add the following name to the AUTHORS file. In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits.

Marcel Luethi
WangAooa

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checkstyle fails. If this is fixed, this can be merged.

@github-actions
Copy link
Contributor

The JabRef maintainers will add the following name to the AUTHORS file. In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits.

Marcel Luethi
Qing
ShiqingLiu
WangAooa

@calixtus
Copy link
Member Author

Checkstyle is happy again, so I am merging.

@calixtus calixtus merged commit bd03fd0 into master Aug 19, 2020
@calixtus calixtus deleted the fix-6175 branch August 19, 2020 16:57
Siedlerchr added a commit that referenced this pull request Aug 19, 2020
* upstream/master:
  Merge identical group color indicators (#6768)
  Squashed 'src/main/resources/csl-styles/' changes from c8c6c6d..0895562
  Add restart warning for autocompletion in preferences (#6769)
  Fix markdown
  Update description of intelliJ checkstyle configuration (#6766)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Group color, only display identical colors once
4 participants