Skip to content

Commit 91c1afb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into tinylog
* upstream/main: (259 commits) Fix exception on preview style edit and selection (#8293) Fix icon picker excpetion in groups dialog (#8290) Add doc tests (#8242) fix merge conflict Squashed 'buildres/csl/csl-locales/' changes from 0cc3885f61..d5ee85de8e Squashed 'buildres/csl/csl-styles/' changes from 3a6a0a7..3bb4b5f Consider directory pattern when checking if a file can be moved (#8244) Bump byte-buddy-parent from 1.12.1 to 1.12.2 (#8285) Bump unirest-java from 3.13.3 to 3.13.4 (#8283) Bump checkstyle from 9.1 to 9.2 (#8284) Bump classgraph from 4.8.135 to 4.8.137 (#8282) Do not resize main table columns in search dialog window (#8253) Fix NegativeArraySizeException (#8270) Update deployment.yml TEst Grand unified library properties (GRULPS) (#8264) Fixes RFC fetcher test case (#8271) Update Gradle Wrapper from 7.2 to 7.3 (#8246) Observable Preferences H (WorkingDir, getUser, NameFormatter, Version, SpecialFields) (#8260) Bump checkstyle from 9.0.1 to 9.1 (#8266) ...
2 parents 4dac2a2 + f7df275 commit 91c1afb

File tree

478 files changed

+24446
-6323
lines changed

Some content is hidden

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

478 files changed

+24446
-6323
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body:
2727
options:
2828
- Windows
2929
- GNU / Linux
30-
- mac OS
30+
- macOS
3131
- Other (please describe below)
3232
validations:
3333
required: true
@@ -36,7 +36,7 @@ body:
3636
attributes:
3737
label: Details on version and operating system
3838
description: OS Version, distribution, desktop environment, older JabRef version etc.
39-
placeholder: Ubuntu 21.04 with Plasma 5.22 / Windows 10 21H1 / Mac OS 10.14
39+
placeholder: Ubuntu 21.04 with Plasma 5.22 / Windows 10 21H1 / macOS 10.14
4040
validations:
4141
required: false
4242

@@ -70,10 +70,13 @@ body:
7070
value: |
7171
...
7272
<details>
73+
7374
<summary>Log File</summary>
75+
7476
```
7577
Paste an excerpt of your log file here
7678
```
79+
7780
</details>
7881
validations:
7982
required: false

.github/workflows/check-links.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
schedule:
88
# Run on the first of each month at 9:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
99
- cron: "0 9 1 * *"
10+
workflow_dispatch:
1011

1112
jobs:
1213
markdown-link-check:

.github/workflows/deployment.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ env:
2626
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
2727
JAVA_OPTS: -Xmx4g
2828

29+
concurrency:
30+
group: ${{ github.ref }}
31+
cancel-in-progress: true
32+
33+
2934
jobs:
3035
build:
3136
strategy:
@@ -45,21 +50,17 @@ jobs:
4550
runs-on: ${{ matrix.os }}
4651
name: Create installer and portable version for ${{ matrix.displayName }}
4752
steps:
48-
- name: Cancel Previous Runs
49-
uses: styfle/[email protected]
50-
with:
51-
access_token: ${{ github.token }}
5253
- name: Fetch all history for all tags and branches
5354
uses: actions/checkout@v2
5455
with:
5556
fetch-depth: 0
5657
- name: Install GitVersion
57-
uses: gittools/actions/gitversion/[email protected].10
58+
uses: gittools/actions/gitversion/[email protected].11
5859
with:
5960
versionSpec: "5.x"
6061
- name: Run GitVersion
6162
id: gitversion
62-
uses: gittools/actions/gitversion/[email protected].10
63+
uses: gittools/actions/gitversion/[email protected].11
6364
- name: Set up JDK
6465
uses: actions/setup-java@v2
6566
with:
@@ -155,12 +156,12 @@ jobs:
155156
- name: Fetch all history for all tags and branches
156157
run: git fetch --prune --unshallow
157158
- name: Install GitVersion
158-
uses: gittools/actions/gitversion/[email protected].10
159+
uses: gittools/actions/gitversion/[email protected].11
159160
with:
160161
versionSpec: '5.x'
161162
- name: Run GitVersion
162163
id: gitversion
163-
uses: gittools/actions/gitversion/[email protected].10
164+
uses: gittools/actions/gitversion/[email protected].11
164165
- name: Get linux binaries
165166
uses: actions/download-artifact@master
166167
with:

.github/workflows/gource.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- gource
77
schedule:
88
- cron: '15 3 1 1,4,7,10 *'
9+
workflow_dispatch:
910

1011
jobs:
1112
action:

.github/workflows/snap.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
# run on each day
1010
- cron: "33 4 * * *"
1111

12+
concurrency:
13+
group: snap-${{ github.head_ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
build:
1418
runs-on: ubuntu-latest

.github/workflows/tests-fetchers.yml

+5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ on:
2020
schedule:
2121
# run on each Wednesday
2222
- cron: '2 3 * * 3'
23+
workflow_dispatch:
2324

2425
env:
2526
SpringerNatureAPIKey: ${{ secrets.SPRINGERNATUREAPIKEY_FOR_TESTS }}
2627
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
2728
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
2829

30+
concurrency:
31+
group: fetcher-tests-${{ github.head_ref }}
32+
cancel-in-progress: true
33+
2934
jobs:
3035
fetchertests:
3136
name: Fetcher tests

.github/workflows/tests.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ name: Tests
33
on:
44
push:
55
branches:
6-
- master
6+
- main
7+
- main-release
78
pull_request:
89
# always run on pull requests
10+
workflow_dispatch:
911

1012
env:
1113
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -14,15 +16,15 @@ env:
1416
GRADLE_OPTS: -Xmx4g
1517
JAVA_OPTS: -Xmx4g
1618

19+
concurrency:
20+
group: tests-${{ github.head_ref }}
21+
cancel-in-progress: true
22+
1723
jobs:
1824
checkstyle:
1925
name: Checkstyle
2026
runs-on: ubuntu-latest
2127
steps:
22-
- name: Cancel Previous Runs
23-
uses: styfle/[email protected]
24-
with:
25-
access_token: ${{ github.token }}
2628
- name: Checkout source
2729
uses: actions/checkout@v2
2830
- name: Set up JDK
@@ -41,7 +43,7 @@ jobs:
4143
- name: Run markdown-lint
4244
uses: avto-dev/markdown-lint@v1
4345
with:
44-
args: CHANGELOG.md CONTRIBUTING.md README.md docs/
46+
args: CHANGELOG.md CONTRIBUTING.md README.md
4547
config: '.markdownlint.yml'
4648
tests:
4749
name: Unit tests

.markdownlint.yml

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
default: true
22

3-
# Using h2 has side effects in GitBook's toc. Thus, we sometimes switch from h1 to h3
4-
MD001: false
5-
6-
MD012:
7-
# 2 are required, because GitBook adss two blank lines at the end of a file
8-
maximum: 2
9-
3+
# allow arbitrary line length
104
MD013: false
115

12-
# The FAQs state questions - we allow them
13-
MD026:
14-
punctuation: ".,;:!"
15-
16-
# not supported by gitbook
17-
MD031: false
18-
196
MD033:
207
# we have <a> tags with ids and superscript
218
allowed_elements: ['a', 'kbd', 'sup']
22-
23-
# seems to be unsupported by gitbook anymore
24-
MD045: false

CHANGELOG.md

+34-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
1111

1212
### Added
1313

14+
- We added confirmation dialog when user wants to close a library where any empty entires are detected. [#8096](https://github.com/JabRef/jabref/issues/8096)
1415
- We added import support for CFF files. [#7945](https://github.com/JabRef/jabref/issues/7945)
1516
- We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826)
1617
- We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838)
@@ -21,30 +22,61 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2122
- We added a preference to Opt-In to JabRef's online metadata extraction service (Grobid) usage. [#8002](https://github.com/JabRef/jabref/pull/8002)
2223
- We readded the possibility to display the search results of all databases ("Global Search"). It is shown in a separate window. [#4096](https://github.com/JabRef/jabref/issues/4096)
2324
- We readded the possibility to keep the search string when switching tabs. It is implemented by a toggle button. [#4096](https://github.com/JabRef/jabref/issues/4096#issuecomment-575986882)
25+
- We allowed the user to also preview the available citation styles in the preferences besides the selected ones [#8108](https://github.com/JabRef/jabref/issues/8108)
26+
- We added an option to search the available citation styles by name in the preferences [#8108](https://github.com/JabRef/jabref/issues/8108)
27+
- We added an option to generate bib-entries from ID through a popover in the toolbar. [#4183](https://github.com/JabRef/jabref/issues/4183)
28+
- We added a menu option in the right click menu of the main table tabs to display the library properties. [#6527](https://github.com/JabRef/jabref/issues/6527)
29+
- When a `.bib` file ("library") was saved successfully, a notification is shown
2430

2531
### Changed
2632

33+
- Local library settings may overwrite the setting "Search and store files relative to library file location" [#8179](https://github.com/JabRef/jabref/issues/8179)
34+
- The option "Fit table horizontally on screen" in the "Entry table" preferences is now disabled by default [#8148](https://github.com/JabRef/jabref/pull/8148)
35+
- We improved the preferences and descriptions in the "Linked files" preferences tab [#8148](https://github.com/JabRef/jabref/pull/8148)
2736
- We slightly changed the layout of the Journal tab in the preferences for ui consistency. [#7937](https://github.com/JabRef/jabref/pull/7937)
2837
- The JabRefHost on Windows now writes a temporary file and calls `-importToOpen` instead of passing the bibtex via `-importBibtex`. [#7374](https://github.com/JabRef/jabref/issues/7374), [JabRef Browser Ext #274](https://github.com/JabRef/JabRef-Browser-Extension/issues/274)
2938
- We reordered some entries in the right-click menu of the main table. [#6099](https://github.com/JabRef/jabref/issues/6099)
3039
- We merged the barely used ImportSettingsTab and the CustomizationTab in the preferences into one single tab and moved the option to allow Integers in Edition Fields in Bibtex-Mode to the EntryEditor tab. [#7849](https://github.com/JabRef/jabref/pull/7849)
3140
- We moved the export order in the preferences from `File` to `Import and Export`. [#7935](https://github.com/JabRef/jabref/pull/7935)
3241
- We reworked the export order in the preferences and the save order in the library preferences. You can now set more than three sort criteria in your library preferences. [#7935](https://github.com/JabRef/jabref/pull/7935)
3342
- The metadata-to-pdf actions now also embeds the bibfile to the PDF. [#8037](https://github.com/JabRef/jabref/pull/8037)
43+
- The snap was updated to use the core20 base and to use lzo compression for better startup performance [#8109](https://github.com/JabRef/jabref/pull/8109)
44+
- We improved the Drag and Drop behavior in the "Customize Entry Types" Dialog [#6338](https://github.com/JabRef/jabref/issues/6338)
45+
- When determining the URL of an ArXiV eprint, the URL now points to the version [#8149](https://github.com/JabRef/jabref/pull/8149)
46+
- We Included all standard fields with citation key when exporting to Old OpenOffice/LibreOffice Calc Format [#8176](https://github.com/JabRef/jabref/pull/8176)
47+
- In case the database is encoded with `UTF8`, the `% Encoding` marker is not written anymore
48+
- The written `.bib` file has the same line endings [#390](https://github.com/koppor/jabref/issues/390)
49+
- The written `.bib` file always has a final line break
50+
- The written `.bib` file keeps the newline separator of the loaded `.bib` file
51+
- We present options to manually enter an article or return to the New Entry menu when the fetcher DOI fails to find an entry for an ID [#7870](https://github.com/JabRef/jabref/issues/7870)
52+
- We trim white space and non-ASCII characters from DOI [#8127](https://github.com/JabRef/jabref/issues/8127)
53+
- The duplicate checker now inspects other fields in case no difference in the required and optional fields are found.
54+
- We reworked the library properties dialog and integrated the `Library > Preamble`, `Library > Citation key pattern` and `Library > String constants dialogs` [#8264](https://github.com/JabRef/jabref/pulls/8264)
3455

3556
### Fixed
3657

37-
- We fixed an issue where an exception ocurred when a linked online file was edited in the entry editor [#8008](https://github.com/JabRef/jabref/issues/8008)
58+
- We fixed an issue where an exception occured when a preview style was edited and afterwards another preview style selected. [#8280](https://github.com/JabRef/jabref/issues/8280)
59+
- We fixed an issue where the actions to move a file to a directory were incorrectly disabled. [#7908](https://github.com/JabRef/jabref/issues/7908)
60+
- We fixed an issue where an exception occurred when a linked online file was edited in the entry editor [#8008](https://github.com/JabRef/jabref/issues/8008)
3861
- We fixed an issue when checking for a new version when JabRef is used behind a corporate proxy. [#7884](https://github.com/JabRef/jabref/issues/7884)
3962
- We fixed some icons that were drawn in the wrong color when JabRef used a custom theme. [#7853](https://github.com/JabRef/jabref/issues/7853)
4063
- We fixed an issue where the `Aux file` on `Edit group` doesn't support relative sub-directories path to import. [#7719](https://github.com/JabRef/jabref/issues/7719).
4164
- We fixed an issue where it was impossible to add or modify groups. [#7912](https://github.com/JabRef/jabref/pull/793://github.com/JabRef/jabref/pull/7921)
4265
- We fixed an issue where exported entries from a Citavi bib containing URLs could not be imported [#7892](https://github.com/JabRef/jabref/issues/7882)
4366
- We fixed an issue where the icons in the search bar had the same color, toggled as well as untoggled. [#8014](https://github.com/JabRef/jabref/pull/8014)
67+
- We fixed an issue where typing an invalid UNC path into the "Main file directory" text field caused an error. [#8107](https://github.com/JabRef/jabref/issues/8107)
68+
- We fixed an issue where "Open Folder" didn't select the file on macOS in Finder [#8130](https://github.com/JabRef/jabref/issues/8130)
69+
- We fixed an issue where importing PDFs resulted in an uncaught exception [#8143](https://github.com/JabRef/jabref/issues/8143)
70+
- We fixed "The library has been modified by another program" showing up when line breaks change [#4877](https://github.com/JabRef/jabref/issues/4877)
71+
- The default directory of the "LaTeX Citations" tab is now the directory of the currently opened database (and not the directory chosen at the last open file dialog or the last database save) [koppor#538](https://github.com/koppor/jabref/issues/538)
72+
- When writing a bib file, the `NegativeArraySizeException` should not occur [#8231](https://github.com/JabRef/jabref/issues/8231) [#8265](https://github.com/JabRef/jabref/issues/8265)
73+
- We fixed an issue where right-clicking on a tab and selecting close will close the focused tab even if it is not the tab we right-clicked [#8193](https://github.com/JabRef/jabref/pull/8193)
74+
- We fixed an issue where selecting a citation style in the preferences would sometimes produce an exception [#7860](https://github.com/JabRef/jabref/issues/7860)
75+
- We fixed an issue where an exception would occur when clicking on a DOI link in the preview pane [#7706](https://github.com/JabRef/jabref/issues/7706)
4476

4577
### Removed
4678

47-
79+
- We removed two orphaned preferences options [#8164](https://github.com/JabRef/jabref/pull/8164)
4880

4981

5082

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,4 @@ For IntelliJ IDEA, just import the project via a Gradle Import by pointing at th
100100

101101
JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/)
102102

103-
104103
[JabRef]: https://www.jabref.org

0 commit comments

Comments
 (0)