Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from JabRef:master #550

Open
wants to merge 758 commits into
base: master
Choose a base branch
from
Open

[pull] master from JabRef:master #550

wants to merge 758 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 1, 2020

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Jun 1, 2020
@pull pull bot added the merge-conflict Resolve conflicts manually label Jun 15, 2020
dependabot bot and others added 28 commits September 28, 2020 08:47
Bumps [unirest-java](https://github.com/Kong/unirest-java) from 3.10.00 to 3.11.00.
- [Release notes](https://github.com/Kong/unirest-java/releases)
- [Changelog](https://github.com/Kong/unirest-java/blob/main/CHANGELOG.md)
- [Commits](Kong/unirest-java@v3.10.00...v3.11.00)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps me.champeau.gradle.jmh from 0.5.1 to 0.5.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) from 4.7 to 4.8.
- [Release notes](https://github.com/java-diff-utils/java-diff-utils/releases)
- [Changelog](https://github.com/java-diff-utils/java-diff-utils/blob/master/CHANGELOG.md)
- [Commits](java-diff-utils/java-diff-utils@java-diff-utils-parent-4.7...java-diff-utils-parent-4.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.11 to 3.5.13.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.5.11...v3.5.13)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [byte-buddy-parent](https://github.com/raphw/byte-buddy) from 1.10.15 to 1.10.16.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](raphw/byte-buddy@byte-buddy-1.10.15...byte-buddy-1.10.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.36.1 to 8.36.2.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](checkstyle/checkstyle@checkstyle-8.36.1...checkstyle-8.36.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Kuncevich <kuncevich_andrei@mail.ru>
* 'copy key and link' from right-click menu creates a string that is not a url. it includes the url, but it also includes the key... it works now

* updated authorlist

* added entry to change log

* 'copy key and link' now sets html content again and also sets a fallback string

* Update src/main/java/org/jabref/gui/edit/CopyMoreAction.java

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

* CHANGELOG.md

* Remove obsolete method

Remove obsolete method

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
6fab78b Create physiologia-plantarum.csl (#5040)
58d65fd Create cureus.csl (#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (#5041)
39a3fbb Create finance-and-society.csl (#5043)
cf39e19 Create canadian-biosystems-engineering-journal (#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (#5024)
776002d create new independent style for deutsches-arzteblatt.csl (#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (#5036)
13e0a0b Update iso690-full-note-cs.csl (#5033)
3af2034 Create acta-medica-peruana.csl (#5037)
dcbe494 Create historia-scribere.csl (#5038)
2174323 make addiction-biology.csl an AMA dependent (#5028)
b01aea8 Update ios-press-books.csl (#5030)
ae6d0e2 add doi for article-journal for ASA.csl (#5031)
d537025 Create organised-sound.csl (#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (#5026)
3dc5157 Update amerindia.csl (#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
…rea (#6965)

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
shutil.which() returns an str and not a pathlib.Path. Therefore, we need
to check if which() actually returns something and if so, we should
convert it to a pathlib.Path such that JABREF_PATH is always of the same
type.

Also, try locating JabRef in addition to jabref in the user's PATH.
* Fix could not connect to LO on Mac OSX

Refactor

* add link to pr

* Update CHANGELOG.md

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

* Update CHANGELOG.md

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

* add Logger for exception

* fix changelog dot

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
Arxiv Test is failing with the search phrase, because both queries return the same result
* Squashed 'src/main/resources/csl-styles/' changes from bf698ac..827b986

827b986 add DOI preprint to american-society-for-microbiology.csl (#4946)
7cab2f7 Create depro-ufs.csl (#4947)
2fcda1f Create journal-of-sport-science-and-medicine.csl (#4949)
cd457d4 Update american-marketing-association.csl (#4945)
cacc4ee Create nejm-catalyst.csl (#4943)
bd769b9 Update and rename dependent/chinese-medical-journal.csl to chinese-me… (#4941)
1f706cd Update health-services-research.csl (#4939)
76bcd1d Update journal-of-the-royal-society-of-western-australia.csl (#4932)
e79640e Create afro-asia.csl (#4934)
c601aa4 Update lancaster-university-harvard.csl (#4938)
184fd90 Update collection-du-centre-jean-berard.csl (#4936)
82f9aec fix et-al & add DOI thyroid.csl (#4937)
4af169f Create universidade-estadual-de-alagoas-uneal-abnt (#4885)
47165b3 Update and rename medical-physics.csl to dependent/medical-physics.csl (AMA) (#4905)
3cab27d Update thieme-german.csl (#4931)
eb2c977 Create zeitschrift-fur-zahnarztliche-implantologie.csl (#4925)
4adb1ea Create karstenia.csl (#4929)
530a136 Fix author substitute in Universita Cattolica

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 827b986

* Squashed 'src/main/resources/csl-styles/' changes from 827b986..eb0d37e

eb0d37e Create natbib-plainnat-author-dat.csl (#4967)
fb1592a Update journal-of-fish-biology.csl (#4969)
f6876cb Update .travis.yml (#4970)
d6d400b Create london-review-of-international-law.csl (#4966)
d2a5ae1 Update harvard-stellenbosch-university.csl (#4965)
9c62141 Create phytopathologia-mediterranea.csl (#4964)
8ca2ea1 Update historical-materialism.csl (#4960)
80456dc Update historical-materialism.csl
be2d910 Update historical-materialism.csl
1d1cf09 Create atlande.csl (#4930)
89f41d4 Create juristische-zitierweise-oeffentliches-recht.csl (#4944)
8c677a0 Create korean-journal-of-gastroenterology.csl (#4954)
eadb950 Create historical-materialism.csl (#4955)
5553dcd Create revista-materia.csl (#4957)
d23a3ab Bug fix in APA 6 original publication macro (#4959)
66f9974 Always print publisher in APA 6th edition (#4899)
868809c Create agora.csl (#4940)
99c19c3 Update anthropologie-et-societes.csl (#4952)
ee17423 Create critical-reviews-in-solid-state-and-materials-science.csl (#4951)
7a13a7d Create korean-journal-of-internal-medicine.csl (#4953)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: eb0d37e

* Adapt arxiv phrase test

Co-authored-by: github actions <jabrefmail+webfeedback@gmail.com>
AtrusRiven and others added 23 commits December 19, 2020 19:26
…on to #7093) (#7185)

* Update JabRefPreferences.java

Modifications in Entry Preview (7093 and 7083)

* Update JabRefPreferences.java

Minor Correction

* Additions for #7185

"=" deleted
* Remove journal abbrev deteted in entry editor

Fixes  #3925

* add changelog
Bumps org.beryx.jlink from 2.22.3 to 2.23.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [archunit-junit5-engine](https://github.com/TNG/ArchUnit) from 0.14.1 to 0.15.0.
- [Release notes](https://github.com/TNG/ArchUnit/releases)
- [Commits](TNG/ArchUnit@v0.14.1...v0.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [byte-buddy-parent](https://github.com/raphw/byte-buddy) from 1.10.18 to 1.10.19.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](raphw/byte-buddy@byte-buddy-1.10.18...byte-buddy-1.10.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.8.94 to 4.8.97.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](classgraph/classgraph@classgraph-4.8.94...classgraph-4.8.97)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps xmpbox from 2.0.21 to 2.0.22.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [guava](https://github.com/google/guava) from 30.0-jre to 30.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps unoloader from 7.0.3 to 7.0.4.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [archunit-junit5-api](https://github.com/TNG/ArchUnit) from 0.14.1 to 0.15.0.
- [Release notes](https://github.com/TNG/ArchUnit/releases)
- [Commits](TNG/ArchUnit@v0.14.1...v0.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps fontbox from 2.0.21 to 2.0.22.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps pdfbox from 2.0.21 to 2.0.22.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
* Speedup processResources

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>

* Try path without ./ at the beginning

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
* Output java error on console, too

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>

* Use LOGGER instead of System.err

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>

* remove check

* remove properties no longer needed

* remove from gradle

* fix l10n

Co-authored-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
* Disable composite fetcher test

Signed-off-by: Dominik Voigt <Dominik.ingo.voigt@gmail.com>

* Fix citeseerx test
Enable doi search for complex search queries

Signed-off-by: Dominik Voigt <Dominik.ingo.voigt@gmail.com>

* Fix JSTOR searchById

Signed-off-by: Dominik Voigt <Dominik.ingo.voigt@gmail.com>

* Fix TitleFetcher

Signed-off-by: Dominik Voigt <Dominik.ingo.voigt@gmail.com>

* Update src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java

* Add missing import

Signed-off-by: Dominik Voigt <Dominik.ingo.voigt@gmail.com>

Co-authored-by: Christoph <siedlerkiller@gmail.com>
* New translations JabRef_en.properties (Turkish)

* New translations JabRef_en.properties (Indonesian)

* New translations JabRef_en.properties (Portuguese, Brazilian)

* New translations JabRef_en.properties (Chinese Simplified)

* New translations JabRef_en.properties (Russian)

* New translations JabRef_en.properties (French)

* New translations JabRef_en.properties (Dutch)

* New translations JabRef_en.properties (Japanese)

* New translations JabRef_en.properties (Italian)

* New translations JabRef_en.properties (Greek)

* New translations JabRef_en.properties (German)

* New translations JabRef_en.properties (Spanish)

* New translations JabRef_en.properties (Tagalog)
* #5890 added Error Dialog

AutoSetFileLinksUtil:
-> imported JabRefDialogService and Localization
->showErrorDialogAndWait(...)

I am currently having trouble writing a test

* Fix errorDialog AutoSetFileLinks

Fixed mistake in first commit.

.lists all exceptions
.notifies user of error via DialogService

* Fix notifying in AutoSetFileLinksAction

- add  returnFileExceptions() in AutoSetFileLinksUtil
- add if ( 'there are exceptions' ) -> notify user in AutoSetFileLinkAction (placement still unclear, might be changed later)

* Fixed checkstyle error in AutoSetFileLinksUtilTest

* Fixed import order in JabRefFrame

* Update JabRefFrame.java

* Refactored to fail fast

* Update JabRef_en.properties

* Included remarks

* Merge error

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Co-authored-by: Carl Christian Snethlage <cc.snethlage@gmail.com>
@koppor koppor deleted the branch joe9111:master May 16, 2021 20:23
@koppor koppor deleted the branch joe9111:master June 16, 2021 19:19
@koppor koppor deleted the branch joe9111:master April 18, 2022 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.