diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 560538efe4a..3dd717dcc54 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,8 +11,8 @@ The title of the PR must not reference an issue, because GitHub does not support - [x] done; [ ] not done / not applicable --> -- [] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable) -- [] Tests created for changes (if applicable) -- [] Manually tested changed features in running JabRef (always required) -- [] Screenshots added in PR description (for UI changes) -- [] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not created an issue at or, even better, submitted a pull request to the documentation repository. +- [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable) +- [ ] Tests created for changes (if applicable) +- [ ] Manually tested changed features in running JabRef (always required) +- [ ] Screenshots added in PR description (for UI changes) +- [ ] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at or, even better, I submitted a pull request to the documentation repository. diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 90b11c087fb..053be6ce2f3 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -21,7 +21,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Merge pull requests - uses: pascalgn/automerge-action@v0.14.2 + uses: pascalgn/automerge-action@v0.14.3 if: steps.waitforstatuschecks.outputs.status == 'success' env: MERGE_METHOD: "merge" diff --git a/.github/workflows/check-outdated-dependencies.yml b/.github/workflows/check-outdated-dependencies.yml index 6aa2cf35268..0c0d8cde419 100644 --- a/.github/workflows/check-outdated-dependencies.yml +++ b/.github/workflows/check-outdated-dependencies.yml @@ -16,6 +16,7 @@ jobs: with: java-version: 16 distribution: 'adopt' + cache: 'gradle' - name: Look for outdated dependencies run: ./gradlew -q checkOutdatedDependencies - name: Report issues diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index b9826376797..485cbda548f 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -23,7 +23,8 @@ env: AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }} IEEEAPIKey: ${{ secrets.IEEEAPIKey }} OSXCERT: ${{ secrets.OSX_SIGNING_CERT }} - GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false + GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false + JAVA_OPTS: -Xmx4g jobs: build: @@ -64,15 +65,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - name: Restore gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7x-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7x- + cache: 'gradle' - name: Setup OSX key chain on OSX if: matrix.os == 'macos-latest' uses: apple-actions/import-codesign-certs@v1 @@ -105,7 +98,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/') 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}') diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml index 3dfa0fd798d..5466acc17bf 100644 --- a/.github/workflows/refresh-journal-lists.yml +++ b/.github/workflows/refresh-journal-lists.yml @@ -20,11 +20,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - uses: actions/cache@v1 - name: Restore gradle wrapper - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + cache: 'gradle' - name: Update journal lists run: | set +o pipefail diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 5428f97a7e5..00000000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Mark stale issues and pull requests - -on: - workflow_dispatch: - -jobs: - stale: - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v4 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - 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' diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml index ab390d68d0f..a201a7d19b2 100644 --- a/.github/workflows/tests-fetchers.yml +++ b/.github/workflows/tests-fetchers.yml @@ -38,15 +38,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - uses: actions/cache@v2 - name: Restore gradle cache - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + cache: 'gradle' - name: Run fetcher tests run: ./gradlew fetcherTest env: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f3ce29025ae..c975743419e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,6 +11,8 @@ env: SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }} AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }} IEEEAPIKey: ${{ secrets.IEEEAPIKey }} + GRADLE_OPTS: -Xmx4g + JAVA_OPTS: -Xmx4g jobs: checkstyle: @@ -28,15 +30,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - name: Restore gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7- + cache: 'gradle' - name: Run check style reporter uses: nikitasavinov/checkstyle-action@master with: @@ -60,15 +54,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - uses: actions/cache@v2 - name: Restore gradle cache - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7- + cache: 'gradle' - name: Run tests run: xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest env: @@ -100,15 +86,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - name: Restore gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7- + cache: 'gradle' - name: Run tests on PostgreSQL run: ./gradlew databaseTest --rerun-tasks env: @@ -142,15 +120,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - uses: actions/cache@v2 - name: Restore gradle cache - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7- + cache: 'gradle' - name: Run GUI tests run: xvfb-run --auto-servernum ./gradlew guiTest env: @@ -188,15 +158,7 @@ jobs: with: java-version: 16 distribution: 'adopt' - - name: Restore gradle cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle7- + cache: 'gradle' - name: Update test coverage metrics if: ${{ steps.checksecrets.outputs.secretspresent }} run: xvfb-run --auto-servernum ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash); diff --git a/CHANGELOG.md b/CHANGELOG.md index a82a7ec2ae2..a6731df1893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,11 +11,18 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Added +- We added import support for CFF files. [#7945](https://github.com/JabRef/jabref/issues/7945) - We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826) - We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838) - We improved the deduction of bib-entries from imported fulltext pdfs. [#7947](https://github.com/JabRef/jabref/pull/7947) - We added unprotect_terms to the list of bracketed pattern modifiers [#7826](https://github.com/JabRef/jabref/pull/7960) +- We added a dialog that allows to parse metadata from linked pdfs. [#7929](https://github.com/JabRef/jabref/pull/7929) - We added an icon picker in group edit dialog. [#6142](https://github.com/JabRef/jabref/issues/6142) +- We added a preference to Opt-In to JabRef's online metadata extraction service (Grobid) usage. [#8002](https://github.com/JabRef/jabref/pull/8002) +- We readded the possibility to display the search results of all databases ("Global Search"). It is shown in a separate window. [#4096](https://github.com/JabRef/jabref/issues/4096) +- We readded the possibility to keep the search string when switching tabs. It is implemented by a toggle button. [#4096](https://github.com/JabRef/jabref/issues/4096#issuecomment-575986882) +- We allowed the user to also preview the available citation styles in the preferences besides the selected ones [#8108](https://github.com/JabRef/jabref/issues/8108) +- We added an option to search the available citation styles by name in the preferences [#8108](https://github.com/JabRef/jabref/issues/8108) ### Changed @@ -25,14 +32,21 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We merged the barely used ImportSettingsTab and the CustomizationTab in the preferences into one single tab and moved the option to allow Integers in Edition Fields in Bibtex-Mode to the EntryEditor tab. [#7849](https://github.com/JabRef/jabref/pull/7849) - We moved the export order in the preferences from `File` to `Import and Export`. [#7935](https://github.com/JabRef/jabref/pull/7935) - We reworked the export order in the preferences and the save order in the library preferences. You can now set more than three sort criteria in your library preferences. [#7935](https://github.com/JabRef/jabref/pull/7935) +- The metadata-to-pdf actions now also embeds the bibfile to the PDF. [#8037](https://github.com/JabRef/jabref/pull/8037) +- The snap was updated to use the core20 base and to use lzo compression for better startup performance [#8109](https://github.com/JabRef/jabref/pull/8109) +- We improved the Drag and Drop behavior in the "Customize Entry Types" Dialog [#6338](https://github.com/JabRef/jabref/issues/6338) ### Fixed +- We fixed an issue where an exception ocurred when a linked online file was edited in the entry editor [#8008](https://github.com/JabRef/jabref/issues/8008) - We fixed an issue when checking for a new version when JabRef is used behind a corporate proxy. [#7884](https://github.com/JabRef/jabref/issues/7884) - We fixed some icons that were drawn in the wrong color when JabRef used a custom theme. [#7853](https://github.com/JabRef/jabref/issues/7853) - We fixed an issue where the `Aux file` on `Edit group` doesn't support relative sub-directories path to import. [#7719](https://github.com/JabRef/jabref/issues/7719). - We fixed an issue where it was impossible to add or modify groups. [#7912](https://github.com/JabRef/jabref/pull/793://github.com/JabRef/jabref/pull/7921) - We fixed an issue where exported entries from a Citavi bib containing URLs could not be imported [#7892](https://github.com/JabRef/jabref/issues/7882) +- We fixed an issue where the icons in the search bar had the same color, toggled as well as untoggled. [#8014](https://github.com/JabRef/jabref/pull/8014) +- We fixed an issue where typing an invalid UNC path into the "Main file directory" text field caused an error. [#8107](https://github.com/JabRef/jabref/issues/8107) +- We fixed an issue where "Open Folder" didn't select the file on macOS in Finder [#8130](https://github.com/JabRef/jabref/issues/8130) ### Removed diff --git a/MAINTAINERS b/MAINTAINERS index 1c8bdbad56b..baec36a6925 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7,3 +7,4 @@ Linus Dietz (since 2017) Carl Christian Snethlage (since 2020) Dominik Voigt (since 2020) Jonatan Askertop (since 2021) +Benedikt Tutzer (since 2021) diff --git a/README.md b/README.md index 011747998cb..3eb919e3b28 100644 --- a/README.md +++ b/README.md @@ -96,4 +96,9 @@ For IntelliJ IDEA, just import the project via a Gradle Import by pointing at th `gradlew test` executes all tests. We use [Github Actions](https://github.com/JabRef/jabref/actions) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Github will report any other failure. +## Sponsoring + +JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/) + + [JabRef]: https://www.jabref.org diff --git a/build.gradle b/build.gradle index 0c174bf1975..1f67140bb87 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,11 @@ plugins { id 'com.github.ben-manes.versions' version '0.39.0' - id 'org.javamodularity.moduleplugin' version '1.8.7' + id 'org.javamodularity.moduleplugin' version '1.8.10' id 'org.openjfx.javafxplugin' version '0.0.10' - id 'org.beryx.jlink' version '2.24.1' + id 'org.beryx.jlink' version '2.24.2' // nicer test outputs during running and completion // Homepage: https://github.com/radarsh/gradle-test-logger-plugin @@ -110,7 +110,7 @@ configurations { } javafx { - version = "16" + version = "17.0.0.1" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ] } @@ -125,17 +125,17 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0' implementation 'com.h2database:h2-mvstore:1.4.200' - implementation group: 'org.apache.tika', name: 'tika-core', version: '2.0.0' + implementation group: 'org.apache.tika', name: 'tika-core', version: '2.1.0' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 implementation 'org.bouncycastle:bcprov-jdk15on:1.69' implementation 'commons-cli:commons-cli:1.4' - implementation 'org.libreoffice:libreoffice:7.1.5' - implementation 'org.libreoffice:unoloader:7.1.5' + implementation 'org.libreoffice:libreoffice:7.2.1' + implementation 'org.libreoffice:unoloader:7.2.0' - implementation 'io.github.java-diff-utils:java-diff-utils:4.10' + implementation 'io.github.java-diff-utils:java-diff-utils:4.11' implementation 'info.debatty:java-string-similarity:2.0.0' antlr3 'org.antlr:antlr:3.5.2' @@ -144,21 +144,21 @@ dependencies { antlr4 'org.antlr:antlr4:4.9.2' implementation 'org.antlr:antlr4-runtime:4.9.2' - implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.12.0.202106070339-r' + implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.13.0.202109080827-r' - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.4' - implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.12.4' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0' + implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.0' implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.4' - implementation 'org.postgresql:postgresql:42.2.23' + implementation 'org.postgresql:postgresql:42.2.24' implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') { // causing module issues exclude module: 'oraclepki' } - implementation ('com.google.guava:guava:30.1.1-jre') { + implementation ('com.google.guava:guava:31.0-jre') { // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed exclude module: "jsr305" } @@ -171,16 +171,16 @@ dependencies { implementation 'de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT' implementation 'de.saxsys:mvvmfx:1.8.0' implementation 'com.tobiasdiez:easybind:2.2' - implementation 'org.fxmisc.flowless:flowless:0.6.5' + implementation 'org.fxmisc.flowless:flowless:0.6.6' implementation 'org.fxmisc.richtext:richtextfx:0.10.6' implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1' implementation 'com.jfoenix:jfoenix:9.0.10' implementation 'org.controlsfx:controlsfx:11.1.0' implementation 'org.jsoup:jsoup:1.14.2' - implementation 'com.konghq:unirest-java:3.11.12' + implementation 'com.konghq:unirest-java:3.13.0' - implementation 'org.slf4j:slf4j-api:2.0.0-alpha4' + implementation 'org.slf4j:slf4j-api:2.0.0-alpha5' implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-SNAPSHOT' implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j18-impl', version: '3.0.0-SNAPSHOT' implementation group: 'org.apache.logging.log4j', name: 'log4j-plugins', version: '3.0.0-SNAPSHOT' @@ -209,24 +209,23 @@ dependencies { implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1' - testImplementation 'io.github.classgraph:classgraph:4.8.114' - testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2' - testImplementation 'org.junit.platform:junit-platform-launcher:1.7.2' + testImplementation 'io.github.classgraph:classgraph:4.8.121' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' + testImplementation 'org.junit.platform:junit-platform-launcher:1.8.1' - testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.12' + testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.18' testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT' testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT' - testImplementation 'org.mockito:mockito-core:3.11.2' + testImplementation 'org.mockito:mockito-core:3.12.4' testImplementation 'org.xmlunit:xmlunit-core:2.8.2' testImplementation 'org.xmlunit:xmlunit-matchers:2.8.2' - testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.20.1' - testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.20.1' + testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.21.0' + testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.21.0' testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT" testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT" testImplementation "org.hamcrest:hamcrest-library:2.2" - checkstyle 'com.puppycrawl.tools:checkstyle:8.45.1' + checkstyle 'com.puppycrawl.tools:checkstyle:9.0.1' xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.3' } diff --git a/buildres/csl/csl-locales/Gemfile.lock b/buildres/csl/csl-locales/Gemfile.lock index e16789b793e..9064fb59dc5 100644 --- a/buildres/csl/csl-locales/Gemfile.lock +++ b/buildres/csl/csl-locales/Gemfile.lock @@ -20,7 +20,7 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) citeproc (1.0.10) namae (~> 1.0) @@ -47,11 +47,11 @@ GEM ruby-progressbar (~> 1.4) git_diff (0.4.3) hashdiff (0.3.7) - mini_portile2 (2.5.0) + mini_portile2 (2.6.1) multipart-post (2.1.1) namae (1.0.2) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) octokit (4.20.0) faraday (>= 0.9) diff --git a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl index 7991dd062dc..5ef97bd5710 100644 --- a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl +++ b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl @@ -155,8 +155,6 @@ - - diff --git a/buildres/csl/csl-styles/afte-journal.csl b/buildres/csl/csl-styles/afte-journal.csl deleted file mode 100644 index 30e8373ff47..00000000000 --- a/buildres/csl/csl-styles/afte-journal.csl +++ /dev/null @@ -1,232 +0,0 @@ - - diff --git a/buildres/csl/csl-styles/american-journal-of-sociology.csl b/buildres/csl/csl-styles/american-journal-of-sociology.csl index 9a53dccb80e..459a4125840 100644 --- a/buildres/csl/csl-styles/american-journal-of-sociology.csl +++ b/buildres/csl/csl-styles/american-journal-of-sociology.csl @@ -14,7 +14,7 @@ 0002-9602 1537-5390 - 2021-08-10T10:27:52+00:00 + 2021-08-21T15:46:13+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -56,10 +56,10 @@ - + - + @@ -158,18 +158,18 @@ - - - - + + + + + + - + - - @@ -185,8 +185,8 @@ - @@ -204,7 +204,7 @@ - + diff --git a/buildres/csl/csl-styles/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl index b5e538ee7c1..407fa190ca0 100644 --- a/buildres/csl/csl-styles/american-sociological-association.csl +++ b/buildres/csl/csl-styles/american-sociological-association.csl @@ -19,6 +19,11 @@ 2020-09-18T10:38:12+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License + + + version + + - + diff --git a/buildres/csl/csl-styles/demographic-research.csl b/buildres/csl/csl-styles/demographic-research.csl index 118a411cbf3..0c36a880f22 100644 --- a/buildres/csl/csl-styles/demographic-research.csl +++ b/buildres/csl/csl-styles/demographic-research.csl @@ -4,7 +4,7 @@ Demographic Research http://www.zotero.org/styles/demographic-research - + Ilya Kashnitsky diff --git a/buildres/csl/csl-styles/dependent/afte-journal.csl b/buildres/csl/csl-styles/dependent/afte-journal.csl new file mode 100644 index 00000000000..289d86fb540 --- /dev/null +++ b/buildres/csl/csl-styles/dependent/afte-journal.csl @@ -0,0 +1,15 @@ + + diff --git a/buildres/csl/csl-styles/dependent/human-molecular-genetics.csl b/buildres/csl/csl-styles/dependent/human-molecular-genetics.csl deleted file mode 100644 index e802f4ae027..00000000000 --- a/buildres/csl/csl-styles/dependent/human-molecular-genetics.csl +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl b/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl index 29e28e9a34c..3d8e8447929 100644 --- a/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl +++ b/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl @@ -4,8 +4,8 @@ International Studies Quarterly http://www.zotero.org/styles/international-studies-quarterly - - + + 1468-2478 diff --git a/buildres/csl/csl-styles/dependent/journal-of-cataract-and-refractive-surgery.csl b/buildres/csl/csl-styles/dependent/journal-of-cataract-and-refractive-surgery.csl index e2c59ec93d0..7356edcd741 100644 --- a/buildres/csl/csl-styles/dependent/journal-of-cataract-and-refractive-surgery.csl +++ b/buildres/csl/csl-styles/dependent/journal-of-cataract-and-refractive-surgery.csl @@ -2,15 +2,16 @@ diff --git a/buildres/csl/csl-styles/dependent/journal-of-dental-research.csl b/buildres/csl/csl-styles/dependent/journal-of-dental-research.csl deleted file mode 100644 index 77ae49f2512..00000000000 --- a/buildres/csl/csl-styles/dependent/journal-of-dental-research.csl +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/buildres/csl/csl-styles/dependent/journal-of-information-literacy.csl b/buildres/csl/csl-styles/dependent/journal-of-information-literacy.csl new file mode 100644 index 00000000000..9010f16a1c8 --- /dev/null +++ b/buildres/csl/csl-styles/dependent/journal-of-information-literacy.csl @@ -0,0 +1,16 @@ + + diff --git a/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl b/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl index d8266bc7f07..f5e6a1ea157 100644 --- a/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl +++ b/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl @@ -1,12 +1,10 @@ diff --git a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl index 9d40c019545..17572921f28 100644 --- a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl +++ b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl @@ -1,15 +1,18 @@ diff --git a/buildres/csl/csl-styles/human-molecular-genetics.csl b/buildres/csl/csl-styles/human-molecular-genetics.csl new file mode 100644 index 00000000000..66fb816caf1 --- /dev/null +++ b/buildres/csl/csl-styles/human-molecular-genetics.csl @@ -0,0 +1,195 @@ + + diff --git a/buildres/csl/csl-styles/journal-of-dental-research.csl b/buildres/csl/csl-styles/journal-of-dental-research.csl new file mode 100644 index 00000000000..58dde70721d --- /dev/null +++ b/buildres/csl/csl-styles/journal-of-dental-research.csl @@ -0,0 +1,254 @@ + + diff --git a/buildres/csl/csl-styles/journal-of-microbiology.csl b/buildres/csl/csl-styles/journal-of-microbiology.csl new file mode 100644 index 00000000000..dd9305f26ad --- /dev/null +++ b/buildres/csl/csl-styles/journal-of-microbiology.csl @@ -0,0 +1,151 @@ + + diff --git a/buildres/csl/csl-styles/journal-of-paleontology.csl b/buildres/csl/csl-styles/journal-of-paleontology.csl index 9a47a1b3ab8..1f1fdcefdeb 100644 --- a/buildres/csl/csl-styles/journal-of-paleontology.csl +++ b/buildres/csl/csl-styles/journal-of-paleontology.csl @@ -5,7 +5,8 @@ http://www.zotero.org/styles/journal-of-paleontology - + + Martin R. Smith martins@gmail.com @@ -15,7 +16,7 @@ 0022-3360 1937-2337 - 2019-03-05T08:19:38+00:00 + 2021-08-12T08:51:54+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -32,8 +33,8 @@ - - @@ -73,8 +74,8 @@ - + @@ -83,7 +84,7 @@ - + @@ -150,50 +151,55 @@ - - - - - - - - - + + + - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + diff --git a/buildres/csl/csl-styles/les-cahiers-du-journalisme.csl b/buildres/csl/csl-styles/les-cahiers-du-journalisme.csl new file mode 100644 index 00000000000..dad21c34e7b --- /dev/null +++ b/buildres/csl/csl-styles/les-cahiers-du-journalisme.csl @@ -0,0 +1,328 @@ + + diff --git a/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl b/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl new file mode 100644 index 00000000000..4e08216a93b --- /dev/null +++ b/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl @@ -0,0 +1,1461 @@ + + diff --git a/buildres/csl/csl-styles/pain-medicine.csl b/buildres/csl/csl-styles/pain-medicine.csl new file mode 100644 index 00000000000..d0ff534657a --- /dev/null +++ b/buildres/csl/csl-styles/pain-medicine.csl @@ -0,0 +1,329 @@ + + diff --git a/buildres/csl/csl-styles/quaderni.csl b/buildres/csl/csl-styles/quaderni.csl new file mode 100644 index 00000000000..4bc19287d2d --- /dev/null +++ b/buildres/csl/csl-styles/quaderni.csl @@ -0,0 +1,194 @@ + + diff --git a/buildres/csl/csl-styles/renamed-styles.json b/buildres/csl/csl-styles/renamed-styles.json index 1b3131a1857..d5396d84489 100644 --- a/buildres/csl/csl-styles/renamed-styles.json +++ b/buildres/csl/csl-styles/renamed-styles.json @@ -63,6 +63,7 @@ "canadian-medical-association-journal": "cmaj", "canadian-veterinary-journal": "the-canadian-veterinary-journal", "cancer-epidemiology-biomarkers-prevention": "cancer-epidemiology-biomarkers-and-prevention", + "cardiff-university-biosi-and-carbs-harvard": "cardiff-university-harvard", "cardiovascular-pharmacology-and-therapeutics": "journal-of-cardiovascular-pharmacology-and-therapeutics", "catalysts-and-catalysed-reactions": "royal-society-of-chemistry", "central-african-journal-of-medicine": "the-central-african-journal-of-medicine", @@ -294,7 +295,7 @@ "graefes-archive-and-experimental-ophthalmology": "graefes-archive-for-clinical-and-experimental-ophthalmology", "gruppendynamik-und-organisationsberatung": "gruppe-interaktion-organisation-zeitschrift-fur-angewandte-organisationspsychologie", "harvard-anglia-ruskin": "harvard-anglia-ruskin-university", - "harvard-cardiff-university-biosi": "cardiff-university-biosi-and-carbs-harvard", + "harvard-cardiff-university-biosi": "cardiff-university-harvard", "harvard-de-montfort-university": "de-montfort-university-harvard", "harvard-oxford-brookes-university": "harvard-cite-them-right", "harvard-sheffield": "harvard-the-university-of-sheffield-town-and-regional-planning", diff --git a/buildres/csl/csl-styles/sist02.csl b/buildres/csl/csl-styles/sist02.csl index ec9324a2294..46f485c9b4e 100644 --- a/buildres/csl/csl-styles/sist02.csl +++ b/buildres/csl/csl-styles/sist02.csl @@ -67,6 +67,12 @@ diff --git a/buildres/csl/csl-styles/style-manual-for-authors-editors-and-printers-6th-edition-snooks-co.csl b/buildres/csl/csl-styles/style-manual-for-authors-editors-and-printers-6th-edition-snooks-co.csl new file mode 100644 index 00000000000..5aa6cba1baa --- /dev/null +++ b/buildres/csl/csl-styles/style-manual-for-authors-editors-and-printers-6th-edition-snooks-co.csl @@ -0,0 +1,184 @@ + + diff --git a/buildres/csl/csl-styles/system-dynamics-review.csl b/buildres/csl/csl-styles/system-dynamics-review.csl index 90fe484411e..aa11cee4eed 100644 --- a/buildres/csl/csl-styles/system-dynamics-review.csl +++ b/buildres/csl/csl-styles/system-dynamics-review.csl @@ -14,7 +14,7 @@ 0883-7066 1099-1727 - 2021-07-30T12:42:58+00:00 + 2021-08-17T08:41:36+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -118,7 +118,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl b/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl index bf2884c4427..9ce9f5531ba 100644 --- a/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl +++ b/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl @@ -4,7 +4,7 @@ The Journal of Hellenic Studies http://www.zotero.org/styles/the-journal-of-hellenic-studies - + Polly Low diff --git a/buildres/csl/csl-styles/ucl-university-college-apa.csl b/buildres/csl/csl-styles/ucl-university-college-apa.csl index 813e0df4579..2f049d65f2d 100644 --- a/buildres/csl/csl-styles/ucl-university-college-apa.csl +++ b/buildres/csl/csl-styles/ucl-university-college-apa.csl @@ -1,84 +1,25 @@ diff --git a/buildres/csl/csl-styles/universidad-autonoma-cidudad-juarez-estilo-latino-humanistico.csl b/buildres/csl/csl-styles/universidad-autonoma-cidudad-juarez-estilo-latino-humanistico.csl index d392530ea78..4d5f2ebc6d9 100644 --- a/buildres/csl/csl-styles/universidad-autonoma-cidudad-juarez-estilo-latino-humanistico.csl +++ b/buildres/csl/csl-styles/universidad-autonoma-cidudad-juarez-estilo-latino-humanistico.csl @@ -383,7 +383,7 @@ - + diff --git a/buildres/csl/csl-styles/universitat-zu-koln-seminar-fur-abwl-und-finanzierungslehre.csl b/buildres/csl/csl-styles/universitat-zu-koln-seminar-fur-abwl-und-finanzierungslehre.csl index 7ceb51054b8..5ec97bc82df 100644 --- a/buildres/csl/csl-styles/universitat-zu-koln-seminar-fur-abwl-und-finanzierungslehre.csl +++ b/buildres/csl/csl-styles/universitat-zu-koln-seminar-fur-abwl-und-finanzierungslehre.csl @@ -12,7 +12,7 @@ Stil für die Universität zu Köln - Seminar für ABWL und Finanzierungslehre, Version Juni 2015. - 2018-06-09T19:36:01+00:00 + 2021-08-27T19:36:01+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -126,7 +126,7 @@ - + @@ -167,7 +167,7 @@ - + diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl index 5835ad5f06d..a94d029dea5 100644 --- a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl +++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl @@ -397,7 +397,7 @@ - + @@ -450,7 +450,10 @@ - + + diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl index 7b6f0a146e1..fe647fab2f9 100644 --- a/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl +++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl @@ -1,11 +1,11 @@