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.

Sign up for GitHub

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

Jump to bottom

Rewrite bibtexml importer with JAXB parser #1666

Merged
merged 7 commits into from Aug 18, 2016
Merged

Rewrite bibtexml importer with JAXB parser #1666

merged 7 commits into from Aug 18, 2016

Commits on Aug 11, 2016

  1. rewrite bibtexml importer with jaxb parser

    @tschechlovdev
    tschechlovdev committed Aug 11, 2016
    Copy the full SHA
    fe63c1a View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. address comments

    @tschechlovdev
    tschechlovdev committed Aug 12, 2016
    Copy the full SHA
    ef6d2dc View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2016

  1. Merge remote-tracking branch 'upstream/master' into bibtexml-importer

    @tschechlovdev
    tschechlovdev committed Aug 15, 2016
    Copy the full SHA
    16881b5 View commit details
    Browse the repository at this point in the history

  2. remove unused import

    @tschechlovdev
    tschechlovdev committed Aug 15, 2016
    Copy the full SHA
    6eb09a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Merge remote-tracking branch 'upstream/master' into bibtexml-importer 

    # Conflicts:
#	src/main/java/net/sf/jabref/logic/importer/fileformat/BibTeXMLImporter.java
#	src/test/java/net/sf/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java
    @tschechlovdev
    tschechlovdev committed Aug 17, 2016
    Copy the full SHA
    478353e View commit details
    Browse the repository at this point in the history

  2. include feedback

    @tschechlovdev
    tschechlovdev committed Aug 17, 2016
    Copy the full SHA
    2919054 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. fix import order, log and add testfile

    @tschechlovdev
    tschechlovdev committed Aug 18, 2016
    Copy the full SHA
    1725aca View commit details
    Browse the repository at this point in the history