Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into convertRemainingTest
Browse files Browse the repository at this point in the history
* upstream/master: (116 commits)
  New translations JabRef_en.properties (French) (#5564)
  Select newly added jstyle in table to prevent exception (#5556)
  Make entry editor DND behave as specified in settings (#5554)
  Disabled Windows directory picker temporarily
  Disabled Windows directory picker temporarily
  Adding wix script to support jpackage update
  Making importing a single file easier (Issue #5508) (#5513)
  Fix #5551 - Don't remove unwanted characters before first author is selected (#5558)
  Update JabRef_it.properties
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (Danish)
  New translations JabRef_en.properties (Norwegian)
  New translations JabRef_en.properties (Polish)
  ...
  • Loading branch information
Siedlerchr committed Nov 5, 2019
2 parents 0d380fd + e356e49 commit 3778214
Show file tree
Hide file tree
Showing 141 changed files with 18,782 additions and 17,567 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
include:
- os: ubuntu-latest
displayName: linux
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_linux-x64_bin.tar.gz
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_linux-x64_bin.tar.gz
jdk14Path: /jdk-14
archivePortable: tar -czf build/distribution/JabRef-portable_linux.tar.gz -C build/distribution JabRef && rm -R build/distribution/JabRef
- os: windows-latest
displayName: windows
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip
jdk14Path: /jdk-14
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
- os: macOS-latest
displayName: macOS
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_osx-x64_bin.tar.gz
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_osx-x64_bin.tar.gz
jdk14Path: /jdk-14.jdk/Contents/Home
archivePortable: tar -czf build/distribution/JabRef-portable_macos.tar.gz -C build/distribution JabRef.app && rm -R build/distribution/JabRef.app

Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ prime/
jabref_source.tar.bz2
snap/.snapcraft/

# flatpak
flatpak/.buildconfig
flatpak/JabRef-portable_linux.tar.gz

# Gradle
# generated when `gradlew --gui` is called
ui/
Expand Down Expand Up @@ -443,4 +447,4 @@ gradle-app.setting
-!/buildSrc/src/main/groovy/org/jabref/build
-
-# do not ignore JabRef icons (they are ignored by the macos setting above)
-!src/main/java/org/jabref/gui/icon
-!src/main/java/org/jabref/gui/icon
45 changes: 43 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ Ulrik Stervbo <[email protected]>
Stefano Gariazzo <[email protected]>
Lee Patton <[email protected]>
Jörg Lenhard <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Jörg Lenhard <[email protected]> <[email protected]>
Jörg Lenhard <[email protected]> <[email protected]>
Jörg Lenhard <[email protected]> <[email protected]>
Matthias Geiger <[email protected]>
Christoph Braun <[email protected]>
Expand All @@ -110,6 +110,8 @@ Jens Döcke <[email protected]>
Jürgen Lange <[email protected]>
Sascha Zeller <[email protected]>
Ali Ayan <[email protected]>
Ali Zhagparov <[email protected]>
Ali Zhagparov <[email protected]> <[email protected]>
Arno Blouin <[email protected]>
Jeff Miller <[email protected]>
Alain Vaucher <[email protected]>
Expand Down Expand Up @@ -144,3 +146,42 @@ Cerrianne Santos <[email protected]>
Stefan Scheffel <[email protected]>
Stefan Gerzmann <[email protected]>
Deepak Kumar <[email protected]>
Aman Jain <[email protected]> <[email protected]>
Ayachi Nene <[email protected]>
Jan Schäfer <[email protected]>
Stefan Scheffel <[email protected]>
Stefan Scheffel <[email protected]>
Yash Kothari <[email protected]>
Quentin Fritz <[email protected]>
Daniel Rodrigues <[email protected]>
Malte Deiseroth <[email protected]>
Malik Atalla <[email protected]>
Kaique Komata <[email protected]>
S. Krause <[email protected]>
Leonhard Wolz <[email protected]>
Manuel Wtfjoke <[email protected]>
Valentin Pons <[email protected]>
Arthur Fröhlich <[email protected]>
Songyu Wang <[email protected]>
Alex Tarrix <[email protected]>
Samiya Caur <[email protected]>
Stanley Foerster <[email protected]>
Michael McCann <[email protected]>
Robin Lichtenthaeler <[email protected]>
Rodrigo Paula da Silva <[email protected]>
Robert Jäschke <[email protected]>
Nick S. Weatherley <[email protected]>
Nivedha Sunderraj <[email protected]>
Lavabit <[email protected]>
Rachel Wu <[email protected]>
Abraham Polk <[email protected]>
dima <[email protected]>
Fred Stevens <[email protected]>
Rui Kang <[email protected]>
Yurick Honda <[email protected]>
Yurick Honda <[email protected]> <[email protected]>
Mihu <[email protected]> <[email protected]>
Michael Schwarmi <[email protected]>
Michal Rican <[email protected]>
Param Mittal <[email protected]>
Victor Michelan <[email protected]>
Loading

0 comments on commit 3778214

Please sign in to comment.