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

Make merger mode work for all skeleton modifications #4669

Merged
merged 10 commits into from
Jun 25, 2020
Merged

Make merger mode work for all skeleton modifications #4669

merged 10 commits into from
Jun 25, 2020

Commits on Jun 16, 2020

  1. make merger mode work in more general skeleton modification cases, fi… 

    …x some related bugs
    @daniel-wer
    daniel-wer committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    5b40c16 View commit details
    Browse the repository at this point in the history

  2. correctly reset merger mode state in task hotswap

    @daniel-wer
    daniel-wer committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    56a4497 View commit details
    Browse the repository at this point in the history

  3. update changelog

    @daniel-wer
    daniel-wer committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    f1e2777 View commit details
    Browse the repository at this point in the history

  4. fix race-condition during merger mode tasks

    @daniel-wer
    daniel-wer committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    53101b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Merge branch 'master' into better-merger-mode

    @hotzenklotz
    hotzenklotz authored Jun 24, 2020
    Configuration menu
    Copy the full SHA
    caa0bca View commit details
    Browse the repository at this point in the history

  2. adapt merger mode message and move it to messages

    @daniel-wer
    daniel-wer committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    fccbccf View commit details
    Browse the repository at this point in the history

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

    …ter-merger-mode
    @daniel-wer
    daniel-wer committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    e70ffb8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'better-merger-mode' of github.com:scalableminds/webknos… 

    …sos into better-merger-mode
    @daniel-wer
    daniel-wer committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    eded44c View commit details
    Browse the repository at this point in the history

  5. avoid node creation outside of segments in merger mode earlier to avo… 

    …id messing up undo
    @daniel-wer
    daniel-wer committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    4e500ba View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Merge branch 'master' into better-merger-mode

    @daniel-wer
    daniel-wer authored Jun 25, 2020
    Configuration menu
    Copy the full SHA
    4c248fe View commit details
    Browse the repository at this point in the history