Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add latest changes to latexintegration branch #5170

Merged
merged 1 commit into from
Aug 4, 2019
Merged

Add latest changes to latexintegration branch #5170

merged 1 commit into from
Aug 4, 2019

Conversation

davidemdot
Copy link
Member

  • Change CitationViewModel to CitationsDisplay.
  • Improve styles and icons.
  • Remove unused code.

Now it looks like...

latexcitationstab

@davidemdot davidemdot merged commit 556b8b7 into JabRef:latexintegration Aug 4, 2019
@davidemdot davidemdot deleted the latexintegration-morechanges branch August 4, 2019 21:00
Siedlerchr added a commit that referenced this pull request Aug 9, 2019
…rter

# By David Méndez (47) and others
# Via GitHub (5) and David Méndez (3)
* upstream/master: (57 commits)
  fix wrong package (#5181)
  Remove logging message for non-existing nested files
  Bump applicationinsights-core from 2.4.0 to 2.4.1 (#5171)
  Bump archunit-junit5-engine from 0.10.2 to 0.11.0 (#5157)
  Bump applicationinsights-logging-log4j2 from 2.4.0 to 2.4.1 (#5172)
  Bump tika-core from 1.21 to 1.22 (#5166)
  Fix fail on testPerformExportForSingleEntry from DocBook5ExporterTest (#5168)
  Add a check for nested files and improve the code to skip lines (DefaultTexParser)
  Add latest changes to latexintegration (#5170)
  LaTeX integration latest changes (#5167)
  Move to extended enums for fields and entry types (#5148)
  Bump archunit-junit5-api from 0.10.2 to 0.11.0 (#5158)
  Revert temporal change
  Fix all issues from reviews of #5137
  Bump com.simonharrer.modernizer from 1.6.0-1 to 1.8.0-1 (#5154)
  Bump checkstyle from 8.22 to 8.23 (#5153)
  Add a new JabRefIcons.LATEX_CITATIONS
  Change toString() methods
  Update DefaultTexParser for explaining when and why it skips the citation matching
  Update TexParserResult for avoiding 'orElse(null)'
  ...

# Conflicts:
#	src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
#	src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant