Skip to content

Commit 5fd4d85

Browse files
authored
Merge branch 'main' into rewrite-journal-abbrevation-repository-12571
2 parents 4d7c96a + 3b4f715 commit 5fd4d85

File tree

51 files changed

+1471
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1471
-301
lines changed

.github/workflows/link-issue.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,36 @@ jobs:
113113
114114
echo "Updating issue '${{ needs.determine_issue_number.outputs.issue_number }}'"
115115
116-
# Check if good first/second/.. issue
117-
# If yes, copy label to GitHub PR for transparency
116+
117+
# Copy over labels from issue to PR if they match good first/second/third/forth issue or component:* labels
118+
118119
LABELS=$(gh api repos/${{ github.repository }}/issues/${{ needs.determine_issue_number.outputs.issue_number }}/labels --jq '.[].name')
120+
121+
# Check for good first/second/.. issue label
119122
LABEL=$(echo "$LABELS" | grep -E '^good (first|second|third|forth) issue$' || true)
120-
if [ -n "$LABEL" ]; then
121-
echo "✅ Found label: $LABEL"
123+
124+
# Check for component:* labels (can be multiple)
125+
COMPONENT_LABELS=$(echo "$LABELS" | grep -E '^component:' || true)
126+
127+
if [ -n "$LABEL" ] || [ -n "$COMPONENT_LABELS" ]; then
122128
SILENT=false
123-
# Apply label
124-
gh issue edit "${{ github.event.pull_request.number }}" --add-label "$LABEL"
129+
if [ -n "$LABEL" ]; then
130+
echo "✅ Found label: $LABEL"
131+
gh pr edit "${{ github.event.pull_request.number }}" --add-label "$LABEL"
132+
fi
133+
if [ -n "$COMPONENT_LABELS" ]; then
134+
echo "✅ Found component labels:"
135+
while IFS= read -r COMPONENT_LABEL; do
136+
echo " - $COMPONENT_LABEL"
137+
gh pr edit "${{ github.event.pull_request.number }}" --add-label "$COMPONENT_LABEL"
138+
done <<< "$COMPONENT_LABELS"
139+
fi
125140
else
126141
echo "🚫 Silent fail if not possible to add assignee"
127142
SILENT=true
128143
fi
129144
145+
130146
# "gh issue edit" cannot be used - workaround found at https://github.com/cli/cli/issues/9620#issuecomment-2703135049
131147
132148
ASSIGNEES=$(gh api /repos/JabRef/jabref/issues/${{ needs.determine_issue_number.outputs.issue_number }} --jq '[.assignees[].login]')

.github/workflows/tests-code.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757

5858
dependencyscopes:
5959
name: Dependency Scopes
60+
# too slow on ubuntu-slim
6061
runs-on: ubuntu-latest
6162
steps:
6263
- name: Checkout source
@@ -70,7 +71,8 @@ jobs:
7071

7172
openrewrite:
7273
name: OpenRewrite
73-
runs-on: ubuntu-slim
74+
# too slow on ubuntu-slim
75+
runs-on: ubuntu-latest
7476
steps:
7577
- name: Checkout source
7678
uses: actions/checkout@v6
@@ -314,7 +316,8 @@ jobs:
314316
files: |
315317
jablib/src/main/java/org/jabref/logic/citationstyle/CSLStyleUtils.java
316318
jablib/src/test/java/org/jabref/logic/citationstyle/CSLStyleUtilsTest.java
317-
319+
jablib/src/main/java/org/jabref/logic/exporter/AcademicPagesExporter.java
320+
jablib/src/test/java/org/jabref/logic/exporter/AcademicPagesExporterTest.java
318321
- uses: ./.github/actions/setup-gradle
319322
if: steps.changed-windows-related-files.outputs.any_changed == 'true'
320323
- name: Run jablib tests

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
99

1010
## [Unreleased]
1111

12-
- We added `--key-patterns` option to CLI parameters to allows users to set a citation key's pattern for a specific entry type. [#14707](https://github.com/JabRef/jabref/issues/14707)
13-
1412
### Added
1513

