Merge remote-tracking branch 'upstream/master' into importerbackgroun…

…dtask

* upstream/master:
  Adjust zbmath fetcher (#7298)
  Add "acm-siggraph.csl" required by CitationStyle.java
  Added Keyboard shortcuts (clear/set read status) (#7302)
  Add special fields ADR (#7300)
  Overwrite local copies
  Squashed 'buildres/csl/csl-locales/' content from commit ecb8e70233
  Squashed 'buildres/csl/csl-styles/' content from commit 737ffa1
  Adapt workflow and build.gradle
  Move CSL to buildres/csl to speedup "processResources" during development

.github/workflows/refresh-csl-subtrees.yml

@@ -16,20 +16,27 @@ jobs:
         with:
           ref: master
           fetch-depth: 0
-      - name: Add csl-styles remote
-        run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
-      - name: Update csl-styles
+      - name: Initialize git
         run: |
           git checkout master
           git config --local core.editor /usr/bin/cat
           git config user.name "github actions"
           git config user.email "[email protected]"
-          git subtree pull --prefix src/main/resources/csl-styles csl-styles master --squash
+      - name: Add csl-styles remote
+        run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
+      - name: Update csl-styles
+        run: |
+          git subtree pull --prefix buildres/csl/csl-styles csl-styles master --squash
+          cp buildres/csl/csl-styles/acm-siggraph.csl src/main/resources/csl-styles/
+          cp buildres/csl/csl-styles/ieee.csl src/main/resources/csl-styles/
+          cp buildres/csl/csl-styles/turabian-author-date.csl src/main/resources/csl-styles/
       - name: Add csl-locales remote
         run: git remote add -f csl-locales https://github.com/citation-style-language/locales.git
       - name: Update csl-locales
         run: |
-          git subtree pull --prefix src/main/resources/csl-locales csl-locales master --squash
+          git subtree pull --prefix buildres/csl/csl-locales csl-locales master --squash
+          cp buildres/csl/csl-locales/locales.json src/main/resources/csl-locales/
+          cp buildres/csl/csl-locales/locales-en-US src/main/resources/csl-locales/
       - uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -11,8 +11,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+- We added the possibility to add a new entry via its zbMath ID (zbMATH can be chosen as ID type in the "Select entry type" window). [#7202](https://github.com/JabRef/jabref/issues/7202)
 - We added the extension support and the external application support (For Texshow, Texmaker and LyX) to the flatpak [#7248](https://github.com/JabRef/jabref/pull/7248)
 - We added some symbols and keybindings to the context menu in the entry editor. [#7268](https://github.com/JabRef/jabref/pull/7268)
+- We added keybindings for setting and clearing the read status. [#7264](https://github.com/JabRef/jabref/issues/7264)
 
 ### Changed
 

build.gradle

@@ -257,6 +257,13 @@ clean {
 }
 
 processResources {
+    gradle.taskGraph.whenReady {
+        if (gradle.taskGraph.hasTask(":jpackage")) {
+            logger.info('Adding buildres/csl to resources')
+            from("buildres/csl")
+        }
+    }
+
     filteringCharset = 'UTF-8'
 
     filesMatching("build.properties") {

src/main/resources/csl-styles/.github/workflows/merge.yaml → buildres/csl/csl-locales/.github/workflows/merge.yaml

@@ -41,15 +41,18 @@ jobs:
         list-files: shell
         filters: |
           updated:
-            - added|modified: [ '*.csl', '*.xml' ]
+            - added|modified: [ '*.csl', 'dependent/*.csl', '*.xml', 'README.md' ]
           deleted:
-            - deleted: [ '*.csl', '*.xml' ]
+            - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
+          workflows:
+            - added|modified: .github/workflows/*.yaml
 
     - name: Changed files
       if: github.event_name == 'push'
       run: |
         echo updated: ${{ steps.update.outputs.updated_files }}
         echo deleted: ${{ steps.update.outputs.deleted_files }}
+        echo workflows: ${{ steps.update.outputs.workflows_files }}
 
     - name: Set up Ruby
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
@@ -102,3 +105,15 @@ jobs:
       run: |
         curl -H 'Content-Length:' -H "Authorization: $ZOTERO_UPDATE_TOKEN" -F 'payload={"type":"push","branch":"${{ steps.release.outputs.branch }}","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8826/
         curl -H 'Content-Length:' -H "Authorization: $ZOTERO_UPDATE_TOKEN" -F 'payload={"type":"push","branch":"${{ steps.release.outputs.branch }}","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8827/
+
+    - name: Copy workflows to locales repository
+      if: github.repository == 'citation-style-language/styles' && steps.update.outputs.workflows == 'true'
+      uses: drud/action-cross-commit@master
+      with:
+        source-folder: .github/workflows
+        destination-repository: https://csl-bot:${{ secrets.CSLBOT_TOKEN }}@github.com/citation-style-language/locales
+        destination-folder: .github/workflows
+        destination-branch: master
+        git-user: "csl-bot"
+        git-user-email: [email protected]
+        git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles

src/main/resources/csl-styles/.github/workflows/sheldon.yaml → buildres/csl/csl-locales/.github/workflows/sheldon.yaml

@@ -20,6 +20,7 @@ jobs:
         filters: |
           style:
             - '*.csl'
+            - 'dependent/*.csl'
           locale:
             - '*.xml'