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 fix-issue-10124
* upstream/main: (419 commits) Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (JabRef#10607) Fix issue JabRef#9306: Move "Open only one instance of JabRef" preference option to somewhere else (JabRef#10602) Update README.md (JabRef#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 Synchronize scrollbars in the change resolver dialog (JabRef#10587) Add button for a user to reset the cite command to the default value. (JabRef#10580) openrerwrite Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Replace "fixes" by "resolves" Change JavaDoc to annotation (JabRef#10571) Fix link (JabRef#10575) Enable collecting GitHub build artifacts for forks (JabRef#10574) Fix file field merging (JabRef#10573) ... # Conflicts: # src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java # src/main/java/org/jabref/logic/importer/WebFetchers.java
- Loading branch information
Showing
11,217 changed files
with
13,739 additions
and
1,026,259 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| //DEPS com.github.nbbrd.heylogs:heylogs-cli:0.7.1 | ||
| public class heylogs { | ||
| public static void main(String... args) throws Exception { | ||
| nbbrd.heylogs.cli.HeylogsCommand.main(args); | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| name: Add greeting to issues for first time contributors | ||
|
|
||
| on: | ||
| issues: | ||
| types: | ||
| - labeled | ||
|
|
||
| jobs: | ||
| GreetingFirstTimeCodeContribution: | ||
| if: ${{ github.event.label.name == 'FirstTimeCodeContribution' }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| issues: write | ||
| steps: | ||
| - name: GreetingFirstTimeCodeContribution | ||
| uses: peter-evans/create-or-update-comment@v3 | ||
| with: | ||
| issue-number: ${{ github.event.issue.number }} | ||
| body: | | ||
| As a general advice for newcomers: check out [Contributing](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) for a start. Also, [guidelines for setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace) is worth having a look at. | ||
| Feel free to ask here at GitHub, if you have any issue related questions. If you have questions about how to setup your workspace use JabRef's [Gitter](https://gitter.im/JabRef/jabref) chat. Try to open a (draft) pull-request early on, so that people can see you are working on the issue and so that they can see the direction the pull request is heading towards. This way, you will likely receive valuable feedback. |
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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: Add to Project on Label | ||
|
|
||
| on: | ||
| issues: | ||
| types: [labeled] | ||
|
|
||
| permissions: | ||
| issues: write | ||
|
|
||
| jobs: | ||
| add-to-project: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: "good first issue" | ||
| if: "${{ github.event.label.name == 'good first issue' }}" | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| run: | | ||
| ISSUE_URL=$(jq --raw-output .issue.html_url "$GITHUB_EVENT_PATH") | ||
| gh project item-add 5 --owner jabref --url $ISSUE_URL | ||
| - name: needs-refinement | ||
| if: github.event.label.name == 'needs-refinement' | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| run: | | ||
| ISSUE_URL=$(jq --raw-output .issue.html_url "$GITHUB_EVENT_PATH") | ||
| gh project item-add 15 --owner jabref --url $ISSUE_URL | ||
| - name: "status: freeze" | ||
| if: "${{ github.event.label.name == 'status: freeze' }}" | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| run: | | ||
| ISSUE_URL=$(jq --raw-output .issue.html_url "$GITHUB_EVENT_PATH") | ||
| gh project item-add 9 --owner jabref --url $ISSUE_URL | ||
| - name: ui | ||
| if: "${{ github.event.label.name == 'ui' }}" | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| run: | | ||
| ISSUE_URL=$(jq --raw-output .issue.html_url "$GITHUB_EVENT_PATH") | ||
| gh project item-add 8 --owner jabref --url $ISSUE_URL |
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 |
|---|---|---|
| @@ -1,34 +1,33 @@ | ||
| name: Automerge Pull Requests | ||
| on: | ||
| pull_request: | ||
| types: | ||
| - opened | ||
| - synchronize | ||
| - reopened | ||
| - labeled | ||
| name: Auto Merge | ||
| on: [pull_request_target, workflow_dispatch] | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| automerge: | ||
| name: Automerge Dependency Updates | ||
| runs-on: ubuntu-latest | ||
| if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || contains(github.event.pull_request.labels.*.name, 'dependencies') | ||
| # Run only if PR is inside JabRef's main repository and created by dependabot or by an update workflow | ||
| if: > | ||
| (github.repository == 'JabRef/jabref') && | ||
| (github.event.pull_request.head.repo.full_name == 'JabRef/jabref') && | ||
| ( | ||
| (github.actor == 'dependabot[bot]') || | ||
| ( | ||
| startsWith(github.event.pull_request.title, '[Bot] ') || | ||
| startsWith(github.event.pull_request.title, 'Bump ') || | ||
| startsWith(github.event.pull_request.title, 'New Crowdin updates') | ||
| ) | ||
| ) | ||
| steps: | ||
| - name: 'Wait for status checks' | ||
| id: waitforstatuschecks | ||
| uses: "WyriHaximus/[email protected]" | ||
| with: | ||
| ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check | ||
| checkInterval: 13 | ||
| - name: Approve PR | ||
| run: gh pr review --approve "$PR_URL" | ||
| env: | ||
| GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| - name: Auto approve | ||
| uses: hmarr/[email protected] | ||
| if: steps.waitforstatuschecks.outputs.status == 'success' | ||
| with: | ||
| github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
| - name: Merge pull requests | ||
| uses: pascalgn/[email protected] | ||
| if: steps.waitforstatuschecks.outputs.status == 'success' | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}} | ||
| - name: Merge PR | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| env: | ||
| MERGE_METHOD: "merge" | ||
| MERGE_LABELS: "" | ||
| GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER}} |
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
Oops, something went wrong.