14+
- We added `--key-patterns` option to CLI parameters to allows users to set a citation key's pattern for a specific entry type. [#14707](https://github.com/JabRef/jabref/issues/14707)
15+
- We added a CLI option `--field-formatters` to the `convert` and `generate-bib-from-aux` commands to apply field formatters during export. [#11520](https://github.com/JabRef/jabref/issues/11520)
16+
- We added a preference to skip the import dialog for entries received from browser extensions, allowing direct import into the current library. The import dialog is shown by default; users can enable direct import in Preferences.
1617
- We added support for dragging entries from the "Citation relations" tab to other libraries. [#15135](https://github.com/JabRef/jabref/issues/15135)
1718
- We added a fetcher selection dropdown to the citation count field in the General tab, allowing users to choose between Semantic Scholar, OpenAlex, OpenCitations, and scite.ai as the source. The selected fetcher is now persisted across restarts and can also be configured in the Entry Editor preferences. [#15134](https://github.com/JabRef/jabref/issues/15134)
1819
- We added support for citation properties in the CAYW endpoint. [#13821](https://github.com/JabRef/jabref/issues/13821)
20+
- We added an export format for [`academicpages`](https://academicpages.github.io/) format. [#12727](https://github.com/JabRef/jabref/issues/12727)
1921
- We added "All" option to the citation fetcher combo box, which queries all providers (CrossRef, OpenAlex, OpenCitations, SemanticScholar) and merges the results into a single deduplicated list.
2022
- We added a quick setting toggle to enable cover images download. [#15322](https://github.com/JabRef/jabref/pull/15322)
2123

@@ -30,10 +32,12 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
3032
⚠️ JabRef will recreate the index in a new folder for new files and this will take a long time for a huge library.
3133
Moreover, switching back and forth JabRef versions and meanwhile adding PDFs also requires rebuilding the index now and then.
3234
[#15220](https://github.com/JabRef/jabref/pull/15220)
35+
- We enabled drag and drop of Windows shortcut (`.lnk`) files to open libraries. [#15036](https://github.com/JabRef/jabref/issues/15036)
3336
- We refined the "Select files to import" page in "Search for unlinked local files" dialog to give the users the choice of linking the file to a related entry or import it to a new entry. [#13689](https://github.com/JabRef/jabref/issues/13689)
3437

3538
### Fixed
3639

40+
- We fixed PDF import to prefer the content extracted title over filename like XMP metadata titles. [#11999](https://github.com/JabRef/jabref/issues/11999)
3741
- We fixed RIS export writing the full page range into both start page and end page fields instead of splitting them correctly. [#15106](https://github.com/JabRef/jabref/issues/15106)
3842
- We fixed an issue where shortcut keys did not work for linked files in the entry editor. [#12564](https://github.com/JabRef/jabref/issues/12564)
3943
- We fixed the issue where incomplete search produced noisy error logs when entering input in the search bar. [#14632](https://github.com/JabRef/jabref/issues/14632)

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
1212
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:3.6.1")
1313
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.12.0")
14-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.3.2")
14+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.0")
1515
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.7.0")
1616
implementation("org.gradlex:extra-java-module-info:1.14")
1717
implementation("org.gradlex:java-module-dependencies:1.12.1")

build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jvmDependencyConflicts {
2222
conflictResolution {
2323
select("org.gradlex:jna", "net.java.dev.jna:jna-jpms")
2424
select("org.gradlex:jna-platform", "net.java.dev.jna:jna-platform-jpms")
25+
select("org.jabref:mslinks", "com.github.vatbub:mslinks")
2526
}
2627
}
2728

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
// This is the behavior when applied in the root project (https://docs.openrewrite.org/reference/gradle-plugin-configuration#multi-module-gradle-projects)
1111

1212
dependencies {
13-
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.26.0"))
13+
rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.26.1"))
1414
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
1515
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
1616
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")

gradle.properties

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Activate this if you work on the build itself
2+
# org.gradle.logging.level=info
3+
14
org.gradle.vfs.watch=true
25

36
# -Xmx6g
@@ -10,18 +13,17 @@ org.gradle.jvmargs=-Xmx6g -Dorg.kordamp.banner=false
1013

1114
# hint by https://docs.gradle.org/current/userguide/performance.html#enable_configuration_cache
1215
org.gradle.configuration-cache=true
16+
1317
org.gradle.configuration-cache.parallel=true
1418

1519
# hint by https://docs.gradle.org/current/userguide/performance.html#enable_the_build_cache
1620
org.gradle.caching=true
1721

18-
# Activate this if you work on the build itself
19-
# org.gradle.logging.level=info
20-
21-
org.gradle.configureondemand=true
22-
2322
# hint by https://docs.gradle.org/current/userguide/performance.html#sec:enable_parallel_execution
2423
org.gradle.parallel=true
2524

25+
# Causes issues when .kts files change
26+
org.gradle.configureondemand=false
27+
2628
# Tweak Java Toolchains
2729
org.gradle.java.installations.auto-download=true

gradle/modules.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ info.picocli.codegen=info.picocli:picocli-codegen
88
io.github.darvil.terminal.textformatter=io.github.darvil82:terminal-text-formatter
99
io.github.eadr=io.github.adr:e-adr
1010
jul.to.slf4j=org.slf4j:jul-to-slf4j
11-
mslinks=com.github.vatbub:mslinks
11+
mslinks=org.jabref:mslinks
1212
org.apache.logging.log4j.to.slf4j=org.apache.logging.log4j:log4j-to-slf4j
1313
org.glassfish.jersey.container.grizzly2.http=org.glassfish.jersey.containers:jersey-container-grizzly2-http
1414
org.glassfish.jersey.core.common=org.glassfish.jersey.core:jersey-common

jabgui/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static FieldEditorFX getForField(final Field field,
8383
} else if (field == StandardField.OWNER) {
8484
return new OwnerEditor(field, suggestionProvider, fieldCheckers, undoAction, redoAction);
8585
} else if (field == StandardField.GROUPS) {
86-
return new GroupEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager, undoAction, redoAction);
86+
return new GroupsEditor(field, suggestionProvider, fieldCheckers);
8787
} else if (field == StandardField.FILE) {
8888
return new LinkedFilesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
8989
} else if (fieldProperties.contains(FieldProperty.YES_NO)) {
@@ -110,7 +110,7 @@ public static FieldEditorFX getForField(final Field field,
110110
} else if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
111111
return new PersonsEditor(field, suggestionProvider, fieldCheckers, isMultiLine, undoManager, undoAction, redoAction);
112112
} else if (StandardField.KEYWORDS == field) {
113-
return new KeywordsEditor(field, suggestionProvider, fieldCheckers);
113+
return new KeywordsEditor(field, suggestionProvider, fieldCheckers, preferences);
114114
} else if (field == InternalField.KEY_FIELD) {
115115
return new CitationKeyEditor(field, suggestionProvider, fieldCheckers, databaseContext, undoAction, redoAction);
116116
} else if (fieldProperties.contains(FieldProperty.MARKDOWN)) {

jabgui/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)