Skip to content

Commit 73cd809

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-for-issue-8729
* upstream/main: (55 commits) Update guidelines-for-setting-up-a-local-workspace.md Add link to good first issues (and fix link) Refine guidelines (and fix .md file linking) Extend ArXiv fetcher results by using data from related DOIs (JabRef#9170) New Crowdin updates (JabRef#9366) Fix token New translations JabRef_en.properties (Chinese Simplified) (JabRef#9364) Fix date field change causes an uncaught exception (JabRef#9365) Add date format and respective test case (JabRef#9310) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (JabRef#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (JabRef#9356) Bump tika-core from 2.5.0 to 2.6.0 (JabRef#9358) Refine guideline "Set up a local workspace" (JabRef#9355) Adds missing "requires" statement (JabRef#9354) Bind "Find unlinked files" default directory to the current library (JabRef#9290) Rename "Remote" to "Tele" (JabRef#9270) Fixed display of file field adjusting for the dark theme (JabRef#9343) Update sorting of entries in maintable by special fields immediately (JabRef#9338) New translations JabRef_en.properties (German) (JabRef#9336) Fix Abbreviation for Escaped Ampersand (JabRef#9288) ... # Conflicts: # CHANGELOG.md # src/main/java/org/jabref/preferences/AppearancePreferences.java # src/main/java/org/jabref/preferences/JabRefPreferences.java # src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
2 parents af033c8 + a1f2d51 commit 73cd809

File tree

175 files changed

+3939
-1501
lines changed

Some content is hidden

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

175 files changed

+3939
-1501
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: GreetingFirstTimeCodeContribution
2+
3+
on:
4+
issues:
5+
types:
6+
- labeled
7+
8+
jobs:
9+
GreetingFirstTimeCodeContribution:
10+
if: ${{ github.event.label.name == 'FirstTimeCodeContribution' }}
11+
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
steps:
15+
- name: GreetingFirstTimeCodeContribution
16+
uses: peter-evans/create-or-update-comment@v2
17+
with:
18+
issue-number: ${{ github.event.issue.number }}
19+
body: |
20+
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.
21+
22+
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.

.github/workflows/automerge.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
env:
1717
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Auto approve
19-
uses: hmarr/auto-approve-action@v3.0.0
19+
uses: hmarr/auto-approve-action@v3.1.0
2020
if: steps.waitforstatuschecks.outputs.status == 'success'
2121
with:
2222
github-token: "${{ secrets.GITHUB_TOKEN }}"
2323
- name: Merge pull requests
24-
uses: pascalgn/[email protected].3
24+
uses: pascalgn/[email protected].5
2525
if: steps.waitforstatuschecks.outputs.status == 'success'
2626
env:
2727
MERGE_METHOD: "merge"

.github/workflows/deployment.yml

+21-9
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ concurrency:
3131
group: ${{ github.ref }}
3232
cancel-in-progress: true
3333

34-
3534
jobs:
3635
build:
3736
strategy:
@@ -51,45 +50,58 @@ jobs:
5150
runs-on: ${{ matrix.os }}
5251
name: Create installer and portable version for ${{ matrix.displayName }}
5352
steps:
53+
- name: Check secrets presence
54+
id: checksecrets
55+
shell: bash
56+
run: |
57+
if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
58+
echo ::set-output name=secretspresent::false
59+
else
60+
echo ::set-output name=secretspresent::true
61+
fi
62+
env:
63+
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
5464
- name: Fetch all history for all tags and branches
5565
uses: actions/checkout@v3
5666
with:
5767
fetch-depth: 0
5868
- name: Install GitVersion
59-
uses: gittools/actions/gitversion/[email protected].14
69+
uses: gittools/actions/gitversion/[email protected].15
6070
with:
6171
versionSpec: "5.x"
6272
- name: Run GitVersion
6373
id: gitversion
64-
uses: gittools/actions/gitversion/[email protected].14
74+
uses: gittools/actions/gitversion/[email protected].15
6575
- name: Set up JDK
6676
uses: actions/setup-java@v3
6777
with:
6878
java-version: 18
6979
distribution: 'temurin'
7080
cache: 'gradle'
7181
- name: Setup OSX key chain on OSX
72-
if: matrix.os == 'macos-latest'
82+
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
7383
uses: apple-actions/import-codesign-certs@v1
7484
with:
7585
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
7686
p12-password: ${{ secrets.OSX_CERT_PWD }}
7787
keychain-password: jabref
7888
- name: Setup OSX key chain on OSX for app id cert
79-
if: matrix.os == 'macos-latest'
89+
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
8090
uses: apple-actions/import-codesign-certs@v1
8191
with:
8292
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }}
8393
p12-password: ${{ secrets.OSX_CERT_PWD }}
8494
create-keychain: false
8595
keychain-password: jabref
8696
- name: Build runtime image
97+
if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent
8798
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
8899
- name: Build installer
100+
if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent
89101
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
90102
shell: bash
91103
- name: Resign app image for OSX and build dmg
92-
if: matrix.os == 'macos-latest'
104+
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
93105
shell: bash
94106
run: |
95107
codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
@@ -100,7 +112,7 @@ jobs:
100112
jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
101113
productsign --sign "Developer ID Installer: JabRef e.V. (6792V39SK3)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
102114
- name: Notarize dmg and pkg installer
103-
if: matrix.os == 'macos-latest' && startsWith(github.ref, 'refs/tags/')
115+
if: (matrix.os == 'macos-latest') && startsWith(github.ref, 'refs/tags/') && steps.checksecrets.outputs.secretspresent
104116
shell: bash
105117
run: |
106118
REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}')
@@ -157,12 +169,12 @@ jobs:
157169
- name: Fetch all history for all tags and branches
158170
run: git fetch --prune --unshallow
159171
- name: Install GitVersion
160-
uses: gittools/actions/gitversion/[email protected].14
172+
uses: gittools/actions/gitversion/[email protected].15
161173
with:
162174
versionSpec: '5.x'
163175
- name: Run GitVersion
164176
id: gitversion
165-
uses: gittools/actions/gitversion/[email protected].14
177+
uses: gittools/actions/gitversion/[email protected].15
166178
- name: Get linux binaries
167179
uses: actions/download-artifact@master
168180
with:

