Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into annotationProcessor
Browse files Browse the repository at this point in the history
* upstream/master: (47 commits)
  Fix copy pasting and delete via menu or key (#6740)
  Add instructions how to work with fetchers  (#6731)
  Autoinstall extension in chrome (#6442)
  Delete link after download (#6723)
  New translations JabRef_en.properties (Portuguese, Brazilian) (#6728)
  Bump pascalgn/automerge-action from v0.8.5 to v0.9.0 (#6736)
  Bump byte-buddy-parent from 1.10.13 to 1.10.14 (#6733)
  Bump mockito-core from 3.4.4 to 3.4.6 (#6734)
  Bump unirest-java from 3.8.06 to 3.9.00 (#6735)
  Bump org.beryx.jlink from 2.21.1 to 2.21.2 (#6732)
  Add testing interface, including a set of capabilities to tests for (#6687)
  Fix pasting on mac and linux (#6419)
  Add validation of "AUTHORS" file (#6722)
  Squashed 'src/main/resources/csl-styles/' changes from cacc4ee..827b986
  New Crowdin updates (#6721)
  Add missing AUTHORs
  Fix for issue 6639 (#6719)
  Fix more links
  Fix link
  New Crowdin updates (#6718)
  ...
  • Loading branch information
Siedlerchr committed Aug 9, 2020
2 parents 338f4db + 7d66c25 commit e158be2
Show file tree
Hide file tree
Showing 142 changed files with 6,601 additions and 1,661 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Merge pull requests
uses: pascalgn/automerge-action@v0.8.4
uses: pascalgn/automerge-action@v0.9.0
if: steps.waitforstatuschecks.outputs.status == 'success'
env:
MERGE_METHOD: "squash"
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check external href links in the documentation

on:
schedule:
# Run on the first of each month at 9:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
- cron: "0 9 1 * *"

jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Prepare markdown-link-check
run: mkdir docs/ROOT && cp CHANGELOG.md README.md docs/ROOT
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
use-verbose-mode: 'no'
config-file: 'mlc_config.json'
folder-path: 'docs/'
14 changes: 7 additions & 7 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ jobs:
name: Create installer and portable version for ${{ matrix.displayName }}

steps:
- name: Checkout source
uses: actions/checkout@v2
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.3
uses: gittools/actions/gitversion/setup@v0.9.4
with:
versionSpec: '5.2.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.3
uses: gittools/actions/gitversion/execute@v0.9.4
- name: Set up JDK
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -103,12 +103,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.3
uses: gittools/actions/gitversion/setup@v0.9.4
with:
versionSpec: '5.2.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.3
uses: gittools/actions/gitversion/execute@v0.9.4
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/refresh-csl-subtrees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
publish:
name: Refresh Citation Style Language Files
runs-on: ubuntu-latest
if: github.repository == 'JabRef/jabref'
steps:
- name: Checkout source
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches:
- snapcraft
schedule:
# run on each day
- cron: '33 4 * * *'
# run on each day
- cron: "33 4 * * *"

jobs:
build:
Expand All @@ -30,11 +30,11 @@ jobs:
# The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
# See snap/snapcraft.yml for details
- name: Build snap (1) Run build
uses: jhenstridge/snapcraft-build-action@v1
uses: snapcore/action-build@v1
id: snapcraft
- name: Build snap (2) Upload snap
if: ${{ steps.checksecrets.outputs.secretspresent }}
uses: jhenstridge/snapcraft-publish-action@v1
uses: snapcore/action-publish@v1
with:
store_login: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
snap: ${{ steps.snapcraft.outputs.snap }}
Expand Down
41 changes: 32 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@ jobs:
with:
args: CHANGELOG.md CONTRIBUTING.md README.md docs/
config: '.markdownlint.yml'
- name: Prepare markdown-link-check
run: mkdir docs/ROOT && cp CHANGELOG.md README.md docs/ROOT
- name: Run markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
use-verbose-mode: 'no'
config-file: 'mlc_config.json'
folder-path: 'docs/'
tests:
name: Unit tests
runs-on: ubuntu-latest
Expand Down Expand Up @@ -232,3 +223,35 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
checkauthors:
name: "Validate AUTHORS"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# full checkout needed for authors generation
fetch-depth: 0
- name: "Check AUTHORS"
id: authors_check
shell: bash
run: |
./scripts/generate-authors.sh
set +o pipefail
added=$(git diff HEAD --no-ext-diff --unified=0 -a --no-prefix | egrep "^\+[^+]" | sed "s/^\+//")
if [ -z "$added" ]; then
echo "::set-output name=newauthor::false"
echo "No authors added"
exit 0
fi
message="When merged, this pull request proposes to manually add the following to the [AUTHORS file](https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits). In case you want to raise a different proposal, please comment here (we will adapt our `.mailmap` file then) or [adjust your name in your git configuration](https://docs.github.com/en/github/using-git/setting-your-username-in-git). You will have to [rewrite your git history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) and use `git commit --author="John Doe <john@doe.org>"` for each changed commit.%0A%0A\`\`\`%0A${added//$'\n'/'%0A'}%0A\`\`\`%0A"
echo "::set-output name=message::$message"
echo "::set-output name=newauthor::true"
echo "New authors found"
- name: Comment PR
uses: unsplash/comment-on-pr@master
if: steps.authors_check.outputs.newauthor == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
msg: "${{ steps.authors_check.outputs.message }}"
check_for_duplicate_msg: true
8 changes: 8 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,11 @@ Mootez Saad <34676841+MootezSaaD@users.noreply.github.com> <mootez.saad@medtech.
Chen Yuheng <pass@chenyuheng.cn>
Dominik Voigt <43381984+DominikVoigt@users.noreply.github.com>
Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com> <cc.snethlage@gmail.com>
Daniel Price <64694785+daniel-price@users.noreply.github.com>
Cai Zhichun <54977532+braincident@users.noreply.github.com> <569120128@qq.com>
Hollyqqqqq <55199983+Hollyqqqqq@users.noreply.github.com> <11712639@mail.sustech.edu.cn>
Grzegorz Popiel <grzegorz.popiel@yahoo.com>
Tianjian Lei <185049857@qq.com>
Tianjian Lei <185049857@qq.com> <leitianjian@outlook.com>
Muhammad Arsalan Badar <arsalan_badar@intuit.com>
ZhouSky <11711923@mail.sustech.edu.cn>
4 changes: 2 additions & 2 deletions .markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ MD026:
punctuation: ".,;:!"

MD033:
# we have <a> tags with ids
allowed_elements: ['a']
# we have <a> tags with ids and superscript
allowed_elements: ['a', 'sup']
13 changes: 13 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Alain Vaucher
Aleksandrs Gusevs
Alessio Pollero
Alex Montgomery
Alex Petrov
Alex Tarrix
Alexander Girgis
Alexis Gallagher
Expand Down Expand Up @@ -55,6 +56,7 @@ Bitor Tonixa Biriato Balença
Brian Quistorff
Brian Van Essen
Cai Zhichun
Caleb Tillman
captain123
Carl Christian Snethlage
carlg0ransson
Expand All @@ -81,6 +83,7 @@ Cyrille d'Haese
Dale Visser
Daniel Bruehl
Daniel Mair
Daniel Price
Daniel Rodrigues
Daniel Svärd
David Gleich
Expand Down Expand Up @@ -137,7 +140,10 @@ Galileo Sartor
Gennadiy Stakhovskiy
Geoffrey Taerim Kim
Gert Renckens
Giovanni Caldarola
Giri
Goutam Lavudiya
Graeme Stewart
Gregor Herrmann
Grzegorz Popiel
guenesaydin
Expand All @@ -146,6 +152,7 @@ Hakan Duran
Hannes Restel
Harinda Samarasekara
HifeFish
Hollyqqqqq
hrandrianasolo
Hussain Arif
Igor Chernyavsky
Expand Down Expand Up @@ -231,6 +238,7 @@ Mathias Walter
Matthias Geiger
Matthias Mayr
Matthias Mueller
Matthijs van der Burgh
Mattia Bunel
Mattias Ulbrich
mcmoody
Expand All @@ -254,6 +262,7 @@ Morgan Lovato
Moritz Ringler
Morten Alver
ms111ds
Muhammad Arsalan Badar
Mélanie Tremblay
Nadeem Mahmood
Nathan Dunn
Expand Down Expand Up @@ -292,6 +301,7 @@ Quentin Fritz
Rachel Wu
Raik Nagel
razvan05
Redevectored
Renato Massao
Richard Schneeman
Robert Jäschke
Expand Down Expand Up @@ -349,6 +359,7 @@ Thomas F. Duellmann
Thomas Hu
Thomas Ilsche
Thorsten Dahlheimer
Tianjian Lei
Tim Kilian
Tim van Rossum
Tim Würtele
Expand All @@ -368,6 +379,7 @@ Valentin Pons
Venceslas Roullier
Victor Figueira
Victor Michelan
Vince250598
Vincent W. Yang
Vlad Topala
Waida Fan
Expand All @@ -386,3 +398,4 @@ zacmks
Zeabin
Zgarbul Andrey
Zhang Liang
ZhouSky
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We merged the main table tabs in the preferences dialog. [#6518](https://github.com/JabRef/jabref/pull/6518)
- We changed the command line option 'generateBibtexKeys' to the more generic term 'generateCitationKeys' while the short option remains 'g'.[#6545](https://github.com/JabRef/jabref/pull/6545)
- We improved the "Possible duplicate entries" window to remember its size and position throughout a session. [#6582](https://github.com/JabRef/jabref/issues/6582)
- We divided the toolbar into small parts, so if the application window is to small, only a part of the toolbar is moved into the chevron popup. [#6682](https://github.com/JabRef/jabref/pull/6682)
- We changed the layout for of the buttons in the Open Office side panel to ensure that the button text is always visible, specially when resizing. [#6639](https://github.com/JabRef/jabref/issues/6639)

### Fixed

Expand All @@ -71,7 +73,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where the INSPIRE fetcher was no longer working [#6229](https://github.com/JabRef/jabref/issues/6229)
- We fixed an issue where custom exports with an uppercase file extension could not be selected for "Copy...-> Export to Clipboard" [#6285](https://github.com/JabRef/jabref/issues/6285)
- We fixed the display of icon both in the main table and linked file editor. [#6169](https://github.com/JabRef/jabref/issues/6169)
- We fixed the paste entry command in the menu and toolbar, that did not do anything. [#6293](https://github.com/JabRef/jabref/issues/6293)
- We fixed an issue where the windows installer did not create an entry in the start menu [bug report in the forum](https://discourse.jabref.org/t/error-while-fetching-from-doi/2018/3)
- We fixed an issue where only the field `abstract` and `comment` were declared as multiline fields. Other fields can now be configured in the preferences using "Do not wrap the following fields when saving" [4373](https://github.com/JabRef/jabref/issues/4373)
- We fixed an issue where JabRef switched to discrete graphics under macOS [#5935](https://github.com/JabRef/jabref/issues/5935)
Expand All @@ -95,6 +96,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue with the creation of a group of cited entries which incorrectly showed the message that the library had been modified externally whenever saving the library. [#6420](https://github.com/JabRef/jabref/issues/6420)
- We fixed an issue with the creation of a group of cited entries. Now the file path to an aux file gets validated. [#6585](https://github.com/JabRef/jabref/issues/6585)
- We fixed an issue on Linux systems where the application would crash upon inotify failure. Now, the user is prompted with a warning, and given the choice to continue the session. [#6073](https://github.com/JabRef/jabref/issues/6073)
- We moved the search modifier buttons into the search bar, as they were not accessible, if autocompletion was disabled. [#6625](https://github.com/JabRef/jabref/issues/6625)

### Removed

Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ In case you are an instructor and want to use JabRef as software engineering exa

We welcome contributions to JabRef and encourage you to follow the GitHub workflow specified below. If you are not familiar with this type of workflow, take a look at GitHub's excellent overview on the [GitHub flow](https://guides.github.com/introduction/flow/index.html) and the explanation of [Feature Branch Workflow](https://atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) for the idea behind this kind of development.

1. Get the JabRef code on your local machine. Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](https://github.com/JabRef/jabref/wiki/Guidelines-for-setting-up-a-local-workspace).
1. Get the JabRef code on your local machine. Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
1. Fork the JabRef into your GitHub account.
2. Clone your forked repository on your local machine.
2. **Create a new branch** (such as `fix-for-issue-121`). Be sure to create a **separate branch** for each improvement you implement.
3. Do your work on the **new branch - not the master branch.** Refer to our [code howtos](https://github.com/JabRef/jabref/wiki/Code-Howtos) if you have questions about your implementation.
3. Do your work on the **new branch - not the master branch.** Refer to our [code howtos](https://devdocs.jabref.org/getting-into-the-code/code-howtos) if you have questions about your implementation.
4. Create a pull request. For an overview of pull requests, take a look at GitHub's [pull request help documentation](https://help.github.com/articles/about-pull-requests/).
5. In case your pull request is not yet complete or not yet ready for review, consider creating a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/) instead.

Expand Down Expand Up @@ -71,7 +71,7 @@ In case you do not have time to add a test case, we nevertheless ask you to at l

### When adding a library

Please try to use a version available at jCenter and add it to `build.gradle`.
Please try to use a version available at JCenter and add it to `build.gradle`.
In any case, describe the library at [external-libraries.txt](external-libraries.txt).
We need that information for our package maintainers (e.g., those of the [debian package](https://tracker.debian.org/pkg/jabref)).
Also add a txt file stating the license in `libraries/`.
Expand Down Expand Up @@ -119,7 +119,7 @@ Add the above snippet to the English translation file located at `src/main/resou

You can also directly run the specific test in your IDE.
The test "LocalizationConsistencyTest" is placed under `src/test/java/net.sf.jabref.logic.l10n/LocalizationConsistencyTest.java`
Find more information in the [JabRef Wiki](https://github.com/JabRef/jabref/wiki/Code-Howtos#using-localization-correctly).
Find more information in the [JabRef developer docs](https://devdocs.jabref.org/getting-into-the-code/code-howtos#using-localization-correctly).

## Create a pull request

Expand Down
Loading

0 comments on commit e158be2

Please sign in to comment.