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

Drag'n'drop import of multiple NML files #2908

Merged
merged 14 commits into from
Jul 24, 2018
Merged

Drag'n'drop import of multiple NML files #2908

merged 14 commits into from
Jul 24, 2018

Commits on Jul 17, 2018

  1. allow uploading multiple nmls via drag'n'drop into the tracing view

    @philippotto
    philippotto committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    2e27fe1 View commit details
    Browse the repository at this point in the history

  2. allow auto-grouping of nmls during import

    @philippotto
    philippotto committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    0dac672 View commit details
    Browse the repository at this point in the history

  3. merge old import-nml-button with new drag'n'drop flow; parallelize pa… 

    …rsing
    @philippotto
    philippotto committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    cfcf6d8 View commit details
    Browse the repository at this point in the history

  4. minor styling

    @philippotto
    philippotto committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    eecf784 View commit details
    Browse the repository at this point in the history

  5. update changelog

    @philippotto
    philippotto committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    b996845 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Merge branch 'master' into dnd-nml

    @philippotto
    philippotto authored Jul 18, 2018
    Configuration menu
    Copy the full SHA
    c2de7fc View commit details
    Browse the repository at this point in the history

  2. make code a bit more readable

    @philippotto
    philippotto committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    c6d936c View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. Merge branch 'master' into dnd-nml

    @philippotto
    philippotto authored Jul 23, 2018
    Configuration menu
    Copy the full SHA
    5372c20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dnd-nml' of github.com:scalableminds/webknossos into dn… 

    …d-nml
    @philippotto
    philippotto committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    18ebe7f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:scalableminds/webknossos into dnd… 

    …-nml
    @philippotto
    philippotto committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    c0af482 View commit details
    Browse the repository at this point in the history

  4. improve error-handling for import of multiple NMLs; incorporate PR fe… 

    …edback
    @philippotto
    philippotto committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    97810d4 View commit details
    Browse the repository at this point in the history

  5. rewrite error-handling for nml import to satisfy flow

    @philippotto
    philippotto committed Jul 23, 2018
    2 Configuration menu
    Copy the full SHA
    a1b906f View commit details
    Browse the repository at this point in the history

  6. fix linting

    @philippotto
    philippotto committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    bb99591 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. rename variable

    @philippotto
    philippotto committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    d94073e View commit details
    Browse the repository at this point in the history