.github/workflows/pages.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Deploy Jekyll site to Pages
22

33
on:
4+
pull_request:
5+
paths:
6+
- 'docs/**'
7+
- '.github/workflows/pages.yml'
48
push:
59
paths:
610
- 'docs/**'
@@ -27,19 +31,21 @@ jobs:
2731
- name: Setup Ruby
2832
uses: ruby/setup-ruby@v1
2933
with:
30-
ruby-version: '3.0' # Not needed with a .ruby-version file
34+
ruby-version: '2.7' # Not needed with a .ruby-version file
3135
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
32-
cache-version: 0 # Increment this number if you need to re-download cached gems
36+
cache-version: 1 # Increment this number if you need to re-download cached gems
37+
working-directory: docs/
3338
- name: Setup Pages
3439
id: pages
3540
uses: actions/configure-pages@v2
3641
- name: Build with Jekyll
37-
uses: actions/jekyll-build-pages@v1
38-
with:
39-
source: docs/
40-
destination: ./_site
42+
run: |
43+
cd docs
44+
bundle exec jekyll build
4145
- name: Upload artifact
4246
uses: actions/upload-pages-artifact@v1
47+
with:
48+
path: docs/_site/
4349

4450
deploy:
4551
if: github.ref == 'refs/heads/main'

.github/workflows/tests-fetchers.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ on:
1111
- 'build.gradle'
1212
pull_request:
1313
paths:
14-
- 'src/main/java/org/jabref/logic/**'
15-
- 'src/test/java/org/jabref/logic/**'
16-
- 'src/main/java/org/jabref/model/**'
17-
- 'src/test/java/org/jabref/model/**'
14+
- 'src/main/java/org/jabref/logic/importer/fetcher/**'
15+
- 'src/test/java/org/jabref/logic/importer/fetcher/**'
1816
- '.github/workflows/tests-fetchers.yml'
1917
- 'build.gradle'
2018
schedule:

.idea/runConfigurations/JabRef_Main.xml

-14
This file was deleted.

CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2020
- An SLR can now be started from the SLR itself. [#9131](https://github.com/JabRef/jabref/pull/9131), [koppor#601](https://github.com/koppor/jabref/issues/601)
2121
- Implement a new ISBN Fetcher ([doi-to-bibtex-converter.herokuapp.com](http://doi-to-bibtex-converter.herokuapp.com) as source). [#9145](https://github.com/JabRef/jabref/pull/9145)
2222
- We added support for the Ukrainian and Arabic languages. [#9236](https://github.com/JabRef/jabref/pull/9236), [#9243](https://github.com/JabRef/jabref/pull/9243)
23+
- The default file directory of a library is used as default directory for [unlinked file lookup](https://docs.jabref.org/collect/findunlinkedfiles#link-the-pdfs-to-your-bib-library). [koppor#546](https://github.com/koppor/jabref/issues/546)
2324
- JabRef UI theme now changes depending on OS system preferences [#9263](https://github.com/JabRef/jabref/pull/9263)
2425

2526
### Changed
2627

28+
- We disabled the "change case" menu for empty fields [#9214](https://github.com/JabRef/jabref/issues/9214)
2729
- We disabled the conversion menu for empty fields [#9200](https://github.com/JabRef/jabref/issues/9200)
2830
- We upgraded to Lucene 9.4 for the fulltext search.
2931
Thus, the now created search index cannot be read from older versions of JabRef anylonger.
@@ -45,9 +47,19 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
4547
- We fixed an issue where a message about changed metadata would occur on saving although nothing changed. [#9159](https://github.com/JabRef/jabref/issues/9159)
4648
- When adding or editing a subgroup it is placed w.r.t. to alphabetical ordering rather than at the end. [koppor#577](https://github.com/koppor/jabref/issues/577)
4749
- We modified the Directory of Open Access Books (DOAB) fetcher so that it will now also fetch the ISBN when possible. [#8708](https://github.com/JabRef/jabref/issues/8708)
50+
- ArXiv fetcher now retrieves additional data from related DOIs (both ArXiv and user-assigned). [#9170](https://github.com/JabRef/jabref/pull/9170)
51+
- Groups context menu now shows appropriate options depending on number of subgroups. [koppor#579](https://github.com/koppor/jabref/issues/579)
52+
- We changed the color of found text from red to high-contrast colors (background: yellow; font color: purple). [koppor#552](https://github.com/koppor/jabref/issues/552)
53+
- We modified the "Delete file" dialog and add the full file path to the dialog text. The file path in the title was changed to file name only. [koppor#534](https://github.com/koppor/jabref/issues/534)
54+
- Download from URL now automatically fills with URL from clipboard. [koppor#535](https://github.com/koppor/jabref/issues/535)
55+
- We added HTML and Markdown files to Find Unlinked Files and removed BibTeX.[koppor#547](https://github.com/koppor/jabref/issues/547)
56+
- We changed the messages after importing unlinked local files to past tense. [koppor#548](https://github.com/koppor/jabref/issues/548)
57+
- We fixed an issue where the wrong icon for a successful import of a bib entry was shown [#9308](https://github.com/JabRef/jabref/pull/9308)
4858

4959
### Fixed
5060

61+
- We fixed the readability of the file field in the dark dark theme [#9340](https://github.com/JabRef/jabref/issues/9340)
62+
- We fixed that sorting of entries in the maintable by special fields is updated immediately [#9334](https://github.com/JabRef/jabref/issues/9334)
5163
- We fixed the Cleanup entries dialog is partially visible [#9223](https://github.com/JabRef/jabref/issues/9223)
5264
- We fixed the display of the "Customize Entry Types" dialogue title [#9198](https://github.com/JabRef/jabref/issues/9198)
5365
- We fixed an issue where author names with tilde accents (for example ñ) were marked as "Names are not in the standard BibTex format" [#8071](https://github.com/JabRef/jabref/issues/8071)
@@ -58,6 +70,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
5870
- We fixed a performance regression when opening large libraries [#9041](https://github.com/JabRef/jabref/issues/9041)
5971
- We fixed a bug where spaces are trimmed when highlighting differences in the Entries merge dialog. [koppor#371](https://github.com/koppor/jabref/issues/371)
6072
- We fixed some visual glitches with the linked files editor field in the entry editor and increased its height. [#8823](https://github.com/JabRef/jabref/issues/8823)
73+
- We fixed some visual inconsistencies (round corners of highlighted buttons). [#8806](https://github.com/JabRef/jabref/issues/8806)
6174
- We fixed several bugs regarding the manual and the autosave of library files that sometimes lead to exceptions or data loss. [#9067](https://github.com/JabRef/jabref/pull/9067), [#8448](https://github.com/JabRef/jabref/issues/8484), [#8746](https://github.com/JabRef/jabref/issues/8746), [#6684](https://github.com/JabRef/jabref/issues/6684), [#6644](https://github.com/JabRef/jabref/issues/6644), [#6102](https://github.com/JabRef/jabref/issues/6102), [#6002](https://github.com/JabRef/jabref/issues/6000)
6275
- We fixed an issue where applied save actions on saving the library file would lead to the dialog "The library has been modified by another program" popping up [#4877](https://github.com/JabRef/jabref/issues/4877)
6376
- We fixed issues with save actions not correctly loaded when opening the library. [#9122](https://github.com/JabRef/jabref/pull/9122)
@@ -71,6 +84,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
7184
- We fixed an issue where an exception was not logged correctly. [koppor#627](https://github.com/JabRef/koppor/issues/627)
7285
- We fixed an issue where hitting enter on the search field within the preferences dialog closed the dialog. [koppor#630](https://github.com/koppor/jabref/issues/630)
7386
- We fixed a typo within a connection error message. [koppor#625](https://github.com/koppor/jabref/issues/625)
87+
- We fixed an issue where the 'close dialog' key binding was not closing the Preferences dialog. [#8888](https://github.com/jabref/jabref/issues/8888)
88+
- We fixed an issue where editing entry's "date" field in library mode "biblatex" causes an uncaught exception. [#8747][https://github.com/JabRef/jabref/issues/8747]
89+
- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&). [#8948](https://github.com/JabRef/jabref/issues/8948)
90+
- We fixed an issue where font size preferences did not apply correctly to preference dialog window and the menu bar. [#8386](https://github.com/JabRef/jabref/issues/8386) and [#9279](https://github.com/JabRef/jabref/issues/9279)
91+
- We fixed an issue when using an unsafe character in the citation key, the auto-linking feature fails to link files. [#9267](https://github.com/JabRef/jabref/issues/9267)
7492

7593
### Removed
7694

0 commit comments

Comments
 (0)