-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into extract-preview-panel
# Conflicts: # src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java # src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java # src/main/java/org/jabref/gui/entryeditor/CommentsTab.java # src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java # src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java # src/main/java/org/jabref/gui/entryeditor/EntryEditor.java # src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java # src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java # src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java # src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java # src/main/java/org/jabref/gui/entryeditor/PreviewTab.java # src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java # src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java # src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java # src/main/java/org/jabref/gui/externalfiles/ImportHandler.java # src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java # src/main/java/org/jabref/gui/maintable/MainTableTooltip.java # src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java # src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java # src/main/java/org/jabref/gui/preview/PreviewPanel.java # src/main/java/org/jabref/gui/preview/PreviewViewer.java # src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java # src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
- Loading branch information
Showing
973 changed files
with
19,158 additions
and
12,358 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 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 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,57 @@ | ||
| name: Assign Issue | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: 4 12 * * * | ||
| issue_comment: | ||
| types: [created] | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| assign: | ||
| if: github.repository_owner == 'JabRef' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| issues: write | ||
| steps: | ||
| - name: Assign the user or unassign stale assignments | ||
| id: assign | ||
| uses: takanome-dev/assign-issue-action@beta | ||
| with: | ||
| github_token: '${{ secrets.GITHUB_TOKEN }}' | ||
| days_until_unassign: 30 | ||
| maintainers: koppor, Siedlerchr, ThiloteE, calixtus, HoussemNasri | ||
| assigned_comment: | | ||
| 👋 Hey @{{ handle }}, thank you for your interest in this issue! 🎉 | ||
| We're excited to have you on board. Start by exploring our [Contributing](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) guidelines, and don't forget to check out our [workspace setup guidelines](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace) to get started smoothly. | ||
| In case you encounter failing tests during development, please check our [developer FAQs](https://devdocs.jabref.org/code-howtos/faq.html)! | ||
| Having any questions or issues? Feel free to ask here on GitHub. Need help setting up your local workspace? Join the conversation on [JabRef's Gitter chat](https://gitter.im/JabRef/jabref). And don't hesitate to open a (draft) pull request early on to show the direction it is heading towards. This way, you will receive valuable feedback. | ||
| Happy coding! 🚀 | ||
| ⏳ Please note, you will be automatically unassigned if the issue isn't closed within **{{ total_days }} days** (by **{{ unassigned_date }}**). A maintainer can also add the "**{{ pin_label }}**"" label to prevent automatic unassignment. | ||
| - name: Move Issue to "Assigned" Column in "Candidates for University Projects" | ||
| if: steps.assign.outputs.assigned == 'yes' | ||
| uses: m7kvqbe1/github-action-move-issues@feat/skip-if-not-in-project-flag | ||
| with: | ||
| github-token: ${{ secrets.GH_TOKEN_ACTION_MOVE_ISSUE }} | ||
| project-url: "https://github.com/orgs/JabRef/projects/3" | ||
| target-labels: "📍 Assigned" | ||
| target-column: "Assigned" | ||
| ignored-columns: "" | ||
| default-column: "Free to take" | ||
| skip-if-not-in-project: true | ||
| - name: Move Issue to "Assigned" Column in "Good First Issues" | ||
| if: steps.assign.outputs.assigned == 'yes' | ||
| uses: m7kvqbe1/github-action-move-issues@feat/skip-if-not-in-project-flag | ||
| with: | ||
| github-token: ${{ secrets.GH_TOKEN_ACTION_MOVE_ISSUE }} | ||
| project-url: "https://github.com/orgs/JabRef/projects/5" | ||
| target-labels: "📍 Assigned" | ||
| target-column: "Assigned" | ||
| ignored-columns: "" | ||
| default-column: "Free to take" | ||
| skip-if-not-in-project: true |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ concurrency: | |
|
|
||
| jobs: | ||
| build: | ||
| if: github.repository_owner == 'JabRef' | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
|
|
@@ -77,7 +78,7 @@ jobs: | |
| - name: Setup JDK | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 21.0.2 | ||
| java-version: 21.0.5 | ||
| distribution: 'temurin' | ||
| - name: Clean up keychain | ||
| run: | | ||
|
|
@@ -205,7 +206,7 @@ jobs: | |
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'ubuntu-latest') || ((matrix.os == 'macos-14') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true)))) }} | ||
| shell: bash | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload to GitHub workflow artifacts store (macOS) | ||
| if: (matrix.os == 'macos-14') && (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') || inputs.notarization == true) | ||
| uses: actions/upload-artifact@v4 | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -32,12 +32,13 @@ concurrency: | |
|
|
||
| jobs: | ||
| build: | ||
| if: github.repository_owner == 'JabRef' | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest, buildjet-8vcpu-ubuntu-2204-arm] | ||
| jdk: [22] | ||
| javafx: [23] | ||
| jdk: [21] | ||
| javafx: [24] | ||
| include: | ||
| - os: ubuntu-latest | ||
| displayName: linux | ||
|
|
@@ -266,7 +267,7 @@ jobs: | |
| shell: cmd | ||
| # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/jdk-ea && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/jdk-ea/ | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/jdk-ea && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/jdk-ea/ || true | ||
| - name: Upload to builds.jabref.org (linux, macOS) | ||
| if: (matrix.os != 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (github.ref == 'refs/heads/main') | ||
| shell: bash | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -90,7 +90,7 @@ jobs: | |
| - name: Setup JDK | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 21.0.2 | ||
| java-version: 21.0.5 | ||
| distribution: 'temurin' | ||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@v4 | ||
|
|
@@ -242,15 +242,15 @@ jobs: | |
| shell: cmd | ||
| # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload to builds.jabref.org (linux, macOS) | ||
| # macOS: Negated condition of "Upload to GitHub workflow artifacts store (macOS)" | ||
| # Reason: We either upload the non-notarized files - or notarize the files later (and upload these later) | ||
| # needs to be on one line; multi line does not work | ||
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'ubuntu-latest') || ((matrix.os == 'macos-13') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true)))) }} | ||
| shell: bash | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload to GitHub workflow artifacts store (macOS) | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') || inputs.notarization == true) | ||
| uses: actions/upload-artifact@v4 | ||
|
|
@@ -287,11 +287,11 @@ jobs: | |
| BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
| - name: Comment PR | ||
| if: (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| uses: thollander/actions-comment-pull-request@v2 | ||
| uses: thollander/actions-comment-pull-request@v3 | ||
| with: | ||
| message: | | ||
| The build of this PR is available at <https://builds.jabref.org/pull/${{ github.event.pull_request.number }}/merge>. | ||
| comment_tag: download-link | ||
| comment-tag: download-link | ||
| mode: recreate | ||
| notarize: # outsourced in a separate job to be able to rerun if this fails for timeouts | ||
| name: macOS notarization | ||
|
|
||
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.