Skip to content

Commit c91fe49

Browse files
committed
Merge remote-tracking branch 'upstream/master' into sharelatex
* upstream/master: (121 commits) Fix fetcher tests (#3583) Convert entry preview panel to JavaFX (#3574) Remove dependency for JUnit4 (#3580) Update tracis cache config as recommned by the docs (#3575) fix typo Show development information Release v4.1 Add new authors to mailMap (#3567) Fix build Really fix changelog Fix changelog Minor changes Disable the autocompletion as default (#3569) Add update exception for applicationinsights 2.0.0-BETA (#3571) Install4j jres 152 (#3570) Fix grammar mistake Downgrade applicationinsights. Fixes #3561 Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568) ExportFormats: Use FileExtension enum (#3565) Update guava from 23.5-jre -> 23.6-jre ... # Conflicts: # build.gradle
2 parents 74151de + 64c774b commit c91fe49

File tree

114 files changed

+2414
-10449
lines changed

Some content is hidden

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

114 files changed

+2414
-10449
lines changed

.gitattributes

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ AUTHORS eol=lf
1010

1111
# disable after a release
1212
# CHANGELOG.md merge=union
13-
14-
src/main/resources/l10n/*.properties merge=union

.mailmap

+6-1
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,9 @@ Berk Gureken <berkgureken@gmail.com>
131131
Abhishek Rai <abhisheksavitarai@gmail.com>
132132
Abhishek Rai <betheunique@users.noreply.github.com>
133133
Stéphane Curet <stephane.curet@orange.fr>
134-
Erdem Derebasoglu <erdemderebasoglu@hotmail.com>
134+
Erdem Derebasoglu <erdemderebasoglu@hotmail.com>
135+
Domenico Cufalo <cufalo@gmail.com>
136+
Tobias Bouschen <tobias.bouschen@googlemail.com>
137+
József Pallagi <pallagijoe@gmail.com>
138+
Mattia Bunel <MBunel@users.noreply.github.com>
139+
Waida Fan <31742543+weidafan@users.noreply.github.com>

.travis.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ language: java
66
dist: trusty
77
sudo: required
88

9+
git:
10+
depth: 1
11+
912
services:
1013
- postgresql
1114
- mysql
@@ -20,12 +23,14 @@ env:
2023
- TEST_SUITE=guiTest
2124
- TEST_SUITE=checkstyle
2225
- TEST_SUITE=codecov
26+
- DEPENDENCY_UPDATES=check
2327

2428
matrix:
2529
fast_finish: true
2630
allow_failures:
2731
- env: TEST_SUITE=fetcherTest
2832
- env: TEST_SUITE=codecov
33+
- env: DEPENDENCY_UPDATES=check
2934

3035
# JavaFX localization tests need a running X environment
3136
before_install:
@@ -46,20 +51,22 @@ script:
4651
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
4752
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
4853
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoJunit5TestReport; bash <(curl -s https://codecov.io/bash); fi
54+
- if [ "$DEPENDENCY_UPDATES" == "check" ]; then ./gradlew -q checkOutdatedDependencies; fi
4955

5056
after_failure:
5157
# show test results if build fails
5258
- $TRAVIS_BUILD_DIR/scripts/after-failure.sh
5359

5460
branches:
55-
only:
61+
only:
5662
- master
5763

5864
# cache gradle dependencies
5965
# https://docs.travis-ci.com/user/languages/java#Caching
6066
before_cache:
61-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
67+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
68+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
6269
cache:
6370
directories:
64-
- $HOME/.gradle/caches/
65-
- $HOME/.gradle/wrapper/
71+
- $HOME/.gradle/caches/
72+
- $HOME/.gradle/wrapper/

AUTHORS

+12
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Anh Nghia Tran
2020
Anita Armbruster
2121
Antonio Ribeiro
2222
Arno Blouin
23+
Bartosz J. Kaczkowski
2324
Behrouz Javanmardi
2425
Benjamin Köhler
2526
Berk Gureken
@@ -44,15 +45,18 @@ Daniel Svärd
4445
David Gleich
4546
David Weitzman
4647
Dennis Tschechlov
48+
Domenico Cufalo
4749
Dominik Waßenhoven
4850
Douglas Nassif Roma Junior
4951
Eduard Braun
5052
Eduardo Greco
5153
Egon Willighagen
5254
Ellen Reitmayr
5355
Erdem Derebasoglu
56+
Erdem Derebaşoğlu
5457
Erik Putrycz
5558
Ervin Kolenovic
59+
Ethan Harris
5660
Fabian Bauer
5761
Fabian Bieker
5862
Fabrice Dessaint
@@ -90,6 +94,8 @@ Jonathan Powell
9094
Jong-Ho Shinn
9195
Jorge Tornero
9296
Joshua Ramon Enslin
97+
Julian Pfeifer
98+
József Pallagi
9399
Jörg Lenhard
94100
Jörg Wegner
95101
Jörg Zieren
@@ -117,12 +123,14 @@ Martin Kähmer
117123
Martin Stolle
118124
Mathias Walter
119125
Matthias Geiger
126+
Mattia Bunel
120127
Mattias Ulbrich
121128
mcmoody
122129
Meltem Demirköprü
123130
Michael
124131
Michael Beckmann
125132
Michael Falkenthal
133+
Michael Lass
126134
Michael Spiegel
127135
Michael Wrighton
128136
Michel Baylac
@@ -143,6 +151,7 @@ Oliver Beckmann
143151
Oliver Kopp
144152
Oscar Gustafsson
145153
Owen Huang
154+
Patrick Scheibe
146155
Paul Martin
147156
payload
148157
Peter Ansell
@@ -184,6 +193,7 @@ Thorsten Dahlheimer
184193
Tim van Rossum
185194
Tim Würtele
186195
Tobias Boceck
196+
Tobias Bouschen
187197
Tobias Denkinger
188198
Tobias Diez
189199
tokkot
@@ -194,6 +204,7 @@ Ulrich Stärk
194204
Ulrik Stervbo
195205
Uwe Kuehn
196206
Vincent W. Yang
207+
Waida Fan
197208
Waluyo Adi Siswanto
198209
Ward Poelmans
199210
Wenbo Yang
@@ -202,3 +213,4 @@ Yang Zongze
202213
Yara Grassi Gouffon
203214
Yifan Peng
204215
zacmks
216+
Zhang Liang

CHANGELOG.md

+67-51
Large diffs are not rendered by default.

CONTRIBUTING.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ because <additional rationale>.
8282

8383
### When adding a new Localization.lang entry
8484
Add new `Localization.lang("KEY")` to Java file.
85-
Tests fail. In the test output a snippet is generated which must be added to the English translation file. There is also a snippet generated for the non-English files, but this is irrelevant.
86-
Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
87-
With `gradlew localizationUpdate` the "KEY" is added to the other translation files as well.
88-
Tests are green again.
85+
Tests fail. In the test output a snippet is generated which must be added to the English translation file.
86+
Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`.
87+
[Crowdin](http://translate.jabref.org/) will automatically pick up the new string and add it to the other translations.
8988

9089
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`
9190
Find more information in the [JabRef Wiki](https://github.com/JabRef/jabref/wiki/Code-Howtos#using-localization-correctly).

0 commit comments

Comments
 (0)