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 <ulriks@users.sourceforge.net>
Stefano Gariazzo <steog88@gmail.com>
Lee Patton <lpatton@users.sourceforge.net>
Jörg Lenhard <joerg.lenhard@kau.se>
<joerg.lenhard@kau.se> <joerg@lenhard.info>
<joerg.lenhard@kau.se> <lenhard@users.noreply.github.com>
Jörg Lenhard <joerg.lenhard@kau.se> <joerg@lenhard.info>
Jörg Lenhard <joerg.lenhard@kau.se> <lenhard@users.noreply.github.com>
Jörg Lenhard <joerg.lenhard@kau.se> <joerg.lenhard@uni-bamberg.de>
Matthias Geiger <matthias.geiger@uni-bamberg.de>
Christoph Braun <braunch.dev@gmail.com>
Expand All @@ -110,6 +110,8 @@ Jens Döcke <jens.doecke@gmail.com>
Jürgen Lange <juergen.lange@unitybox.de>
Sascha Zeller <zeller.dev@gmail.com>
Ali Ayan <ali.ayan@hotmail.de>
Ali Zhagparov <ali_zhagparov@epam.com>
Ali Zhagparov <ali_zhagparov@epam.com> <alijakparov.kz@gmail.com>
Arno Blouin <blouin.arno@gmail.com>
Jeff Miller <miller@psy.otago.ac.nz>
Alain Vaucher <avaucher@users.noreply.github.com>
Expand Down Expand Up @@ -144,3 +146,42 @@ Cerrianne Santos <cerrianne.santos@gmail.com>
Stefan Scheffel <st155160@stud.uni-stuttgart.de>
Stefan Gerzmann <steppery@gmx.de>
Deepak Kumar <deepakkumar24196@gmail.com>
Aman Jain <aman.jain01@sap.com> <aman-coolinc1@users.noreply.github.com>
Ayachi Nene <1710082010@qq.com>
Jan Schäfer <j@nschaefer.net>
Stefan Scheffel <Brainsucker92@users.noreply.github.com>
Stefan Scheffel <stscit21@hs-esslingen.de>
Yash Kothari <yashkothari199767@gmail.com>
Quentin Fritz <49909555+core-master@users.noreply.github.com>
Daniel Rodrigues <daniel.rodrigues.45@hotmail.com>
Malte Deiseroth <deisi@users.noreply.github.com>
Malik Atalla <6626492+HerrAachen@users.noreply.github.com>
Kaique Komata <kaique.komata@gmail.com>
S. Krause <st156455@stud.uni-stuttgart.de>
Leonhard Wolz <leonhard.wo@gmx.de>
Manuel Wtfjoke <WtfJoke@users.noreply.github.com>
Valentin Pons <valx76@gmail.com>
Arthur Fröhlich <37243770+znuznu@users.noreply.github.com>
Songyu Wang <36670132+Songyu-Wang@users.noreply.github.com>
Alex Tarrix <tarix@fu-berlin.de>
Samiya Caur <samiya17094@iiitd.ac.in>
Stanley Foerster <stanley.foerster@gmail.com>
Michael McCann <tokkot@gmail.com>
Robin Lichtenthaeler <robin.lichtenthaeler@web.de>
Rodrigo Paula da Silva <rodrigopds73@gmail.com>
Robert Jäschke <robert@Roberts-MacBook-Pro.local>
Nick S. Weatherley <nick.s.weatherley@protonmail.com>
Nivedha Sunderraj <nivedha.sunderraj@gmail.com>
Lavabit <payload@lavabit.com>
Rachel Wu <46014322+rachelwu21@users.noreply.github.com>
Abraham Polk <abepolk@gmail.com>
dima <dpolishc@cisco.com>
Fred Stevens <breakfastfish@users.sf.net>
Rui Kang <1539678784@qq.com>
Yurick Honda <yurickyussuke@hotmail.com>
Yurick Honda <yurickyussuke@hotmail.com> <32721326+yurickyh@users.noreply.github.com>
Mihu <joszhistoria@gmail.com> <41503450+mmihuu@users.noreply.github.com>
Michael Schwarmi <schwarmi@users.sf.net>
Michal Rican <michal.rican@gmail.com>
Param Mittal <parammittal16@gmail.com>
Victor Michelan <venanciuslm@gmail.com>
Loading

0 comments on commit 3778214

Please sign in to comment.