forked from JabRef/jabref
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into DavidOWade/main
* upstream/main: (30 commits) New translations JabRef_en.properties (German) (JabRef#9336) Fix Abbreviation for Escaped Ampersand (JabRef#9288) Fix font size preference not updating in preference dialog 8386 (JabRef#9287) New Crowdin updates (JabRef#9333) Refresh example styles Squashed 'buildres/csl/csl-styles/' changes from 4eee79a..13fd98e Bump unirest-java from 3.13.11 to 3.13.12 (JabRef#9330) Bump checkstyle from 10.3.4 to 10.4 (JabRef#9331) Bump gittools/actions from 0.9.14 to 0.9.15 (JabRef#9332) Group context menu presents relevant options depending on number of subgroups (JabRef#9286) Removed BibTeX file type and included HTML and Markdown types (JabRef#9318) Fix issue: Auto-linking files with safe character replacements JabRef#9267 (JabRef#9316) Fix for issue 8806: Button highlights doesn't respect rounded corners (JabRef#9320) New Crowdin updates (JabRef#9324) Update CHANGELOG.md Try to relocate listener binding (JabRef#9238) Changed the messages after importing unlinked local files to past passive tense. (JabRef#9308) Changed the color of found text from red to high contrast (JabRef#9315) New Crowdin updates (JabRef#9317) Add skips for MacOS X build (JabRef#9305) ...
- Loading branch information
Showing
68 changed files
with
1,084 additions
and
256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: GreetingFirstTimeCodeContribution | ||
|
|
||
| on: | ||
| issues: | ||
| types: | ||
| - labeled | ||
|
|
||
| jobs: | ||
| GreetingFirstTimeCodeContribution: | ||
| if: ${{ github.event.label.name == 'FirstTimeCodeContribution' }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| issues: write | ||
| steps: | ||
| - name: GreetingFirstTimeCodeContribution | ||
| uses: peter-evans/create-or-update-comment@v2 | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| issue-number: ${{ github.event.issue.number }} | ||
| body: | | ||
| As a general advice for newcomers: check out [Contributing](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) for a start. Also, [guidelines for setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace) is worth having a look at. | ||
| Feel free to ask here at GitHub, if you have any issue related questions. If you have questions about how to setup your workspace use JabRef's [Gitter](https://gitter.im/JabRef/jabref) chat. Try to open a (draft) pull-request early on, so that people can see you are working on the issue and so that they can see the direction the pull request is heading towards. This way, you will likely receive valuable feedback. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,12 +16,12 @@ jobs: | |
| env: | ||
| GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| - name: Auto approve | ||
| uses: hmarr/auto-approve-action@v3.0.0 | ||
| uses: hmarr/auto-approve-action@v3.1.0 | ||
| if: steps.waitforstatuschecks.outputs.status == 'success' | ||
| with: | ||
| github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
| - name: Merge pull requests | ||
| uses: pascalgn/[email protected].3 | ||
| uses: pascalgn/[email protected].5 | ||
| if: steps.waitforstatuschecks.outputs.status == 'success' | ||
| env: | ||
| MERGE_METHOD: "merge" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| with: | ||
| versionSpec: "5.x" | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].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 | ||
|
|
@@ -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}') | ||
|
|
@@ -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/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| with: | ||
| versionSpec: '5.x' | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| - name: Get linux binaries | ||
| uses: actions/download-artifact@master | ||
| with: | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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>[email protected]</email> | ||
| </author> | ||
| <author> | ||
| <name>Megan Hochstrasser</name> | ||
| <email>[email protected] </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> |
Oops, something went wrong.