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

Merging from master #5

Merged
merged 18 commits into from
Aug 20, 2019
Merged

Merging from master #5

merged 18 commits into from
Aug 20, 2019

Conversation

CyraxSector
Copy link
Owner


  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

Siedlerchr and others added 18 commits August 9, 2019 14:25
* fix wrong package

* fix error by moving class
Bumps com.gradle.build-scan from 2.3 to 2.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps com.github.ben-manes.versions from 0.21.0 to 0.22.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [wiremock](https://github.com/tomakehurst/wiremock) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](wiremock/wiremock@2.24.0...2.24.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps log4j-core from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps log4j-jul from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps log4j-api from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Fix substring exception in find unlinked files


Refactor to own method and add test
The exeption came when the parsed editor string did not end with a colon and two spaces

* remove static modifier

* pass line separator as parameter

* fix merge errors
add unify line breaks
Bumps log4j-jcl from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps log4j-slf4j18-impl from 2.12.0 to 2.12.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…ator (#5184)

because natural order will require same types of the enum

Followup from  #5148
* Fix tooltips in CitationsDisplay

* Rename withTooltip(Callback<T, String>) to withStringTooltip() in ViewModelListCellFactory

* Add withTooltip(Callback<T, Tooltip>) to ViewModelListCellFactory

* Update CitationsDisplay for using ViewModelListCellFactory
* Fix issue 5152, tooltip and icon added to group cell

* -fixed minor issue with style (empty line) in MainTableColumnFactory                                                                         -added key "Group color" into english language properties
* Initial

* Removed Border behind transparent groupRectangle, rewording
* Differentiate Causes of Errors

* Refactor Failure Mode

* Remove unnecessary return

* Remove redundant lines
… to mvvm (#5141)

* Converting to mvvm, combining advanced and network

* Refactor minor things and cosmetic changes

* Convert GroupsTab to mvvm

* Fixed l10n

* Refactor, reword, abstract and added resetWarning

* Reword

* Refactored for better readability

* Rewording for consistency, trigger travis

* Fixed minor bug

* Refixed minor bug
@CyraxSector CyraxSector merged commit a369e3e into CyraxSector:bugfix/5045 Aug 20, 2019
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.

6 participants