Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/maintable-beta' into fixdragan…
Browse files Browse the repository at this point in the history
…drop

* upstream/maintable-beta: (97 commits)
  Update Eclipse style to intellij style (#3827)
  fix some not on fx thread dialogs in preferences
  fix inital save error Convert last dialog to javafx refactor exception
  Merge changes for renamed actions
  New Crowdin translations (#3835)
  Partial revert of #3715 since double click on group should expand/collapse it (#3834)
  Add Spanish translations (#3833)
  update applicationsinsights
  update javafxsvg to 1.3.0
  Disable FTP Download on CI
  Apply copy linked files dialog fix from master
  Show dialog when copy files did not found file (#3826)
  Remove customjfx (#3779)
  Disable FTP Download on CI
  Remove color customization for maintable from preferences (#3808)
  Remove erroneous escape character (#3831)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Indonesian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/maintable/MainTable.java
  • Loading branch information
Siedlerchr committed Mar 14, 2018
2 parents adf4cba + 4994d7f commit e12335d
Show file tree
Hide file tree
Showing 83 changed files with 3,644 additions and 2,482 deletions.
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

- [ ] Change in CHANGELOG.md described
- [ ] Tests created for changes
- [ ] Screenshots added (for bigger UI changes)
- [ ] Manually tested changed features in running JabRef
- [ ] Screenshots added in PR description (for bigger UI changes)
- [ ] Ensured that [the git commit message is a good one](https://github.com/joelparkerhenderson/git_commit_message)
- [ ] Check documentation status (Issue created for outdated help page at [help.jabref.org](https://github.com/JabRef/help.jabref.org/issues)?)
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
## [Unreleased]

### Changed
- Added "*.*" (any file type) to the Import File Filter Dialog. [#3757] (https://github.com/JabRef/jabref/issues/3757)
- Abbreviate journal names functionality is now running parallel, increasing performance significantly. [#2831] (https://github.com/JabRef/jabref/issues/2831)
- Changed order of items in context menu [#298] (https://github.com/koppor/jabref/issues/298)
- Changed ID-based entry generator to store the last used fetcher. [#2796] (https://github.com/JabRef/jabref/issues/2796)
Expand All @@ -33,10 +34,12 @@ For more details refer to the [field mapping help page](http://help.jabref.org/e
- We improved file saving so that hard links are now preserved when a save is performed [#2633](https://github.com/JabRef/jabref/issues/2633)
- We changed the default dialog option when removing a [file link](http://help.jabref.org/en/FileLinks#adding-external-links-to-an-entry) from an entry.
The new default removes the linked file from the entry instead of deleting the file from disk. [#3679](https://github.com/JabRef/jabref/issues/3679)
- The group editing window can now also be called by double-clicking the group to be edited. [koppor#277](https://github.com/koppor/jabref/issues/277)
- The magnifier icon at the search shows the [search mode](https://help.jabref.org/en/Search#search-modes) again. [#3535](https://github.com/JabRef/jabref/issues/3535)
- We added a new cleanup operation that replaces ligatures with their expanded form. [#3613](https://github.com/JabRef/jabref/issues/3613)
- We added the function to parse German month names. [#3536](https://github.com/JabRef/jabref/pull/3536)
- Pressing <kbd>ESC</kbd> while searching will clear the search field and select the first entry, if available, in the table. [koppor#293](https://github.com/koppor/jabref/issues/293)
- We changed the metadata reading and writing. DublinCore is now the only metadata format, JabRef supports. (https://github.com/JabRef/jabref/pull/3710)
- We added another CLI functionality for reading and writing metadata to pdfs. (see https://github.com/JabRef/jabref/pull/3756 and see http://help.jabref.org/en/CommandLine)

### Fixed
- We fixed several performance problems with the management of journal abbreviations [#3323](https://github.com/JabRef/jabref/issues/3323)
Expand All @@ -50,6 +53,7 @@ The new default removes the linked file from the entry instead of deleting the f
- We fixed an issue where not all bibtex/biblatex fields would be exported as latex-free to MS-Office XML [koppor#284](https://github.com/koppor/jabref/issues/284)
- We fixed an issue where linked files would be deleted from bibliography entries despite choosing the "Cancel" option in the dialog menu.
- We fixed the name of the group editing window to "Add group" instead of "Edit Group" when adding a new group. [koppor#277](https://github.com/koppor/jabref/issues/277)
- We fixed an issue where the "Copy linked files" dialog produced an error when the entry had no file [#3818](https://github.com/JabRef/jabref/issues/3818)

### Removed
- We removed the [Look and Feels from JGoodies](http://www.jgoodies.com/freeware/libraries/looks/), because the open source version is not compatible with Java 9.
Expand Down
26 changes: 3 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ dependencies {

// JavaFX stuff
compile 'com.airhacks:afterburner.fx:1.7.0'
compile 'de.codecentric.centerdevice:javafxsvg:1.2.1'
compile 'de.codecentric.centerdevice:javafxsvg:1.3.0'
compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
compile 'de.saxsys:mvvmfx-validation:1.7.0'
compile 'de.saxsys:mvvmfx:1.7.0'
Expand Down Expand Up @@ -154,8 +154,8 @@ dependencies {

compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'

compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9'
compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9'
compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.0.1'
compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.0.1'

testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0'
Expand Down Expand Up @@ -193,26 +193,6 @@ dependencyUpdates.resolutionStrategy = {
selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
}
}
withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection ->
if (selection.candidate.version.equals("1.0.10")) {
selection.reject("Version 1.0.10 is broken... waiting for 1.0.11")
}
}
withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection ->
if (selection.candidate.version.equals("1.0.10")) {
selection.reject("Version 1.0.10 is broken... waiting for 1.0.11")
}
}
withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection ->
if (selection.candidate.version.equals("2.0.0-BETA")) {
selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561")
}
}
withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection ->
if (selection.candidate.version.equals("2.0.0-BETA")) {
selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561")
}
}
withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
if (selection.candidate.version ==~ /2.*/) {
selection.reject("Cannot be upgraded to version 2")
Expand Down
Loading

0 comments on commit e12335d

Please sign in to comment.