Skip to content

Commit 3fa8648

Browse files
committed
Merge remote-tracking branch 'upstream/master' into editStringsjavafx
* upstream/master: (583 commits) update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one Update journalList.txt Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546) Don't set column sort type at startup (#4577) Add uncaught exception message (#4565) Converts integrity check dialog to JavaFX (#4559) Do not extract file ending from Urls (#4547) Bump checkstyle from 8.15 to 8.16 (#4562) Bump xmpbox from 2.0.12 to 2.0.13 (#4561) Delete the deprecated BibEntry Constructor (#4560) Refactor BibEntry deprecated method (#4554) Added extra stats to be sent with MrDLib recommendations (#4452) improve styling of preferences side menu (#4556) Cleanup interfaces (#4553) Bump fontbox from 2.0.12 to 2.0.13 (#4552) Bump pdfbox from 2.0.12 to 2.0.13 (#4551) Bump wiremock from 2.19.0 to 2.20.0 (#4550) Fixes that renaming a group did not change the group name in the interface (#4549) Bump applicationinsights-logging-log4j2 from 2.2.1 to 2.3.0 (#4540) Bump antlr4-runtime from 4.7.1 to 4.7.2 (#4542) ... # Conflicts: # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/model/entry/BibtexString.java
2 parents 84c0aba + a051e1b commit 3fa8648

File tree

1,084 files changed

+31595
-37966
lines changed

Some content is hidden

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

1,084 files changed

+31595
-37966
lines changed

.circleci/config.yml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
version: 2
2+
3+
jobs:
4+
downloadinstall4j:
5+
docker:
6+
- image: circleci/openjdk:8-jdk
7+
steps:
8+
- checkout
9+
- run: git submodule sync
10+
- run: git submodule update --init
11+
- restore_cache:
12+
keys:
13+
- install4j-{{ checksum "scripts/extract-install4j.sh" }}
14+
- run: scripts/download-install4j-and-jres.sh
15+
- save_cache:
16+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
17+
paths:
18+
- "~/downloads"
19+
- "~/.install4j7"
20+
filters:
21+
tags:
22+
only: /.*/
23+
24+
buildDev:
25+
docker:
26+
- image: circleci/openjdk:8-jdk
27+
steps:
28+
- restore_cache:
29+
key: dependency-cache
30+
- checkout
31+
- run: git submodule sync
32+
- run: git submodule update --init
33+
- restore_cache:
34+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
35+
- run: scripts/extract-install4j.sh
36+
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
37+
- run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
38+
- save_cache:
39+
key: dependency-cache
40+
paths:
41+
- "~/.gradle"
42+
- store_artifacts:
43+
path: build/releases
44+
destination: build
45+
- run: scripts/upload-to-builds.jabref.org.sh
46+
47+
buildRelease:
48+
docker:
49+
- image: circleci/openjdk:8-jdk
50+
steps:
51+
- restore_cache:
52+
key: dependency-cache
53+
- checkout
54+
- run: git submodule sync
55+
- run: git submodule update --init
56+
- restore_cache:
57+
key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
58+
- run: scripts/extract-install4j.sh
59+
- run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
60+
- run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
61+
- store_artifacts:
62+
path: build/releases
63+
destination: release
64+
- run: scripts/upload-to-builds.jabref.org.sh
65+
filters:
66+
tags:
67+
only: /.*/
68+
69+
workflows:
70+
version: 2
71+
build:
72+
jobs:
73+
- downloadinstall4j
74+
- buildDev:
75+
requires:
76+
- downloadinstall4j
77+
- buildRelease:
78+
requires:
79+
- downloadinstall4j
80+
filters:
81+
branches:
82+
ignore: /.*/
83+
tags:
84+
only: /.*/
85+

.github/ISSUE_TEMPLATE.md

-26
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
<!--
8+
Note: Please use the GitHub issue tracker only for bug reports.
9+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
10+
Thanks!
11+
-->
12+
13+
JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->
14+
15+
<!-- IMPORTANT NOTE ->
16+
<!--
17+
Please always test if the bug is still reproducible in the latest development version.
18+
We are constantly improving JabRef and some bugs may already be fixed.
19+
You can download the development version at: http://builds.jabref.org/master/
20+
Please make a backup of your library before you try out this version.
21+
If you already use a development version, ensure that you use the latest one.
22+
-->
23+
- [ ] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists
24+
25+
<!-- Add a clear and concise description of what the bug is. -->
26+
27+
Steps to reproduce the behavior:
28+
1. ...
29+
2. ...
30+
3. ...
31+
32+
<!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) -->
33+
34+
<details>
35+
<summary>Log File</summary>
36+
37+
```
38+
Paste an excerpt of your log file here
39+
```
40+
</details>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
8+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
9+
Thanks!

.github/ISSUE_TEMPLATE/question.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Question
3+
about: Ask a question about JabRef
4+
5+
---
6+
7+
Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
8+
Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
9+
Thanks!
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Suggestion for improvement
3+
about: Suggest an enhancement
4+
5+
---
6+
7+
<!--
8+
Please use the GitHub issue tracker only for bug reports and smaller suggestions for improvements.
9+
Requests for completely new features, questions and general feedback is now handled at http://discourse.jabref.org.
10+
Thanks!
11+
-->
12+
13+
**Is your suggestion for improvement related to a problem? Please describe.**
14+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
15+
16+
**Describe the solution you'd like**
17+
A clear and concise description of what you want to happen.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "src/main/resources/csl-styles"]
2+
path = src/main/resources/csl-styles
3+
url = https://github.com/citation-style-language/styles.git
4+
[submodule "src/main/resources/csl-locales"]
5+
path = src/main/resources/csl-locales
6+
url = https://github.com/citation-style-language/locales.git

