Skip to content

Commit 13a45d5

Browse files
committed
Merge remote-tracking branch 'upstream/master' into dragdropfiles
* upstream/master: Remove untranslated Strings from the greek menu translation Remove untranslated Strings from the greek translation Update wiremock from 2.7.1 -> 2.8.0 Update log4j from 2.8.2 -> 2.9.0 Added the name of some new authors Fix typo local db and shared db sync fix #2284 with changelog local db and shared db sync fix #2284 Improvement in Japanese translation (#3193)
2 parents 1f1dca7 + c416818 commit 13a45d5

File tree

10 files changed

+1554
-2101
lines changed

10 files changed

+1554
-2101
lines changed

.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,7 @@ Fabian Bauer <[email protected]>
122122
Jong-Ho Shinn <[email protected]>
123123
Nadeem Mahmood <[email protected]>
124124
Foivos Christoulakis <[email protected]>
125+
Predrag Milanovic <[email protected]>
126+
Karsten Hiekmann <[email protected]>
127+
Andrew Levit <[email protected]>
128+

AUTHORS

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Ambrogio Oliva
1414
Andreas Amann
1515
Andreas Buhr
1616
Andreas Rudert
17+
Andrew Levit
1718
Anh Nghia Tran
1819
Anita Armbruster
1920
Antonio Ribeiro
@@ -91,6 +92,7 @@ Jörg Zieren
9192
Jørgen Kvalsvik
9293
Jürgen Lange
9394
Kai Mindermann
95+
Karsten Hiekmann
9496
Koji Yokota
9597
Kolja Brix
9698
Krunoslav Zubrinic
@@ -123,7 +125,6 @@ Michel Baylac
123125
Mike Smoot
124126
Moritz Ringler
125127
Morten Alver
126-
mpele
127128
Mélanie Tremblay
128129
Nadeem Mahmood
129130
Nathan Dunn
@@ -142,6 +143,7 @@ Paul Martin
142143
payload
143144
Peter Ansell
144145
Philip Johnson
146+
Predrag Milanovic
145147
Raik Nagel
146148
Renato Massao
147149
Robert Jäschke

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
3333
- We fixed an issue where an online file link could not be removed from an entry [#3165](https://github.com/JabRef/jabref/issues/3165)
3434
- We fixed an issue where an online file link did not open the browser and created an error [#3165](https://github.com/JabRef/jabref/issues/3165)
3535
- We fixed an issue where the arrow keys in the search bar did not work as expected [#3081](https://github.com/JabRef/jabref/issues/3081)
36+
- We fixed an issue where metadata syncing with local and shared database were unstable. It will also fix syncing groups and sub-groups in database. [#2284](https://github.com/JabRef/jabref/issues/2284)
37+
3638
### Removed
3739

3840

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ dependencies {
113113
compile 'com.mashape.unirest:unirest-java:1.4.9'
114114

115115
compile 'commons-logging:commons-logging:1.2'
116-
compile 'org.apache.logging.log4j:log4j-jcl:2.8.2'
117-
compile 'org.apache.logging.log4j:log4j-api:2.8.2'
118-
compile 'org.apache.logging.log4j:log4j-core:2.8.2'
116+
compile 'org.apache.logging.log4j:log4j-jcl:2.9.0'
117+
compile 'org.apache.logging.log4j:log4j-api:2.9.0'
118+
compile 'org.apache.logging.log4j:log4j-core:2.9.0'
119119

120120
// need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles
121121
compile 'org.citationstyles:styles:1.0.1-SNAPSHOT'
@@ -129,7 +129,7 @@ dependencies {
129129

130130
testCompile 'junit:junit:4.12'
131131
testCompile 'org.mockito:mockito-core:2.9.0'
132-
testCompile 'com.github.tomakehurst:wiremock:2.7.1'
132+
testCompile 'com.github.tomakehurst:wiremock:2.8.0'
133133
testCompile 'org.assertj:assertj-swing-junit:3.8.0'
134134
testCompile 'org.reflections:reflections:0.9.11'
135135
testCompile 'org.xmlunit:xmlunit-core:2.4.0'

src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
117117
Files.createDirectories(newPath);
118118
}
119119
} catch (IOException e) {
120-
LOGGER.error("Could not create necessary target directoires for renaming", e);
120+
LOGGER.error("Could not create necessary target directories for renaming", e);
121121
}
122122

123123
boolean renameSuccessful = FileUtil.renameFile(Paths.get(expandedOldFilePath), newPath, true);

src/main/java/org/jabref/model/metadata/MetaData.java

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public void setGroups(GroupTreeNode root) {
8181
groupsRoot = Objects.requireNonNull(root);
8282
groupsRoot.subscribeToDescendantChanged(groupTreeNode -> eventBus.post(new GroupUpdatedEvent(this)));
8383
eventBus.post(new GroupUpdatedEvent(this));
84+
postChange();
8485
}
8586

8687
/**

0 commit comments

Comments
 (0)