Merge remote-tracking branch 'upstream/master' into writebackupToTemp

* upstream/master: (201 commits) Only disable move to file dir when path equals (#7269) Improved detection of long DOI's within text (#7260) Add missing author and fix name Fix style of highlighted checkboxes while searching in preferences (#7258) Updates to institution citation keys (#7210) Bump xmlunit-core from 2.8.1 to 2.8.2 (#7251) Bump classgraph from 4.8.97 to 4.8.98 (#7250) Bump bcprov-jdk15on from 1.67 to 1.68 (#7249) Bump xmlunit-matchers from 2.8.1 to 2.8.2 (#7252) Bump unirest-java from 3.11.06 to 3.11.09 (#7254) Bump org.beryx.jlink from 2.23.0 to 2.23.1 (#7253) Bump pascalgn/automerge-action from v0.12.0 to v0.13.0 (#7255) Added a check to integrate with the flatpak package (#7248) New translations JabRef_en.properties (Chinese Traditional) (#7247) Update code-howtos.md GitBook: [master] 5 pages and 25 assets modified New Crowdin updates (#7246) add language mapping for chinese remove chinese content fix hamcrest link ... # Conflicts: # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java # src/main/java/org/jabref/gui/exporter/SaveAction.java # src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java # src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java # src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
JabRef · Dec 30, 2020 · 25a2e07 · 25a2e07
2 parents 82586a6 + afdb194
commit 25a2e07
Show file tree

Hide file tree

Showing 543 changed files with 31,011 additions and 8,705 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -16,7 +16,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Merge pull requests
-        uses: pascalgn/automerge-action@v0.12.0
+        uses: pascalgn/automerge-action@v0.13.0
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
           MERGE_METHOD: "squash"

diff --git a/.github/workflows/cleanup_pr.yml b/.github/workflows/cleanup_pr.yml
@@ -27,7 +27,7 @@ jobs:
           echo "##[set-output name=branch;]$(echo ${{ github.event.pull_request.head.ref }})"
       - name: Delete folder on builds.jabref.org
         if: ${{ steps.checksecrets.outputs.secretspresent }}
-        uses: appleboy/ssh-action@v0.1.3
+        uses: appleboy/ssh-action@v0.1.4
         with:
           script: rm -rf /var/www/builds.jabref.org/www/${{ steps.extract_branch.outputs.branch }} || true
           host: build-upload.jabref.org

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -1,6 +1,7 @@
 name: Deployment
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -41,20 +42,20 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
       - name: Fetch all history for all tags and branches
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.4
+        uses: gittools/actions/gitversion/setup@v0.9.7
         with:
-          versionSpec: "5.3.7"
+          versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.4
+        uses: gittools/actions/gitversion/execute@v0.9.7
       - name: Set up JDK 15 for linux and mac
         uses: actions/setup-java@v1
         with:
@@ -88,7 +89,7 @@ jobs:
           create-keychain: false
           keychain-password: jabref
       - name: Build runtime image
-        run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
+        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
       - name: Build installer
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
         shell: bash
@@ -101,7 +102,7 @@ jobs:
           codesign --entitlements buildres/mac/myapp.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app
           jpackage --type pkg --dest build/distribution --name JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type dmg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
           codesign -s "Developer ID Application: Tobias Diez (W2PU6LW5U5)" --options runtime --entitlements buildres/mac/myapp.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          jpackage --type pkg --dest build/distribution --name 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
+          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
           productsign --sign "Developer ID Installer: Tobias Diez (W2PU6LW5U5)" "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"
       - name: Notarize dmg and pkg installer
         if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/master'
@@ -161,12 +162,12 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.4
+        uses: gittools/actions/gitversion/setup@v0.9.7
         with:
-          versionSpec: '5.2.x'
+          versionSpec: '5.x'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.4
+        uses: gittools/actions/gitversion/execute@v0.9.7
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:

diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
@@ -1,9 +1,6 @@
 name: Refresh Journal Lists
 
 on:
-  schedule:
-    # run on 1st and 15th of each month
-    - cron: '2 20 1,15 * *'
   workflow_dispatch:
     # Allow to run manually
 

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -31,6 +31,8 @@ jobs:
       - name: Build snap (1) Run build
         uses: snapcore/action-build@v1
         id: snapcraft
+        with:
+          snapcraft-args: "--debug"
       - name: Build snap (2) Upload snap
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         uses: snapcore/action-publish@v1

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -2,17 +2,27 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+  - cron: "20 19 * * *"
 
 jobs:
   stale:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@master
+    - uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue will be closed in 7 days due to inactivity :zzz: Please provide the requested information if the problem persists.'
+        days-before-stale: 180
+        days-before-close: 14
+        stale-issue-message: |
+          This issue has been inactive for half a year. Since JabRef is constantly evolving this issue may not be relevant any longer and it will be closed in two weeks if no further activity occurs.
+
+          As part of an effort to ensure that the JabRef team is focusing on important and valid issues, we would like to ask if you could update the issue if it still persists. This could be in the following form:
+
+          - If there has been a longer discussion, add a short summary of the most important points as a new comment (if not yet existing).
+          - Provide further steps or information on how to reproduce this issue.
+          - Upvote the initial post if you like to see it implemented soon. Votes are not the only metric that we use to determine the requests that are implemented, however, they do factor into our decision-making process.
+          - If all information is provided and still up-to-date, then just add a short comment that the issue is still relevant.
+
+          Thank you for your contribution!
         stale-issue-label: 'status: stale'
-        days-before-stale: 30
-        only-labels: 'status: waiting-for-customer-feedback'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout source
@@ -41,7 +41,12 @@ jobs:
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Run checkstyle
+      - name: Run check style reporter
+        uses: nikitasavinov/checkstyle-action@master
+        with:
+          reporter: github-pr-check
+          checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
+      - name: Run checkstyle gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
       - name: Run markdown-lint
         uses: avto-dev/markdown-lint@v1
@@ -86,7 +91,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:13-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -256,5 +261,6 @@ jobs:
           echo
           echo "In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits"
           echo
-          echo "Background: Information about the AUTHORS file can be found at https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits"
+          echo "Just adding yourself into the AUTHORS file does not help as it is overwritten by our script ./scripts/generate-authors."
+          echo "Read more on the AUTHORS file at found at https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits"
           exit 1
diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml
diff --git a/.mailmap b/.mailmap
@@ -213,3 +213,4 @@ Muhammad Arsalan Badar <arsalan_badar@intuit.com>
 ZhouSky <11711923@mail.sustech.edu.cn>
 Vincent Gagnon <vincentgagnon53@gmail.com>
 Tom Warnke <Toromtomtom@users.noreply.github.com>
+Eric Lau <919023+skeric@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -38,6 +38,7 @@ Anita Armbruster
 Antonio Ribeiro
 Arno Blouin
 Arthur Fröhlich
+AtrusRiven
 Atul Kaushik
 August Janse
 Ayachi Nene
@@ -47,6 +48,7 @@ Baruch Oltman
 Behrouz Javanmardi
 Benedikt Tutzer
 Benjamin Köhler
+Benjamin Schroth
 Berk Gureken
 Bernd Kalbfuss
 Bernhard Tempel
@@ -127,9 +129,11 @@ Fancy Zhang
 Fedor Bezrukov
 Felix Berger
 Felix Langner
+Felix Luthman
 Felix Wilke
 Fernando Santagata
 ffffatgoose
+Fiyinfolu Eludire
 Florian Beetz
 Florian Straßer
 Foivos Christoulakis
@@ -157,12 +161,15 @@ Harinda Samarasekara
 hemantgs
 HifeFish
 Hollyqqqqq
+Houssem Nasri
 hrandrianasolo
 Hussain Arif
+IfIWantedTo
 Igor Chernyavsky
 Igor Steinmacher
 Illes Solt
 Ingvar Jackal
+Isaac Roles
 Jackson Ryan
 Jan Frederik Maas
 Jan Kubovy
@@ -178,6 +185,7 @@ Jeffrey Kuhn
 Jeffrey Sander
 Jens Döcke
 joeyzgraggen
+Johan Del Valle
 Johannes Hupe
 Johannes Manner
 Johannes Theiner
@@ -211,6 +219,7 @@ Kelly Click
 Koji Yokota
 KOLANICH
 Kolja Brix
+Kristoffer Gunnarsson
 Krunoslav Zubrinic
 Krzysztof A. Kościuszkiewicz
 Kyle Johnson
@@ -229,9 +238,11 @@ Lucas Beretti
 Luciana de Melo e Abud
 Lugduni Desrosiers
 Luis Romero
+Luis Valdez
 Mairieli Wessel
 Malik Atalla
 Malte Deiseroth
+Manas Singh
 Manuel Siebeneicher
 Manuel Wtfjoke
 Marcel Luethi
@@ -242,6 +253,7 @@ Marius Kleiner
 Mark Schenk
 Martin Kähmer
 Martin Stolle
+Martin W. Kirst
 Martina Catizone
 Mathias Walter
 Matthias Geiger
@@ -272,6 +284,7 @@ Morgan Lovato
 Moritz Ringler
 Morten Alver
 ms111ds
+muachilin
 Muhammad Arsalan Badar
 Mélanie Tremblay
 Nadeem Mahmood
@@ -281,6 +294,7 @@ Nick Mancuso
 Nick S. Weatherley
 Nico Schlömer
 Nicolas Pavillon
+Niffler
 Nikita Borovikov
 Niklas Schmitt
 nikmilpv
@@ -384,6 +398,7 @@ Tobias Bouschen
 Tobias Denkinger
 Tobias Diez
 Tom Warnke
+Tommy Samuelsson
 Tomás Morales de Luna
 Tony K
 Toralf Senger