-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into jdk9
* upstream/master: (229 commits) Try to fix not on FX thread for search and autocomplete (#4618) Convert DuplicateResolverDialog to javafx (#4601) Fix for BibTex source tab parsing issue if field contains {} (#4581) Convert OO/LO SidePanel to javafx (#4341) Convert "Customize importer" dialog to JavaFX (#4608) Convert "From Aux file" dialog to JavaFX (#4607) Convert "Show preferences" dialog to JavaFX (#4605) Fix not on FX thread exception Force javafx to run thread (#4604) Convert new version dialog to JavaFX (#4602) Add a variable to track the change in preview style (#4587) Solution for submitting dialog with Ctrl + Enter (#4496) (#4592) Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599) Fix overlapping font in id entry type (#4595) 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) ... # Conflicts: # build.gradle # src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java # src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java # src/main/java/org/jabref/gui/openoffice/CitationManager.java # src/main/java/org/jabref/gui/openoffice/OOBibBase.java # src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java # src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
- Loading branch information
Showing
833 changed files
with
25,666 additions
and
25,763 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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: /.*/ | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.