Skip to content

Commit 3b7e52d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
* upstream/master: Improve SyncLang.py (#3184) Config intellj code style to adhere to empty lines checkstyle rule (#3365) Don't list same look and feels more than once (#3393) progessdialog and result table are now shown correclty on copy files Export pdf/linked files (#3147) Added checking integrity dialog (#3388)
2 parents 982b475 + f5842ef commit 3b7e52d

Some content is hidden

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

41 files changed

+1065
-414
lines changed

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
2323
- We now set the WM_CLASS of the UI to org-jabref-JabRefMain to allow certain Un*x window managers to properly identify its windows
2424
- We changed the default paths for the OpenOffice/LibreOffice binaries to the default path for LibreOffice
2525
- We no longer create a new entry editor when selecting a new entry to increase performance. [#3187](https://github.com/JabRef/jabref/pull/3187)
26+
- We added the possibility to copy linked files from entries to a single output folder [#2539](https://github.com/JabRef/jabref/pull/2593)
2627
- We increased performance and decreased the memory footprint of the entry editor drastically. [#3331](https://github.com/JabRef/jabref/pull/3331)
2728
- Late initialization of the context menus in the entry editor. This improves performance and memory footprint further [#3340](https://github.com/JabRef/jabref/pull/3340)
28-
29+
- We added a dialog to show that JabRef is working on checking integrity. [#3358](https://github.com/JabRef/jabref/issues/3358)
2930

3031
### Fixed
3132
- We fixed the translation of \textendash in the entry preview [#3307](https://github.com/JabRef/jabref/issues/3307)
@@ -38,6 +39,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
3839
- We fixed an issue where editing in the source tab would override content of other entries [#3352](https://github.com/JabRef/jabref/issues/3352#issue-268580818)
3940
- We fixed several issues with the automatic linking of files in the entry editor where files were not found or not correctly saved in the bibtex source [#3346](https://github.com/JabRef/jabref/issues/3346)
4041
- We fixed an issue where fetching entries from crossref that had no titles caused an error [#3376](https://github.com/JabRef/jabref/issues/3376)
42+
- We fixed an issue where the same Java Look and Feel would be listed more than once in the Preferences. [#3391](https://github.com/JabRef/jabref/issues/3391)
4143

4244
### Removed
4345

config/IntelliJ Code Style.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<code_scheme name="Project copy">
1+
<code_scheme name="JabRef">
22
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
33
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
44
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -28,6 +28,8 @@
2828
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
2929
</JavaCodeStyleSettings>
3030
<codeStyleSettings language="JAVA">
31+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
32+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
3133
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
3234
<arrangement>
3335
<rules>
@@ -289,4 +291,4 @@
289291
</rules>
290292
</arrangement>
291293
</codeStyleSettings>
292-
</code_scheme>
294+
</code_scheme>

0 commit comments

Comments
 (0)