Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into 8747-data-field
Browse files Browse the repository at this point in the history
* upstream/main:
  New Crowdin updates (#9333)
  Refresh example styles
  Squashed 'buildres/csl/csl-styles/' changes from 4eee79a..13fd98e
  Bump unirest-java from 3.13.11 to 3.13.12 (#9330)
  Bump checkstyle from 10.3.4 to 10.4 (#9331)
  Bump gittools/actions from 0.9.14 to 0.9.15 (#9332)
  Group context menu presents relevant options depending on number of subgroups (#9286)
  Removed BibTeX file type and included HTML and Markdown types (#9318)
  Fix issue: Auto-linking files with safe character replacements #9267 (#9316)
  Fix for issue 8806: Button highlights doesn't respect rounded corners (#9320)
  New Crowdin updates (#9324)
  Update CHANGELOG.md
  Try to relocate listener binding (#9238)
  Changed the messages after importing unlinked local files to past passive tense. (#9308)
  Changed the color of found text from red to high contrast  (#9315)
  New Crowdin updates (#9317)
  Add skips for MacOS X build (#9305)
  New Crowdin updates (#9248)
  Fix for issue 9304 (#9313)

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Siedlerchr committed Nov 1, 2022
2 parents b9babec + 4c4a6ac commit 8464bd6
Show file tree
Hide file tree
Showing 54 changed files with 942 additions and 207 deletions.
29 changes: 21 additions & 8 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,45 +51,58 @@ jobs:
runs-on: ${{ matrix.os }}
name: Create installer and portable version for ${{ matrix.displayName }}
steps:
- name: Check secrets presence
id: checksecrets
shell: bash
run: |
if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
echo ::set-output name=secretspresent::false
else
echo ::set-output name=secretspresent::true
fi
env:
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
- name: Fetch all history for all tags and branches
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.14
uses: gittools/actions/gitversion/setup@v0.9.15
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.14
uses: gittools/actions/gitversion/execute@v0.9.15
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 18
distribution: 'temurin'
cache: 'gradle'
- name: Setup OSX key chain on OSX
if: matrix.os == 'macos-latest'
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
uses: apple-actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
p12-password: ${{ secrets.OSX_CERT_PWD }}
keychain-password: jabref
- name: Setup OSX key chain on OSX for app id cert
if: matrix.os == 'macos-latest'
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
uses: apple-actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }}
p12-password: ${{ secrets.OSX_CERT_PWD }}
create-keychain: false
keychain-password: jabref
- name: Build runtime image
if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
- name: Build installer
if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
shell: bash
- name: Resign app image for OSX and build dmg
if: matrix.os == 'macos-latest'
if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent
shell: bash
run: |
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
Expand All @@ -100,7 +113,7 @@ jobs:
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: 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"
- name: Notarize dmg and pkg installer
if: matrix.os == 'macos-latest' && startsWith(github.ref, 'refs/tags/')
if: (matrix.os == 'macos-latest') && startsWith(github.ref, 'refs/tags/') && steps.checksecrets.outputs.secretspresent
shell: bash
run: |
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}')
Expand Down Expand Up @@ -157,12 +170,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.14
uses: gittools/actions/gitversion/setup@v0.9.15
with:
versionSpec: '5.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.14
uses: gittools/actions/gitversion/execute@v0.9.15
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,13 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- 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)
- 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)
- 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)
- Groups context menu now shows appropriate options depending on number of subgroups. [koppor#579](https://github.com/koppor/jabref/issues/579)
- 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)
- 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)
- Download from URL now automatically fills with URL from clipboard. [koppor#535](https://github.com/koppor/jabref/issues/535)
- We added HTML and Markdown files to Find Unlinked Files and removed BibTeX.[koppor#547](https://github.com/koppor/jabref/issues/547)
- We changed the messages after importing unlinked local files to past tense. [koppor#548](https://github.com/koppor/jabref/issues/548)
- 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)

### Fixed

Expand All @@ -60,6 +65,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed a performance regression when opening large libraries [#9041](https://github.com/JabRef/jabref/issues/9041)
- 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)
- 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)
- We fixed some visual inconsistencies (round corners of highlighted buttons). [#8806](https://github.com/JabRef/jabref/issues/8806)
- 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)
- 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)
- We fixed issues with save actions not correctly loaded when opening the library. [#9122](https://github.com/JabRef/jabref/pull/9122)
Expand All @@ -75,6 +81,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed a typo within a connection error message. [koppor#625](https://github.com/koppor/jabref/issues/625)
- We fixed an issue where the 'close dialog' key binding was not closing the Preferences dialog. [#8888](https://github.com/jabref/jabref/issues/8888)
- 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]
- 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)

### Removed

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ dependencies {
implementation 'org.controlsfx:controlsfx:11.1.2'

implementation 'org.jsoup:jsoup:1.15.3'
implementation 'com.konghq:unirest-java:3.13.11'
implementation 'com.konghq:unirest-java:3.13.12'

implementation 'org.slf4j:slf4j-api:2.0.3'
implementation "org.tinylog:tinylog-api:2.5.0"
Expand Down Expand Up @@ -217,7 +217,7 @@ dependencies {
testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
testImplementation "org.hamcrest:hamcrest-library:2.2"

checkstyle 'com.puppycrawl.tools:checkstyle:10.3.4'
checkstyle 'com.puppycrawl.tools:checkstyle:10.4'
// xjc needs the runtime as well for the ant task, otherwise it fails
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
Expand Down
4 changes: 2 additions & 2 deletions buildres/csl/csl-styles/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ GEM
mini_portile2 (2.8.0)
multipart-post (2.1.1)
namae (1.1.1)
nokogiri (1.13.6)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.6-x64-mingw32)
nokogiri (1.13.9-x64-mingw32)
racc (~> 1.4)
octokit (4.21.0)
faraday (>= 0.9)
Expand Down
139 changes: 139 additions & 0 deletions buildres/csl/csl-styles/arcadia-science.csl
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-US">
<!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
<info>
<title>Arcadia Science</title>
<id>http://www.zotero.org/styles/arcadia-science</id>
<link rel="self" href="http://www.zotero.org/styles/arcadia-science"/>
<link rel="template" href="http://www.zotero.org/styles/elife"/>
<link rel="documentation" href="https://research.arcadiascience.com/pub/perspective-publishing-round-one"/>
<author>
<name>Feridun Mert Celebi</name>
<email>mert.celebi@arcadiascience.com</email>
</author>
<author>
<name>Megan Hochstrasser</name>
<email>megan.hochstrasser@arcadiascience.com </email>
</author>
<category citation-format="author-date"/>
<summary>Arcadia's CSL style is a simplified version of the eLife CSL style that can be found on https://github.com/citation-style-language/styles/blob/master/elife.csl and https://citationstyles.org/</summary>
<updated>2022-06-27T17:41:25+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<macro name="author">
<names variable="author">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text macro="title"/>
</substitute>
</names>
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", " initialize-with=". "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<text variable="title" form="short" font-style="italic"/>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
</else>
</choose>
</substitute>
</names>
</macro>
<macro name="access">
<choose>
<if variable="DOI">
<text variable="DOI" prefix="https://doi.org/"/>
</if>
<else-if variable="URL">
<text variable="URL"/>
</else-if>
</choose>
</macro>
<macro name="title">
<choose>
<if type="report thesis" match="any">
<text variable="title"/>
<group prefix=" (" suffix=")" delimiter=" ">
<text variable="genre"/>
<text variable="number" prefix="No. "/>
</group>
</if>
<else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
<text variable="title"/>
<text macro="edition" prefix=", "/>
</else-if>
<else-if type="webpage">
<text variable="title"/>
</else-if>
<else>
<text variable="title"/>
</else>
</choose>
</macro>
<macro name="issued">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</macro>
<macro name="edition">
<group delimiter=" ">
<choose>
<if is-numeric="edition">
<number variable="edition" form="ordinal"/>
</if>
<else>
<text variable="edition" suffix="."/>
</else>
</choose>
<text value="ed"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
<sort>
<key macro="author"/>
<key macro="issued" sort="descending"/>
</sort>
<layout prefix="(" suffix=")" delimiter="; ">
<group delimiter=", ">
<text macro="author-short"/>
<text macro="issued"/>
<group delimiter=" ">
<label variable="locator" form="short"/>
<text variable="locator"/>
</group>
</group>
</layout>
</citation>
<bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
<sort>
<key macro="author"/>
<key macro="issued" sort="descending"/>
</sort>
<layout>
<group>
<text macro="author" suffix="."/>
<text macro="issued" strip-periods="false" prefix=" (" suffix=")"/>
<group prefix=". ">
<text macro="title"/>
</group>
</group>
<text macro="access" prefix=". "/>
</layout>
</bibliography>
</style>
16 changes: 0 additions & 16 deletions buildres/csl/csl-styles/dependent/veterinary-record-open.csl

This file was deleted.

44 changes: 19 additions & 25 deletions buildres/csl/csl-styles/harvard-university-of-abertay-dundee.csl
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
<contributor>
<name>Sebastian Karcher</name>
</contributor>
<contributor>
<name>Naman Merchant</name>
</contributor>
<category citation-format="author-date"/>
<category field="generic-base"/>
<summary>The Abertay version of the Harvard author-date style</summary>
<updated>2012-11-16T18:17:12+00:00</updated>
<updated>2022-09-11T21:02:45+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en-GB">
Expand Down Expand Up @@ -47,6 +50,7 @@
<names variable="author">
<name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
<label form="short" prefix=" (" suffix=")"/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
<text macro="anon"/>
Expand All @@ -56,6 +60,7 @@
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand All @@ -64,14 +69,7 @@
</names>
</macro>
<macro name="title">
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
<text variable="title" form="long" text-case="capitalize-first" font-style="normal" font-variant="normal"/>
</if>
<else>
<text variable="title" form="long" quotes="false" font-style="normal"/>
</else>
</choose>
<text variable="title"/>
</macro>
<macro name="publisher">
<group delimiter=", ">
Expand Down Expand Up @@ -145,22 +143,16 @@
</if>
</choose>
</macro>
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="by-cite">
<citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
<layout prefix="(" suffix=")" delimiter="; ">
<group delimiter=", ">
<group delimiter=" ">
<text macro="author-short"/>
<choose>
<if type="personal_communication" match="any">
<text value="pers. comm."/>
</if>
</choose>
<text macro="year-date"/>
</group>
<group delimiter=" ">
<label variable="locator" plural="never" form="short"/>
<text variable="page" form="short"/>
</group>
<text macro="author-short"/>
<choose>
<if type="personal_communication" match="any">
<text value="pers. comm."/>
</if>
</choose>
<text macro="year-date"/>
</group>
</layout>
</citation>
Expand All @@ -171,9 +163,11 @@
</sort>
<layout suffix=".">
<group delimiter=", ">
<group delimiter=" ">
<group delimiter="">
<text macro="author"/>
<text macro="year-date"/>
<group prefix=" (" suffix=")">
<text macro="year-date"/>
</group>
</group>
<text macro="title"/>
<group delimiter=" ">
Expand Down
Loading

0 comments on commit 8464bd6

Please sign in to comment.