Skip to content

Commit 0a54822

Browse files
committed
Merge remote-tracking branch 'upstream/master' into jdk9
* upstream/master: (229 commits) Try to fix not on FX thread for search and autocomplete (#4618) Convert DuplicateResolverDialog to javafx (#4601) Fix for BibTex source tab parsing issue if field contains {} (#4581) Convert OO/LO SidePanel to javafx (#4341) Convert "Customize importer" dialog to JavaFX (#4608) Convert "From Aux file" dialog to JavaFX (#4607) Convert "Show preferences" dialog to JavaFX (#4605) Fix not on FX thread exception Force javafx to run thread (#4604) Convert new version dialog to JavaFX (#4602) Add a variable to track the change in preview style (#4587) Solution for submitting dialog with Ctrl + Enter (#4496) (#4592) Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599) Fix overlapping font in id entry type (#4595) update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one Update journalList.txt Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546) Don't set column sort type at startup (#4577) Add uncaught exception message (#4565) Converts integrity check dialog to JavaFX (#4559) ... # Conflicts: # build.gradle # src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java # src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java # src/main/java/org/jabref/gui/openoffice/CitationManager.java # src/main/java/org/jabref/gui/openoffice/OOBibBase.java # src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java # src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
2 parents 85f9685 + 69661a4 commit 0a54822

File tree

833 files changed

+25666
-25763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

833 files changed

+25666
-25763
lines changed

.circleci/config.yml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
version: 2
2+
3+
jobs:
4+
downloadinstall4j:
5+
docker:
6+
- image: circleci/openjdk:8-jdk
7+
steps:
8+
- checkout
9+
- run: git submodule sync
10+
- run: git submodule update --init
11+
- restore_cache:
12+
keys:
13+
- install4j-{{ checksum "scripts/extract-install4j.sh" }}
14+
- run: scripts/download-install4j-and-jres.sh
15+
- save_cache:
16+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
17+
paths:
18+
- "~/downloads"
19+
- "~/.install4j7"
20+
filters:
21+
tags:
22+
only: /.*/
23+
24+
buildDev:
25+
docker:
26+
- image: circleci/openjdk:8-jdk
27+
steps:
28+
- restore_cache:
29+
key: dependency-cache
30+
- checkout
31+
- run: git submodule sync
32+
- run: git submodule update --init
33+
- restore_cache:
34+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
35+
- run: scripts/extract-install4j.sh
36+
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
37+
- run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
38+
- save_cache:
39+
key: dependency-cache
40+
paths:
41+
- "~/.gradle"
42+
- store_artifacts:
43+
path: build/releases
44+
destination: build
45+
- run: scripts/upload-to-builds.jabref.org.sh
46+
47+
buildRelease:
48+
docker:
49+
- image: circleci/openjdk:8-jdk
50+
steps:
51+
- restore_cache:
52+
key: dependency-cache
53+
- checkout
54+
- run: git submodule sync
55+
- run: git submodule update --init
56+
- restore_cache:
57+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
58+
- run: scripts/extract-install4j.sh
59+
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
60+
- run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
61+
- store_artifacts:
62+
path: build/releases
63+
destination: release
64+
- run: scripts/upload-to-builds.jabref.org.sh
65+
filters:
66+
tags:
67+
only: /.*/
68+
69+
workflows:
70+
version: 2
71+
build:
72+
jobs:
73+
- downloadinstall4j
74+
- buildDev:
75+
requires:
76+
- downloadinstall4j
77+
- buildRelease:
78+
requires:
79+
- downloadinstall4j
80+
filters:
81+
branches:
82+
ignore: /.*/
83+
tags:
84+
only: /.*/
85+

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
<!--
8+
Note: Please use the GitHub issue tracker only for bug reports.
9+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
10+
Thanks!
11+
-->
12+
13+
JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->
14+
15+
<!-- IMPORTANT NOTE ->
16+
<!--
17+
Please always test if the bug is still reproducible in the latest development version.
18+
We are constantly improving JabRef and some bugs may already be fixed.
19+
You can download the development version at: http://builds.jabref.org/master/
20+
Please make a backup of your library before you try out this version.
21+
If you already use a development version, ensure that you use the latest one.
22+
-->
23+
- [ ] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists
24+
25+
<!-- Add a clear and concise description of what the bug is. -->
26+
27+
Steps to reproduce the behavior:
28+
1. ...
29+
2. ...
30+
3. ...
31+
32+
<!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) -->
33+
34+
<details>
35+
<summary>Log File</summary>
36+
37+
```
38+
Paste an excerpt of your log file here
39+
```
40+
</details>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
8+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
9+
Thanks!

