Skip to content

Commit

Permalink
Merge branch 'master' into pr/7186
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwiernik
bwiernik committed Sep 11, 2024
2 parents f490815 + 8c963b5 commit 610004b
Show file tree
Hide file tree
Showing 57 changed files with 6,854 additions and 452 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/merge.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
DISTRIBUTION_UPDATER_TOKEN: "${{ secrets.DISTRIBUTION_UPDATER_TOKEN }}"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: github.event_name == 'push'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: github.event_name == 'workflow_dispatch'
with:
fetch-depth: 0
Expand All @@ -35,7 +35,7 @@ jobs:
id: release
run: echo ::set-output name=branch::v1.0.2
- name: Checkout release branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ steps.release.outputs.branch }}
path: './release'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sheldon.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
# labels to a PR
# https://securitylab.github.com/research/github-actions-preventing-pwn-requests
- name: Checkout repo for OWNER TEST
uses: actions/checkout@v3
uses: actions/checkout@v4
if: contains(github.event.pull_request.labels.*.name, 'safe to test')
with:
ref: ${{ github.event.pull_request.head.ref }}

# otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
- name: Checkout base repo for pull-request test
uses: actions/checkout@v3
uses: actions/checkout@v4
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
- name: Checkout pull-request
uses: actions/checkout@v3
uses: actions/checkout@v4
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down
143 changes: 143 additions & 0 deletions american-journal-of-cancer-research.csl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<?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="sort-only" default-locale="en-US">
<info>
<title>American Journal of Cancer Research</title>
<title-short>AJCR</title-short>
<id>http://www.zotero.org/styles/american-journal-of-cancer-research</id>
<link href="http://www.zotero.org/styles/american-journal-of-cancer-research" rel="self"/>
<link href="http://www.zotero.org/styles/xenotransplantation" rel="template"/>
<link href="https://e-century.us/web/journal_author_info.php?journal=ajcr" rel="documentation"/>
<author>
<name>Patrick O'Brien</name>
</author>
<category citation-format="numeric"/>
<category field="medicine"/>
<eissn>2156-6976</eissn>
<updated>2024-08-30T07:48:39+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">
<group suffix=".">
<names variable="author">
<name delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
</substitute>
</names>
</group>
</macro>
<macro name="editor">
<names variable="editor">
<label form="verb" text-case="capitalize-first" suffix=" "/>
<name name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="title">
<text variable="title" quotes="false"/>
</macro>
<macro name="year">
<date variable="issued">
<date-part name="year"/>
</date>
</macro>
<macro name="journal">
<group delimiter=" ">
<text variable="container-title" form="short" strip-periods="true"/>
<text macro="year" suffix=";"/>
<text variable="volume"/>
</group>
</macro>
<macro name="conference">
<group delimiter=", ">
<text variable="container-title"/>
<group delimiter=" ">
<text variable="publisher"/>
<text macro="year"/>
</group>
</group>
</macro>
<macro name="book-publisher">
<group delimiter=", ">
<text variable="publisher-place"/>
<text variable="publisher"/>
<text macro="year"/>
</group>
</macro>
<macro name="edition">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<text term="edition" form="short"/>
</group>
</if>
<else>
<text variable="edition"/>
</else>
</choose>
</macro>
<citation>
<sort>
<key variable="citation-number"/>
</sort>
<layout prefix="[" suffix="]" delimiter=",">
<group delimiter=":">
<text variable="citation-number"/>
<text variable="locator"/>
</group>
</layout>
</citation>
<bibliography second-field-align="flush" entry-spacing="0">
<layout suffix=".">
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" suffix=". "/>
<text macro="title" suffix=". "/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<group delimiter=". ">
<text macro="edition"/>
<text macro="book-publisher"/>
</group>
</if>
<else-if type="paper-conference">
<group delimiter=", ">
<text macro="conference"/>
<text variable="page"/>
</group>
</else-if>
<else-if type="chapter paper-conference" match="any">
<group delimiter=". ">
<text variable="container-title"/>
<text macro="edition"/>
<text macro="editor"/>
<group delimiter=", ">
<text macro="book-publisher"/>
<group delimiter=" ">
<label variable="page" form="short"/>
<text variable="page"/>
</group>
</group>
</group>
</else-if>
<else-if type="article-journal">
<group>
<text macro="journal"/>
<text variable="page" prefix=": "/>
</group>
</else-if>
<else>
<group delimiter=", ">
<group delimiter=" ">
<text variable="container-title"/>
<text variable="volume"/>
</group>
<text macro="year"/>
<text variable="page"/>
<text variable="URL" prefix=" "/>
</group>
</else>
</choose>
</layout>
</bibliography>
</style>
2 changes: 1 addition & 1 deletion american-physics-society.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<else>
<!--article-journal article-magazine article-newspaper review review-book-->
<group delimiter=", ">
<text variable="title" text-case="title" font-style="italic"/>
<text variable="title"/>
<group delimiter=" ">
<text variable="container-title" form="short" text-case="title"/>
<group delimiter=", ">
Expand Down
32 changes: 6 additions & 26 deletions bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</author>
<category citation-format="author-date"/>
<category field="generic-base"/>
<updated>2024-02-15T10:55:41+00:00</updated>
<updated>2024-05-15T10:12:52+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="de">
Expand Down Expand Up @@ -86,11 +86,7 @@
<group delimiter=", ">
<group delimiter=" ">
<text term="accessed" text-case="capitalize-first"/>
<date variable="accessed">
<date-part name="day" form="numeric-leading-zeros" suffix="."/>
<date-part name="month" form="numeric-leading-zeros" suffix="."/>
<date-part name="year"/>
</date>
<date form="numeric" variable="accessed"/>
</group>
<choose>
<if match="any" variable="DOI">
Expand Down Expand Up @@ -248,11 +244,7 @@
<else-if type="article-newspaper article-magazine" match="any">
<group delimiter=", ">
<text variable="container-title"/>
<date variable="issued">
<date-part name="day" form="numeric-leading-zeros" suffix="."/>
<date-part name="month" form="numeric-leading-zeros" suffix="."/>
<date-part name="year"/>
</date>
<date form="numeric" variable="issued"/>
<group delimiter=" ">
<label variable="page" form="short"/>
<text variable="page"/>
Expand All @@ -267,30 +259,18 @@
</group>
<group delimiter=", ">
<text variable="dimensions"/>
<date variable="issued">
<date-part name="day" form="numeric-leading-zeros" suffix="."/>
<date-part name="month" form="numeric-leading-zeros" suffix="."/>
<date-part name="year"/>
</date>
<date form="numeric" variable="issued"/>
</group>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<date variable="issued">
<date-part name="day" form="numeric-leading-zeros" suffix="."/>
<date-part name="month" form="numeric-leading-zeros" suffix="."/>
<date-part name="year"/>
</date>
<date form="numeric" variable="submitted"/>
</else-if>
<else-if type="interview" match="any">
<group delimiter=" ">
<text term="interview" text-case="capitalize-first"/>
<text term="from"/>
<date variable="issued">
<date-part name="day" form="numeric-leading-zeros" suffix="."/>
<date-part name="month" form="numeric-leading-zeros" suffix="."/>
<date-part name="year"/>
</date>
<date form="numeric" variable="issued"/>
</group>
</else-if>
<else>
Expand Down
Loading

0 comments on commit 610004b

Please sign in to comment.