forked from JabRef/jabref
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into testMerger
* upstream/main: (109 commits) Fix right clicking a group and choosing "remove selected entries from this group" leads to error when Bibtex source tab is selected (JabRef#8821) Fix single identifier cannot be opened on click (JabRef#8838) Add Pubmed/Medline Query Transformer (JabRef#8818) adjust and add testcases for FileAnnotationViewModel (JabRef#8830) Append config instead of replacing (JabRef#8834) Fix eclipse config (JabRef#8835) Add Nemo file manager (JabRef#8831) Fix missing clear action on pressing esc within the "Filter groups" field (JabRef#8829) Update bouncycalse to new base version (JabRef#8827) add: add test cases for FileUtil (JabRef#8810) Restrict use of standard streams (JabRef#8816) updated 8802 (JabRef#8817) Bump pascalgn/automerge-action from 0.15.2 to 0.15.3 (JabRef#8803) Bump jackson-dataformat-yaml from 2.13.2 to 2.13.3 (JabRef#8804) Bump icu4j-charset from 70.1 to 71.1 (JabRef#8805) Fix notifications that overlap task bar (JabRef#8775) checkstye Default path for ssl key store is nested inside "JabRef" directory (JabRef#8796) Add log on disk (JabRef#8791) Fix for JabRef#8788 JabRef not showing contents of shared database library (JabRef#8793) ...
- Loading branch information
Showing
765 changed files
with
13,462 additions
and
6,769 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,19 +9,19 @@ jobs: | |
steps: | ||
- name: 'Wait for status checks' | ||
id: waitforstatuschecks | ||
uses: "WyriHaximus/github-action-wait-for-status@v1.4" | ||
uses: "WyriHaximus/github-action-wait-for-status@v1.6" | ||
with: | ||
ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check | ||
checkInterval: 13 | ||
env: | ||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
- name: Auto approve | ||
uses: hmarr/[email protected].0 | ||
uses: hmarr/[email protected].1 | ||
if: steps.waitforstatuschecks.outputs.status == 'success' | ||
with: | ||
github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
- name: Merge pull requests | ||
uses: pascalgn/[email protected].2 | ||
uses: pascalgn/[email protected].3 | ||
if: steps.waitforstatuschecks.outputs.status == 'success' | ||
env: | ||
MERGE_METHOD: "merge" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ env: | |
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }} | ||
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }} | ||
IEEEAPIKey: ${{ secrets.IEEEAPIKey }} | ||
BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey}} | ||
OSXCERT: ${{ secrets.OSX_SIGNING_CERT }} | ||
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false | ||
JAVA_OPTS: -Xmx4g | ||
|
@@ -62,9 +63,9 @@ jobs: | |
id: gitversion | ||
uses: gittools/actions/gitversion/[email protected] | ||
- name: Set up JDK | ||
uses: actions/setup-java@v2 | ||
uses: actions/setup-java@v3 | ||
with: | ||
java-version: 17 | ||
java-version: 18 | ||
distribution: 'temurin' | ||
cache: 'gradle' | ||
- name: Setup OSX key chain on OSX | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.