Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into isomedlineformatt…
Browse files Browse the repository at this point in the history
…erbibtexkey

* upstream/master: (827 commits)
  [#4306] Disable renaming (#4727)
  Feature: implement search filter in show preferences (#4759)
  Enable import button only if entry selected (#4761)
  Improve Remote messaging (#4760)
  Add changelog entry for #4520
  Modifications to improve contrast of UI elements (#4758)
  Rework external changes dialog in JavaFX (#4693)
  Changes the title of Group Dialog to Add subgroup when adding a new subgroup (#4757)
  Optimize data fetching (#4520)
  Adds a browse button next to the path text field for aux-based groups (#4743)
  Saving changes and exiting application (#4729)
  Code optimized and created a reusable method to get writer output (#4750)
  Bump mvvmfx from 1.7.0 to 1.8.0 (#4747)
  Bump guava from 27.0.1-jre to 27.1-jre (#4748)
  Bump mvvmfx-validation from 1.7.0 to 1.8.0 (#4749)
  Remove obsolete swing components in Preferences and OpenOffice (#4740)
  Move library specific key pattern dialog call to library menu (#4744)
  Revert "Revert "Fix: bibkey generated does not handle diacritics" (#4741)" (#4742)
  Revert "Fix: bibkey generated does not handle diacritics" (#4741)
  Rename method to removeUnwantedCharacters
  ...
  • Loading branch information
Siedlerchr committed Mar 16, 2019
2 parents db8fe66 + d7dd41b commit 2670bd1
Show file tree
Hide file tree
Showing 1,333 changed files with 45,694 additions and 59,376 deletions.
85 changes: 85 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
version: 2

jobs:
downloadinstall4j:
docker:
- image: circleci/openjdk:8-jdk
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
keys:
- install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/download-install4j-and-jres.sh
- save_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
paths:
- "~/downloads"
- "~/.install4j7"
filters:
tags:
only: /.*/

buildDev:
docker:
- image: circleci/openjdk:8-jdk
steps:
- restore_cache:
key: dependency-cache
- checkout
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/extract-install4j.sh
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
- run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
- save_cache:
key: dependency-cache
paths:
- "~/.gradle"
- store_artifacts:
path: build/releases
destination: build
- run: scripts/upload-to-builds.jabref.org.sh

buildRelease:
docker:
- image: circleci/openjdk:8-jdk
steps:
- restore_cache:
key: dependency-cache
- checkout
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
- run: scripts/extract-install4j.sh
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
- run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
- store_artifacts:
path: build/releases
destination: release
- run: scripts/upload-to-builds.jabref.org.sh
filters:
tags:
only: /.*/

workflows:
version: 2
build:
jobs:
- downloadinstall4j
- buildDev:
requires:
- downloadinstall4j
- buildRelease:
requires:
- downloadinstall4j
filters:
branches:
ignore: /.*/
tags:
only: /.*/

26 changes: 0 additions & 26 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve

---

<!--
Note: Please use the GitHub issue tracker only for bug reports.
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
Thanks!
-->

JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->

<!-- IMPORTANT NOTE ->
<!--
Please always test if the bug is still reproducible in the latest development version.
We are constantly improving JabRef and some bugs may already be fixed.
You can download the development version at: http://builds.jabref.org/master/
Please make a backup of your library before you try out this version.
If you already use a development version, ensure that you use the latest one.
-->
- [ ] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists

<!-- Add a clear and concise description of what the bug is. -->

Steps to reproduce the behavior:
1. ...
2. ...
3. ...

<!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) -->

<details>
<summary>Log File</summary>

```
Paste an excerpt of your log file here
```
</details>
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project

---

Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
Thanks!
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Question
about: Ask a question about JabRef

---

Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
Thanks!
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/suggestion-for-improvement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Suggestion for improvement
about: Suggest an enhancement

---

<!--
Please use the GitHub issue tracker only for bug reports and smaller suggestions for improvements.
Requests for completely new features, questions and general feedback is now handled at http://discourse.jabref.org.
Thanks!
-->

**Is your suggestion for improvement related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the feature request here.
20 changes: 8 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ status.md
# Install4J
install4j6/

# Snap
parts/
stage/
prime/
*.snap
jabref_source.tar.bz2
snap/.snapcraft/

# Gradle
# generated when `gradlew --gui` is called
ui/
Expand All @@ -23,18 +31,6 @@ ui/
jabref.xml
*.sonargraph

# Snapcraft - JabRef places the files into buildres/snapcraft
snap/










# Created by https://www.gitignore.io/api/gradle,java,jabref,intellij,eclipse,netbeans,windows,linux,macos,node,snapcraft

### Eclipse ###
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "src/main/resources/csl-styles"]
path = src/main/resources/csl-styles
url = https://github.com/citation-style-language/styles.git
[submodule "src/main/resources/csl-locales"]
path = src/main/resources/csl-locales
url = https://github.com/citation-style-language/locales.git
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,6 @@ Mattia Bunel <MBunel@users.noreply.github.com>
Waida Fan <31742543+weidafan@users.noreply.github.com>
Johannes Manner <johannes.manner@web.de>
Dominik Traczyk <dominik646@gmail.com>
Cerrianne Santos <cerrianne.santos@gmail.com>
Stefan Scheffel <st155160@stud.uni-stuttgart.de>
Stefan Gerzmann <steppery@gmx.de>
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ env:
global:
- GRADLE_OPTS=-Dorg.gradle.daemon=false
matrix:
- TEST_SUITE=checkstyle
- TEST_SUITE=check OPTIONS=modernizer
- TEST_SUITE=checkstyle
- TEST_SUITE=fetcherTest
- TEST_SUITE=databaseTest
- TEST_SUITE=guiTest
Expand Down Expand Up @@ -47,10 +47,10 @@ before_script:
script:
# --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
# For more information see https://gradle.com/scans/get-started
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS --scan; fi
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoJunit5TestReport; bash <(curl -s https://codecov.io/bash); fi
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport; bash <(curl -s https://codecov.io/bash); fi
- if [ "$DEPENDENCY_UPDATES" == "check" ]; then ./gradlew -q checkOutdatedDependencies; fi

after_failure:
Expand All @@ -60,6 +60,7 @@ after_failure:
branches:
only:
- master
- maintable-beta

# cache gradle dependencies
# https://docs.travis-ci.com/user/languages/java#Caching
Expand All @@ -70,3 +71,4 @@ cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

19 changes: 5 additions & 14 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ Alex Montgomery
Alexis Gallagher
Alexsandro Lauber
Ali Ayan
Alick Zhao
Ambrogio Oliva
Amish Shah
Andreas Amann
Andreas Buhr
Andreas Rudert
Expand All @@ -29,8 +31,8 @@ Bernd Kalbfuss
Bernhard Tempel
Brian Quistorff
Brian Van Essen
captain123
Carlos Silla
Cerrianne Santos
Christian Bartsch
Christian Kopf
Christoph Braun
Expand Down Expand Up @@ -67,11 +69,11 @@ Felix Berger
Felix Langner
Felix Wilke
Fernando Santagata
Florian Beetz
Florian Straßer
Foivos Christoulakis
Francois Charette
Frank Steimle
Fred
Frédéric Darboux
Gert Renckens
Gregor Herrmann
Expand Down Expand Up @@ -128,9 +130,7 @@ Mathias Walter
Matthias Geiger
Mattia Bunel
Mattias Ulbrich
mcmoody
Meltem Demirköprü
Michael
Michael Beckmann
Michael Falkenthal
Michael Lass
Expand All @@ -145,18 +145,15 @@ Nadeem Mahmood
Nathan Dunn
Nathan Sheffield
Nicolas Pavillon
nikmilpv
Niv Ierushalmi
Nizar N. Batada
noravanq
Olaf Lenz
Oliver Beckmann
Oliver Kopp
Oscar Gustafsson
Owen Huang
Patrick Scheibe
Paul Martin
payload
Peter Ansell
Philip Johnson
Predrag Milanovic
Expand All @@ -181,16 +178,15 @@ Seb Wills
Shitikanth
Simon Harrer
Simon Rutishauser
speed9
Stefan Feyer
Stefan Gerzmann
Stefan Kolb
Stefan Robert
Stefano Gariazzo
Stephan Lau
Stephan Rave
Stéphane Curet
Sven Jäger
The Gitter Badger
Thiago Toledo
Thomas Arildsen
Thomas Ilsche
Expand All @@ -201,10 +197,7 @@ Tobias Boceck
Tobias Bouschen
Tobias Denkinger
Tobias Diez
tokkot
Tony K
Toralf Senger
uid112001
Ulrich Stärk
Ulrik Stervbo
Uwe Kuehn
Expand All @@ -213,9 +206,7 @@ Waida Fan
Waluyo Adi Siswanto
Ward Poelmans
Wenbo Yang
wuw
Yang Zongze
Yara Grassi Gouffon
Yifan Peng
zacmks
Zhang Liang
Loading

0 comments on commit 2670bd1

Please sign in to comment.