diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
index bfc618d021d..2077d20ff80 100644
--- a/.github/workflows/check-links.yaml
+++ b/.github/workflows/check-links.yaml
@@ -7,6 +7,7 @@ on:
schedule:
# 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)
- cron: "0 9 1 * *"
+ workflow_dispatch:
jobs:
markdown-link-check:
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index f6f24eabe87..670407e4d4f 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -26,6 +26,10 @@ env:
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
JAVA_OPTS: -Xmx4g
+concurrency:
+ group: ${{ github.head_ref }}
+ cancel-in-progress: true
+
jobs:
build:
strategy:
@@ -45,10 +49,6 @@ jobs:
runs-on: ${{ matrix.os }}
name: Create installer and portable version for ${{ matrix.displayName }}
steps:
- - name: Cancel Previous Runs
- uses: styfle/cancel-workflow-action@0.9.1
- with:
- access_token: ${{ github.token }}
- name: Fetch all history for all tags and branches
uses: actions/checkout@v2
with:
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index a9281f17b2f..bf04acc1d4c 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -6,6 +6,7 @@ on:
- gource
schedule:
- cron: '15 3 1 1,4,7,10 *'
+ workflow_dispatch:
jobs:
action:
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c190256444f..564ad5f0971 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -9,6 +9,10 @@ on:
# run on each day
- cron: "33 4 * * *"
+concurrency:
+ group: snap-${{ github.head_ref }}
+ cancel-in-progress: true
+
jobs:
build:
runs-on: ubuntu-latest
diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
index 83ae6ef2685..f670c0ee1ab 100644
--- a/.github/workflows/tests-fetchers.yml
+++ b/.github/workflows/tests-fetchers.yml
@@ -27,6 +27,10 @@ env:
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
+concurrency:
+ group: fetcher-tests-${{ github.head_ref }}
+ cancel-in-progress: true
+
jobs:
fetchertests:
name: Fetcher tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fe26e4e8fdc..ba680d86435 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,9 +3,11 @@ name: Tests
on:
push:
branches:
- - master
+ - main
+ - main-release
pull_request:
# always run on pull requests
+ workflow_dispatch:
env:
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -14,15 +16,15 @@ env:
GRADLE_OPTS: -Xmx4g
JAVA_OPTS: -Xmx4g
+concurrency:
+ group: tests-${{ github.head_ref }}
+ cancel-in-progress: true
+
jobs:
checkstyle:
name: Checkstyle
runs-on: ubuntu-latest
steps:
- - name: Cancel Previous Runs
- uses: styfle/cancel-workflow-action@0.9.1
- with:
- access_token: ${{ github.token }}
- name: Checkout source
uses: actions/checkout@v2
- name: Set up JDK
diff --git a/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl b/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
index 279f1a7f259..8a0830b3456 100644
--- a/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
+++ b/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
@@ -15,7 +15,7 @@
Style as per the May 2019 guidelines.
- 2021-04-22T13:05:29+00:00
+ 2021-11-10T10:39:01+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -279,20 +279,12 @@
-
-
-
-
-
+
-
-
-
-
-
+
diff --git a/buildres/csl/csl-styles/anti-trafficking-review.csl b/buildres/csl/csl-styles/anti-trafficking-review.csl
new file mode 100644
index 00000000000..fd177bb1a6d
--- /dev/null
+++ b/buildres/csl/csl-styles/anti-trafficking-review.csl
@@ -0,0 +1,384 @@
+
+
diff --git a/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl b/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
new file mode 100644
index 00000000000..a372a9e4ef4
--- /dev/null
+++ b/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
@@ -0,0 +1,280 @@
+
+
diff --git a/buildres/csl/csl-styles/biomed-central.csl b/buildres/csl/csl-styles/biomed-central.csl
index 9e2cb8a095b..7e135c42721 100644
--- a/buildres/csl/csl-styles/biomed-central.csl
+++ b/buildres/csl/csl-styles/biomed-central.csl
@@ -12,10 +12,13 @@
Sebastian Karcher
+
+ Patrick O'Brien
+
- 2017-03-15T17:11:28+00:00
+ 2021-11-02T17:11:28+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -87,22 +90,22 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/buildres/csl/csl-styles/bulletin-de-correspondance-hellenique.csl b/buildres/csl/csl-styles/bulletin-de-correspondance-hellenique.csl
index 67aea3380e2..ffb7b7117d0 100644
--- a/buildres/csl/csl-styles/bulletin-de-correspondance-hellenique.csl
+++ b/buildres/csl/csl-styles/bulletin-de-correspondance-hellenique.csl
@@ -1,345 +1,346 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/buildres/csl/csl-styles/cancer-biomarkers.csl b/buildres/csl/csl-styles/cancer-biomarkers.csl
new file mode 100644
index 00000000000..19cd2c1f0dd
--- /dev/null
+++ b/buildres/csl/csl-styles/cancer-biomarkers.csl
@@ -0,0 +1,151 @@
+
+
diff --git a/buildres/csl/csl-styles/dependent/bulletin-archeologique-des-ecoles-francaises-a-l-etranger.csl b/buildres/csl/csl-styles/dependent/bulletin-archeologique-des-ecoles-francaises-a-l-etranger.csl
new file mode 100644
index 00000000000..898f98c5ffa
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/bulletin-archeologique-des-ecoles-francaises-a-l-etranger.csl
@@ -0,0 +1,21 @@
+
+
diff --git a/buildres/csl/csl-styles/dependent/klinische-padiatrie.csl b/buildres/csl/csl-styles/dependent/klinische-padiatrie.csl
deleted file mode 100644
index 067b8c0ffb5..00000000000
--- a/buildres/csl/csl-styles/dependent/klinische-padiatrie.csl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
diff --git a/buildres/csl/csl-styles/forschungsjournal-soziale-bewegungen-fjsb.csl b/buildres/csl/csl-styles/forschungsjournal-soziale-bewegungen-fjsb.csl
new file mode 100644
index 00000000000..ddc24bf679f
--- /dev/null
+++ b/buildres/csl/csl-styles/forschungsjournal-soziale-bewegungen-fjsb.csl
@@ -0,0 +1,178 @@
+
+
diff --git a/buildres/csl/csl-styles/harvard-imperial-college-london.csl b/buildres/csl/csl-styles/harvard-imperial-college-london.csl
index e09043e5dba..72b72707f73 100644
--- a/buildres/csl/csl-styles/harvard-imperial-college-london.csl
+++ b/buildres/csl/csl-styles/harvard-imperial-college-london.csl
@@ -1,5 +1,5 @@
-
diff --git a/buildres/csl/csl-styles/iso690-author-date-fr-no-abstract.csl b/buildres/csl/csl-styles/iso690-author-date-fr-no-abstract.csl
index 62c82084a70..e385ade4437 100644
--- a/buildres/csl/csl-styles/iso690-author-date-fr-no-abstract.csl
+++ b/buildres/csl/csl-styles/iso690-author-date-fr-no-abstract.csl
@@ -7,7 +7,7 @@
Pierre-Amiel Giraud
- pierre-amiel.giraud@u-bordeaux3.fr
+ pierre-amiel.giraud@u-bordeaux-montaigne.fr
Raphael Grolimund
@@ -16,29 +16,21 @@
Style based on ISO 690:2010(F), V1, derived from Mellifluo, Grolimund, Hardegger and Giraud version.
- 2020-11-19T21:30:00+00:00
+ 2021-11-05T21:30:00+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
-
+
- Anon.
[sans date]
in
en ligne
consulté le
disponible
à l'adresse
- p.
+ trad.
+ éd.
-
-
-
-
-
-
-
-
@@ -57,42 +49,46 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -116,31 +112,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,14 +162,39 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -181,7 +207,7 @@
-
+
@@ -214,55 +240,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -314,12 +315,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -331,14 +330,17 @@
-
-
-
+
+
+
-
+
+
+
+
@@ -346,196 +348,225 @@
-
-
-
-
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
diff --git a/buildres/csl/csl-styles/journal-of-computer-applications-in-archaeology.csl b/buildres/csl/csl-styles/journal-of-computer-applications-in-archaeology.csl
index d0e8c8f7610..30a660cd2c3 100644
--- a/buildres/csl/csl-styles/journal-of-computer-applications-in-archaeology.csl
+++ b/buildres/csl/csl-styles/journal-of-computer-applications-in-archaeology.csl
@@ -11,11 +11,15 @@
Patrick O'Brien
obrienpat86@gmail.com
+
+ Ronald Visser
+ r.m.visser@saxion.nl
+
2514-8362
Harvard author-date style edited for Journal of Computer Applications in Archaeology.
- 2017-05-24T15:41:19+00:00
+ 2017-05-28T00:39:40+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -25,7 +29,7 @@
-
+
@@ -34,8 +38,8 @@
-
-
+
+
@@ -72,7 +76,7 @@
-
+
@@ -170,10 +174,10 @@
-
+
-
+
@@ -181,7 +185,7 @@
-
+
@@ -201,7 +205,7 @@
-
+
@@ -216,7 +220,7 @@
-
+
@@ -228,7 +232,7 @@
-
+
diff --git a/buildres/csl/csl-styles/journal-of-computer-assisted-tomography.csl b/buildres/csl/csl-styles/journal-of-computer-assisted-tomography.csl
new file mode 100644
index 00000000000..ec51b0baf36
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-computer-assisted-tomography.csl
@@ -0,0 +1,210 @@
+
+
diff --git a/buildres/csl/csl-styles/journal-of-intercultural-studies.csl b/buildres/csl/csl-styles/journal-of-intercultural-studies.csl
new file mode 100644
index 00000000000..9edf172f5ea
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-intercultural-studies.csl
@@ -0,0 +1,313 @@
+
+
diff --git a/buildres/csl/csl-styles/journal-of-oil-palm-research.csl b/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
index 037bf9ee77a..4dc0816f04a 100644
--- a/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
+++ b/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
@@ -14,13 +14,23 @@
1511-2780
- 2021-04-28T08:36:46+00:00
+ 2021-11-03T09:33:07+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
+
+
+ accessed on
+
+
+
+
+
+
+
@@ -32,6 +42,11 @@
+
+
+
+
+
@@ -41,8 +56,8 @@
-
+
@@ -51,6 +66,12 @@
+
+
+
+
+
+
@@ -93,13 +114,12 @@
-
+
-
-
+
@@ -126,6 +146,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/buildres/csl/csl-styles/klinische-padiatrie.csl b/buildres/csl/csl-styles/klinische-padiatrie.csl
new file mode 100644
index 00000000000..e805412b748
--- /dev/null
+++ b/buildres/csl/csl-styles/klinische-padiatrie.csl
@@ -0,0 +1,135 @@
+
+
diff --git a/buildres/csl/csl-styles/mohr-siebeck-recht.csl b/buildres/csl/csl-styles/mohr-siebeck-recht.csl
index 6c0b7ce1319..696873cf32f 100644
--- a/buildres/csl/csl-styles/mohr-siebeck-recht.csl
+++ b/buildres/csl/csl-styles/mohr-siebeck-recht.csl
@@ -12,7 +12,7 @@
Kommentare sind als "report" zu kategorisieren, um richtig zitiert werden zu können. Gibt es keinen einheitlichen Autor oder Herausgeber bei Kommentaren, sondern nur einen Redakteur, ist dieser als Translator anzugeben, um im Literaturverzeichnis ordnungsgemäß zu erscheinen.
- 2015-07-06T20:30:41+00:00
+ 2021-07-14T20:30:41+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -47,7 +47,7 @@
-
+
diff --git a/buildres/csl/csl-styles/multidisciplinary-digital-publishing-institute.csl b/buildres/csl/csl-styles/multidisciplinary-digital-publishing-institute.csl
index 793c4e00008..944ddc1905a 100644
--- a/buildres/csl/csl-styles/multidisciplinary-digital-publishing-institute.csl
+++ b/buildres/csl/csl-styles/multidisciplinary-digital-publishing-institute.csl
@@ -1,5 +1,5 @@
-
diff --git a/buildres/csl/csl-styles/revue-archeologique-de-narbonnaise.csl b/buildres/csl/csl-styles/revue-archeologique-de-narbonnaise.csl
new file mode 100644
index 00000000000..454f5cfffef
--- /dev/null
+++ b/buildres/csl/csl-styles/revue-archeologique-de-narbonnaise.csl
@@ -0,0 +1,309 @@
+
+
diff --git a/buildres/csl/csl-styles/scandinavian-journal-of-information-systems.csl b/buildres/csl/csl-styles/scandinavian-journal-of-information-systems.csl
new file mode 100644
index 00000000000..596efbfcd6c
--- /dev/null
+++ b/buildres/csl/csl-styles/scandinavian-journal-of-information-systems.csl
@@ -0,0 +1,368 @@
+
+
diff --git a/buildres/csl/csl-styles/the-angle-orthodontist.csl b/buildres/csl/csl-styles/the-angle-orthodontist.csl
new file mode 100644
index 00000000000..e40ee9cb232
--- /dev/null
+++ b/buildres/csl/csl-styles/the-angle-orthodontist.csl
@@ -0,0 +1,241 @@
+
+
diff --git a/buildres/csl/csl-styles/thieme-german.csl b/buildres/csl/csl-styles/thieme-german.csl
index 178193cb771..89e9063c971 100644
--- a/buildres/csl/csl-styles/thieme-german.csl
+++ b/buildres/csl/csl-styles/thieme-german.csl
@@ -1,6 +1,5 @@
diff --git a/buildres/csl/csl-styles/unesco-international-institute-for-educational-planning.csl b/buildres/csl/csl-styles/unesco-international-institute-for-educational-planning.csl
index 2cb8bfa3704..3d6141e31d5 100644
--- a/buildres/csl/csl-styles/unesco-international-institute-for-educational-planning.csl
+++ b/buildres/csl/csl-styles/unesco-international-institute-for-educational-planning.csl
@@ -71,7 +71,7 @@
-
+
diff --git a/buildres/csl/csl-styles/vancouver-imperial-college-london.csl b/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
index 9f12aa3946b..6d55fb8c1f1 100644
--- a/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
+++ b/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
@@ -9,10 +9,14 @@
Sebastian Karcher
+
+ S. Mackenzie
+
+
- Vancouver style according to the Imperial College London Guidelines
- 2014-09-06T16:03:01+00:00
+ Vancouver style from Imperial College London Library - 2021
+ 2021-11-10T09:54:55+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -30,7 +34,7 @@
-
+
@@ -40,24 +44,29 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -67,7 +76,6 @@
-
@@ -77,10 +85,9 @@
-
-
+
@@ -94,9 +101,13 @@
-
-
-
+
+
+
+
+
+
+
@@ -106,15 +117,9 @@
-
-
-
-
-
-
@@ -145,11 +150,6 @@
-
-
-
-
-
@@ -177,7 +177,7 @@
-
+
@@ -196,7 +196,7 @@
-
+
@@ -230,6 +230,12 @@
+
+
+
+
+
+
@@ -237,14 +243,6 @@
-
-
-
-
-
-
-
-
@@ -257,7 +255,7 @@
-
+
diff --git a/docs/adr.md b/docs/adr.md
index eba92a988b2..c95471e06e7 100644
--- a/docs/adr.md
+++ b/docs/adr.md
@@ -24,6 +24,8 @@ Architectural decisions for JabRef:
* [ADR-0019](https://github.com/JabRef/jabref/blob/master/docs/adr/0019-implement-special-fields-as-seperate-fields.md) - Implement special fields as seperate fields
* [ADR-0020](https://github.com/JabRef/jabref/blob/master/docs/adr/0020-use-Jackson-to-parse-study-yml.md) - Use Jackson to parse study.yml
* [ADR-0021](https://github.com/JabRef/jabref/blob/master/docs/adr/0021-keep-study-as-a-dto.md) - Keep study as a DTO
+* [ADR-0022](https://github.com/JabRef/jabref/blob/master/docs/adr/0022-remove-stop-words-during-query-transformation.md) - Remove stop words during query transformation
+* [ADR-0023](https://github.com/JabRef/jabref/blob/master/docs/adr/0023-localized-preferences.md) - Localized Preferences
For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/master/docs/adr/template.md) as basis. More information on the used format is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io/). Then add them to the above list.
diff --git a/src/main/resources/csl-styles/turabian-author-date.csl b/src/main/resources/csl-styles/turabian-author-date.csl
index e3ca2a00faa..afb896007ff 100644
--- a/src/main/resources/csl-styles/turabian-author-date.csl
+++ b/src/main/resources/csl-styles/turabian-author-date.csl
@@ -10,10 +10,15 @@
Tony Chuang
zcchuang@tiu.edu
+
+ J. David Stark
+ david@jdavidstark.com
+ https://www.jdavidstark.com/
+
The author-date variant of the Turabian 9th edition - Based on Chicago 17th (author-date)
- 2020-05-16T19:15:00+00:00
+ 2021-10-29T15:28:42+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -274,9 +279,6 @@
-
-
-
@@ -285,6 +287,10 @@
+
+
+
+
@@ -430,12 +436,9 @@
-
-
-
-
-
-
+
+
+
@@ -445,6 +448,10 @@
+
+
+
+
@@ -624,23 +631,27 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+