.github/ISSUE_TEMPLATE/question.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Question
3+
about: Ask a question about JabRef
4+
5+
---
6+
7+
Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
8+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
9+
Thanks!
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Suggestion for improvement
3+
about: Suggest an enhancement
4+
5+
---
6+
7+
<!--
8+
Please use the GitHub issue tracker only for bug reports and smaller suggestions for improvements.
9+
Requests for completely new features, questions and general feedback is now handled at http://discourse.jabref.org.
10+
Thanks!
11+
-->
12+
13+
**Is your suggestion for improvement related to a problem? Please describe.**
14+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
15+
16+
**Describe the solution you'd like**
17+
A clear and concise description of what you want to happen.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "src/main/resources/csl-styles"]
2+
path = src/main/resources/csl-styles
3+
url = https://github.com/citation-style-language/styles.git
4+
[submodule "src/main/resources/csl-locales"]
5+
path = src/main/resources/csl-locales
6+
url = https://github.com/citation-style-language/locales.git

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ before_script:
4848
script:
4949
# --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
5050
# For more information see https://gradle.com/scans/get-started
51-
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS --scan; fi
51+
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
5252
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
5353
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
5454
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport; bash <(curl -s https://codecov.io/bash); fi
@@ -72,3 +72,4 @@ cache:
7272
directories:
7373
- $HOME/.gradle/caches/
7474
- $HOME/.gradle/wrapper/
75+

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Alexsandro Lauber
1313
Ali Ayan
1414
Alick Zhao
1515
Ambrogio Oliva
16+
Amish Shah
1617
Andreas Amann
1718
Andreas Buhr
1819
Andreas Rudert

CHANGELOG.md

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,19 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
1111
## [Unreleased]
1212

1313
### Changed
14+
- We changed the location of some fields in the entry editor (you might need to reset your preferences for these changes to come into effect)
15+
- Journal/Year/Month in biblatex mode -> Deprecated (if filled)
16+
- DOI/URL: General -> Optional
17+
- Internal fields like ranking, read status and priority: Other -> General
18+
- Moreover, empty deprecated fields are no longer shown
19+
- Added server timezone parameter when connecting to a shared database.
20+
- We updated the dialog for setting up general fields.
21+
- URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
22+
- We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
1423
- We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166)
1524
- Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070)
25+
- We added a cleanup operation that detects an arXiv identifier in the note, journal or url field and moves it to the `eprint` field.
26+
Because of this change, the last-used cleanup operations were reset.
1627
- We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works. [4093](https://github.com/JabRef/jabref/issues/4093)
1728
- The special fields like `Printed` and `Read status` now show gray icons when the row is hovered.
1829
- We added a button in the tab header which allows you to close the database with one click. https://github.com/JabRef/jabref/issues/494
@@ -25,14 +36,27 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
2536
- We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
2637
- Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
2738
- Window state is saved on close and restored on start.
39+
- We made the MathSciNet fetcher more reliable.
40+
- We added the ISBN fetcher to the list of fetcher available under "Update with bibliographic information from the web" in the entry editor toolbar.
41+
- Files without a defined external file type are now directly opened with the default application of the operating system
2842
- We streamlined the process to rename and move files by removing the confirmation dialogs.
29-
30-
43+
- We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
44+
- We add auto url formatting when user paste link to URL field in entry editor. [koppor#254](https://github.com/koppor/jabref/issues/254)
45+
- We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
46+
- We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl</kbd> + <kbd>E</kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
47+
- We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
48+
- We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
49+
- We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356)
50+
- We added the ability to have an export preference where previously "File"-->"Export"/"Export selected entries" would not save the user's preference[#4495](https://github.com/JabRef/jabref/issues/4495)
51+
- We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
52+
- We added the ability change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546)
53+
- We added the ability to execute default action in dialog by using with <kbd>Ctrl</kbd> + <kbd>Enter</kbd> combination [#4496](https://github.com/JabRef/jabref/issues/4496)
3154

3255

3356

3457

3558
### Fixed
59+
- We fixed an issue where corresponding groups are sometimes not highlighted when clicking on entries [#3112](https://github.com/JabRef/jabref/issues/3112)
3660
- We fixed an issue where custom exports could not be selected in the 'Export (selected) entries' dialog [#4013](https://github.com/JabRef/jabref/issues/4013)
3761
- Italic text is now rendered correctly. https://github.com/JabRef/jabref/issues/3356
3862
- The entry editor no longer gets corrupted after using the source tab. https://github.com/JabRef/jabref/issues/3532 https://github.com/JabRef/jabref/issues/3608 https://github.com/JabRef/jabref/issues/3616
@@ -47,9 +71,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
4771
- We fixed an issue where the custom file column were sorted incorrectly. https://github.com/JabRef/jabref/issues/3119
4872
- We fixed an issues where the entry losses focus when a field is edited and at the same time used for sorting. https://github.com/JabRef/jabref/issues/3373
4973
- We fixed an issue where the menu on Mac OS was not displayed in the usual Mac-specific way. https://github.com/JabRef/jabref/issues/3146
74+
- We improved the integrity check for page numbers. [#4113](https://github.com/JabRef/jabref/issues/4113) and [feature request in the forum](http://discourse.jabref.org/t/pages-field-allow-use-of-en-dash/1199)
5075
- We fixed an issue where the order of fields in customized entry types was not saved correctly. [#4033](http://github.com/JabRef/jabref/issues/4033)
76+
- We fixed an issue where renaming a group did not change the group name in the interface. [#3189](https://github.com/JabRef/jabref/issues/3189)
5177
- We fixed an issue where the groups tree of the last database was still shown even after the database was already closed.
5278
- We fixed an issue where the "Open file dialog" may disappear behind other windows. https://github.com/JabRef/jabref/issues/3410
79+
- We fixed an issue where the number of entries matched was not updated correctly upon adding or removing an entry. [#3537](https://github.com/JabRef/jabref/issues/3537)
5380
- We fixed an issue where the default icon of a group was not colored correctly.
5481
- We fixed an issue where the first field in entry editor was not focused when adding a new entry. [#4024](https://github.com/JabRef/jabref/issues/4024)
5582
- We reworked the "Edit file" dialog to make it resizeable and improved the workflow for adding and editing files https://github.com/JabRef/jabref/issues/2970
@@ -58,12 +85,14 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
5885
- We fixed an issue where the "Convert to BibTeX-Cleanup" moved the content of the `file` field to the `pdf` field [#4120](https://github.com/JabRef/jabref/issues/4120)
5986
- We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
6087
- We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
61-
62-
63-
64-
65-
66-
88+
- We fixed an issue where users were vulnerable to XXE attacks during parsing [#4229](https://github.com/JabRef/jabref/issues/4229)
89+
- We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201) and [#4241](https://github.com/JabRef/jabref/issues/4241)
90+
- We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
91+
- We fixed an issue where the list of XMP Exclusion fields in the preferences was not be saved [#4072](https://github.com/JabRef/jabref/issues/4072)
92+
- We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [koppor#328](https://github.com/koppor/jabref/issues/328)
93+
- We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
94+
- We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414)
95+
- We fixed an issue where an older dialog appears when downloading full texts from the quality menu. [#4489](https://github.com/JabRef/jabref/issues/4489)
6796

6897

6998

@@ -79,6 +108,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
79108
- Set/clear/append/rename fields: available through Edit menu
80109
- Manage keywords: available through Edit menu
81110
- Copy linked files to folder: available through File menu
111+
- We removed the option to change the column widths in the preferences dialog. [#4546](https://github.com/JabRef/jabref/issues/4546)
82112

83113

84114

@@ -111,9 +141,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
111141

112142
## Older versions
113143

114-
The changelog of JabRef 4.x is available at the [v4.x branch](https://github.com/JabRef/jabref/blob/v4.x/CHANGELOG.md).
115-
The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
116-
The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).
144+
The changelog of JabRef 4.x is available at the [v4.x branch](https://github.com/JabRef/jabref/blob/v4.x/CHANGELOG.md).
145+
The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
146+
The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).
117147

118148
[Unreleased]: https://github.com/JabRef/jabref/compare/v4.3...HEAD
119149
[4.3]: https://github.com/JabRef/jabref/compare/v4.2...v4.3
@@ -125,3 +155,4 @@ The changelog of JabRef 2.11 and all previous versions is available as [text fil
125155
[4.0-beta]: https://github.com/JabRef/jabref/compare/v3.8.2...v4.0-beta
126156
[2.11.1]: https://github.com/JabRef/jabref/compare/v2.11...v2.11.1
127157
[JavaFX]: https://en.wikipedia.org/wiki/JavaFX
158+

0 commit comments

Comments
 (0)