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

Fix changelog and version parsing #8578

Merged
merged 5 commits into from
Mar 26, 2022
Merged

Fix changelog and version parsing #8578

merged 5 commits into from
Mar 26, 2022

Conversation

NYH-Dolphin
Copy link
Contributor

@NYH-Dolphin NYH-Dolphin commented Mar 17, 2022 •
edited by calixtus
Loading

Fixes #8563

  • Change in CHANGELOG.md described in a way that is understandable for the average user (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, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@Siedlerchr Siedlerchr changed the title Fix for issue 8563 Fix changelog and version parsing Mar 17, 2022
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Mar 17, 2022
Siedlerchr
Siedlerchr reviewed Mar 17, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
NYH-Dolphin and others added 2 commits March 18, 2022 10:23
@NYH-Dolphin @Siedlerchr
Update CHANGELOG.md
75a7319 
Co-authored-by: Christoph <siedlerkiller@gmail.com>
@Siedlerchr
Merge branch 'main' into fix-for-issue-8563
8307754
koppor
koppor approved these changes Mar 26, 2022
View reviewed changes
Copy link
Member

@koppor koppor left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me! - I just fixed typos and a test method name to mirror the contents of the test.

One test could be rewritten as @ParamterizedTest, but no need to do it now, we need to get this in.

src/test/java/org/jabref/logic/util/VersionTest.java Show resolved Hide resolved
@Siedlerchr Siedlerchr merged commit d774503 into JabRef:main Mar 26, 2022
Siedlerchr added a commit that referenced this pull request Mar 27, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into checkKeygenOverwrite
a7eb2f3 
* upstream/main: (104 commits)
  update test getPart (#8610)
  Add ControlHelper truncateString tests comments (#8612)
  Allow using custom SSL certificates (#8583)
  Fix protectedTerms not stored due to weaklistener (#8609)
  Fix changelog and version parsing (#8578)
  Creating more unit tests for NumericFieldComparatorTest (#8604)
  Fix merge entries dialog exceeding screen size (#8599)
  StringUtilTest new test for method GetPart (#8594)
  Use unkown entry type
  Add semantic scholar (#8575)
  Add research gate (#8580)
  fix import of unlinked files (#8444) (#8582)
  Missed l10n for fetcher fix (#8597)
  Fix some fetcher test (#8595)
  Bump slf4j-api from 2.0.0-alpha6 to 2.0.0-alpha7 in /buildSrc (#8589)
  Bump ikonli-materialdesign2-pack from 12.3.0 to 12.3.1 (#8591)
  Bump gittools/actions from 0.9.11 to 0.9.13 (#8587)
  Bump mockito-core from 4.3.1 to 4.4.0 (#8588)
  Bump flowless from 0.6.8 to 0.6.9 (#8590)
  Bump ikonli-javafx from 12.3.0 to 12.3.1 (#8592)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/EntryTypeViewModel.java
Siedlerchr added a commit that referenced this pull request Mar 30, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into lucenceUpgrade
81f08ef 
* upstream/main: (150 commits)
  fix unit test
  Add check for developer's documentation
  Merge GitBook view
  Fix zbMath fetcher (#8623)
  GitBook: [#56] No subject
  Add an extra dialog to ask the user whether they want to open the saved file folder when the export the entries (#8567)
  Bump checkstyle from 10.0 to 10.1 (#8620)
  Bump peter-evans/create-pull-request from 3 to 4 (#8619)
  Bump pascalgn/automerge-action from 0.14.3 to 0.15.2 (#8618)
  Bump flexmark from 0.62.2 to 0.64.0 (#8621)
  Bump classgraph from 4.8.141 to 4.8.143 (#8622)
  update test getPart (#8610)
  Add ControlHelper truncateString tests comments (#8612)
  Allow using custom SSL certificates (#8583)
  Fix protectedTerms not stored due to weaklistener (#8609)
  Fix changelog and version parsing (#8578)
  Creating more unit tests for NumericFieldComparatorTest (#8604)
  Fix merge entries dialog exceeding screen size (#8599)
  StringUtilTest new test for method GetPart (#8594)
  Use unkown entry type
  ...

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
@koppor koppor mentioned this pull request Apr 3, 2022
Closed
@NYH-Dolphin NYH-Dolphin deleted the fix-for-issue-8563 branch April 23, 2022 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@koppor koppor koppor approved these changes

@Siedlerchr Siedlerchr Siedlerchr approved these changes

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Changelog link leads to a 404
3 participants
@NYH-Dolphin @Siedlerchr @koppor