.mailmap

+4-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Daniel Mair <mairdl.dev@gmail.com> <mairdl.dev@googlemail.com>
117117
Sven Jäger <svenjaeger@gmx.de>
118118
Tim van Rossum <trvanrossum@gmail.com>
119119
Saulius Gražulis <grazulis@ibt.lt>
120-
Rolf Starre <rolf.starre@gmail.com> <RolfStarre@users.noreply.github.com>
120+
Rolf Starre <RolfStarre@users.noreply.github.com>
121121
Owen Huang <ohuang12@users.noreply.github.com>
122122
Anita Armbruster <armbruan@gmail.com>
123123
Fabian Bauer <125m125@users.noreply.github.com>
@@ -140,3 +140,6 @@ Mattia Bunel <MBunel@users.noreply.github.com>
140140
Waida Fan <31742543+weidafan@users.noreply.github.com>
141141
Johannes Manner <johannes.manner@web.de>
142142
Dominik Traczyk <dominik646@gmail.com>
143+
Cerrianne Santos <cerrianne.santos@gmail.com>
144+
Stefan Scheffel <st155160@stud.uni-stuttgart.de>
145+
Stefan Gerzmann <steppery@gmx.de>

.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ env:
1717
global:
1818
- GRADLE_OPTS=-Dorg.gradle.daemon=false
1919
matrix:
20-
- TEST_SUITE=checkstyle
2120
- TEST_SUITE=check OPTIONS=modernizer
21+
- TEST_SUITE=checkstyle
2222
- TEST_SUITE=fetcherTest
2323
- TEST_SUITE=databaseTest
2424
- TEST_SUITE=guiTest
@@ -47,10 +47,10 @@ before_script:
4747
script:
4848
# --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
4949
# For more information see https://gradle.com/scans/get-started
50-
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS --scan; fi
50+
- if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
5151
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
5252
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
53-
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoJunit5TestReport; bash <(curl -s https://codecov.io/bash); fi
53+
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport; bash <(curl -s https://codecov.io/bash); fi
5454
- if [ "$DEPENDENCY_UPDATES" == "check" ]; then ./gradlew -q checkOutdatedDependencies; fi
5555

5656
after_failure:
@@ -71,3 +71,4 @@ cache:
7171
directories:
7272
- $HOME/.gradle/caches/
7373
- $HOME/.gradle/wrapper/
74+

AUTHORS

+5-14
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ Alex Montgomery
1111
Alexis Gallagher
1212
Alexsandro Lauber
1313
Ali Ayan
14+
Alick Zhao
1415
Ambrogio Oliva
16+
Amish Shah
1517
Andreas Amann
1618
Andreas Buhr
1719
Andreas Rudert
@@ -29,8 +31,8 @@ Bernd Kalbfuss
2931
Bernhard Tempel
3032
Brian Quistorff
3133
Brian Van Essen
32-
captain123
3334
Carlos Silla
35+
Cerrianne Santos
3436
Christian Bartsch
3537
Christian Kopf
3638
Christoph Braun
@@ -67,11 +69,11 @@ Felix Berger
6769
Felix Langner
6870
Felix Wilke
6971
Fernando Santagata
72+
Florian Beetz
7073
Florian Straßer
7174
Foivos Christoulakis
7275
Francois Charette
7376
Frank Steimle
74-
Fred
7577
Frédéric Darboux
7678
Gert Renckens
7779
Gregor Herrmann
@@ -128,9 +130,7 @@ Mathias Walter
128130
Matthias Geiger
129131
Mattia Bunel
130132
Mattias Ulbrich
131-
mcmoody
132133
Meltem Demirköprü
133-
Michael
134134
Michael Beckmann
135135
Michael Falkenthal
136136
Michael Lass
@@ -145,18 +145,15 @@ Nadeem Mahmood
145145
Nathan Dunn
146146
Nathan Sheffield
147147
Nicolas Pavillon
148-
nikmilpv
149148
Niv Ierushalmi
150149
Nizar N. Batada
151-
noravanq
152150
Olaf Lenz
153151
Oliver Beckmann
154152
Oliver Kopp
155153
Oscar Gustafsson
156154
Owen Huang
157155
Patrick Scheibe
158156
Paul Martin
159-
payload
160157
Peter Ansell
161158
Philip Johnson
162159
Predrag Milanovic
@@ -181,16 +178,15 @@ Seb Wills
181178
Shitikanth
182179
Simon Harrer
183180
Simon Rutishauser
184-
speed9
185181
Stefan Feyer
182+
Stefan Gerzmann
186183
Stefan Kolb
187184
Stefan Robert
188185
Stefano Gariazzo
189186
Stephan Lau
190187
Stephan Rave
191188
Stéphane Curet
192189
Sven Jäger
193-
The Gitter Badger
194190
Thiago Toledo
195191
Thomas Arildsen
196192
Thomas Ilsche
@@ -201,10 +197,7 @@ Tobias Boceck
201197
Tobias Bouschen
202198
Tobias Denkinger
203199
Tobias Diez
204-
tokkot
205-
Tony K
206200
Toralf Senger
207-
uid112001
208201
Ulrich Stärk
209202
Ulrik Stervbo
210203
Uwe Kuehn
@@ -213,9 +206,7 @@ Waida Fan
213206
Waluyo Adi Siswanto
214207
Ward Poelmans
215208
Wenbo Yang
216-
wuw
217209
Yang Zongze
218210
Yara Grassi Gouffon
219211
Yifan Peng
220-
zacmks
221212
Zhang Liang

0 commit comments

Comments
 (0)