Merge Master -> Dev

[tmbo]

Due to the merge of the last big feature branch that was branched from master anonymous we need to merge the master back into the development branch.

Log Time

[hotzenklotz]

@tmbo I merged all the JS files. Compilation with webpack runs through, but I haven't been able to test all the merged features yet. Can you please merge the scala part.

therold@Helgas-MacBook-Pro:~/Programming/oxalis (dev)$ git pull origin master
From github.com:scalableminds/oxalis
 * branch            master     -> FETCH_HEAD
Auto-merging project/Build.scala
CONFLICT (content): Merge conflict in project/Build.scala
Auto-merging conf/routes
CONFLICT (content): Merge conflict in conf/routes
Auto-merging conf/messages
Auto-merging conf/evolutions/15.js
CONFLICT (add/add): Merge conflict in conf/evolutions/15.js
Auto-merging conf/evolutions/14.js
CONFLICT (add/add): Merge conflict in conf/evolutions/14.js
CONFLICT (modify/delete): app/views/tracing/trace.scala.html deleted in HEAD and modified in 777b966dea8460009c7c78dfd25fd855a0f7da08. Version 777b966dea8460009c7c78dfd25fd855a0f7da08 of app/views/tracing/trace.scala.html left in tree.
Auto-merging app/views/pageHeader.scala.html
Auto-merging app/views/mainHeader.scala.html
CONFLICT (modify/delete): app/views/admin/task/taskEdit.scala.html deleted in HEAD and modified in 777b966dea8460009c7c78dfd25fd855a0f7da08. Version 777b966dea8460009c7c78dfd25fd855a0f7da08 of app/views/admin/task/taskEdit.scala.html left in tree.
CONFLICT (modify/delete): app/views/admin/task/taskCreate.scala.html deleted in HEAD and modified in 777b966dea8460009c7c78dfd25fd855a0f7da08. Version 777b966dea8460009c7c78dfd25fd855a0f7da08 of app/views/admin/task/taskCreate.scala.html left in tree.
CONFLICT (modify/delete): app/views/admin/task/basicTaskForm.scala.html deleted in HEAD and modified in 777b966dea8460009c7c78dfd25fd855a0f7da08. Version 777b966dea8460009c7c78dfd25fd855a0f7da08 of app/views/admin/task/basicTaskForm.scala.html left in tree.
Auto-merging app/oxalis/security/Secured.scala
CONFLICT (content): Merge conflict in app/oxalis/security/Secured.scala
Auto-merging app/oxalis/nml/Tree.scala
CONFLICT (content): Merge conflict in app/oxalis/nml/Tree.scala
Auto-merging app/oxalis/nml/NMLParser.scala
Auto-merging app/oxalis/annotation/handler/DataSetInformationHandler.scala
Auto-merging app/models/user/UserService.scala
CONFLICT (content): Merge conflict in app/models/user/UserService.scala
Auto-merging app/models/user/User.scala
Auto-merging app/models/tracing/volume/VolumeTracing.scala
CONFLICT (content): Merge conflict in app/models/tracing/volume/VolumeTracing.scala
Auto-merging app/models/tracing/skeleton/temporary/TemporarySkeletonTracingService.scala
Auto-merging app/models/tracing/skeleton/temporary/TemporarySkeletonTracing.scala
Auto-merging app/models/tracing/skeleton/SkeletonTracingLike.scala
CONFLICT (content): Merge conflict in app/models/tracing/skeleton/SkeletonTracingLike.scala
Auto-merging app/models/tracing/skeleton/SkeletonTracing.scala
CONFLICT (content): Merge conflict in app/models/tracing/skeleton/SkeletonTracing.scala
Auto-merging app/models/tracing/skeleton/JsonTracingUpdater.scala
Auto-merging app/models/task/TaskType.scala
CONFLICT (content): Merge conflict in app/models/task/TaskType.scala
Auto-merging app/models/task/TaskService.scala
CONFLICT (content): Merge conflict in app/models/task/TaskService.scala
Auto-merging app/models/task/Task.scala
CONFLICT (content): Merge conflict in app/models/task/Task.scala
Auto-merging app/models/task/Project.scala
Auto-merging app/models/binary/DataSet.scala
Auto-merging app/models/annotation/AnnotationService.scala
CONFLICT (content): Merge conflict in app/models/annotation/AnnotationService.scala
Auto-merging app/models/annotation/AnnotationMutations.scala
CONFLICT (content): Merge conflict in app/models/annotation/AnnotationMutations.scala
Auto-merging app/models/annotation/AnnotationContent.scala
Auto-merging app/models/annotation/Annotation.scala
Auto-merging app/controllers/admin/TaskTypeAdministration.scala
CONFLICT (content): Merge conflict in app/controllers/admin/TaskTypeAdministration.scala
CONFLICT (modify/delete): app/controllers/admin/TaskAdministration.scala deleted in HEAD and modified in 777b966dea8460009c7c78dfd25fd855a0f7da08. Version 777b966dea8460009c7c78dfd25fd855a0f7da08 of app/controllers/admin/TaskAdministration.scala left in tree.
Auto-merging app/controllers/UserController.scala
CONFLICT (content): Merge conflict in app/controllers/UserController.scala
Auto-merging app/controllers/TaskController.scala
CONFLICT (content): Merge conflict in app/controllers/TaskController.scala
Auto-merging app/controllers/StatisticsController.scala
CONFLICT (content): Merge conflict in app/controllers/StatisticsController.scala
Auto-merging app/controllers/ProjectController.scala
CONFLICT (content): Merge conflict in app/controllers/ProjectController.scala
Auto-merging app/controllers/DataSetController.scala
Auto-merging app/controllers/Controller.scala
Auto-merging app/controllers/Application.scala
Auto-merging app/controllers/AnnotationController.scala
CONFLICT (content): Merge conflict in app/controllers/AnnotationController.scala
Auto-merging app/assets/javascripts/oxalis/view/volumetracing/volumetracing_view.coffee
Auto-merging app/assets/javascripts/oxalis/view/skeletontracing/skeletontracing_view.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/view/skeletontracing/skeletontracing_view.coffee
Auto-merging app/assets/javascripts/oxalis/view/plane_view.coffee
Auto-merging app/assets/javascripts/oxalis/view/modal.coffee
Auto-merging app/assets/javascripts/oxalis/view/arbitrary_view.coffee
Auto-merging app/assets/javascripts/oxalis/view.coffee
Auto-merging app/assets/javascripts/oxalis/model/volumetracing/volumetracing_statelogger.coffee
Auto-merging app/assets/javascripts/oxalis/model/volumetracing/volumetracing.coffee
Auto-merging app/assets/javascripts/oxalis/model/skeletontracing/tracingparser.coffee
Auto-merging app/assets/javascripts/oxalis/model/skeletontracing/tracepoint.coffee
Auto-merging app/assets/javascripts/oxalis/model/skeletontracing/skeletontracing_statelogger.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/model/skeletontracing/skeletontracing_statelogger.coffee
Auto-merging app/assets/javascripts/oxalis/model/skeletontracing/skeletontracing.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/model/skeletontracing/skeletontracing.coffee
Auto-merging app/assets/javascripts/oxalis/model/flycam3d.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/model/flycam3d.coffee
Auto-merging app/assets/javascripts/oxalis/model/flycam2d.coffee
Auto-merging app/assets/javascripts/oxalis/model.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/model.coffee
Auto-merging app/assets/javascripts/oxalis/controller/viewmodes/plane_controller.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/controller/viewmodes/plane_controller.coffee
Auto-merging app/assets/javascripts/oxalis/controller/viewmodes/arbitrary_controller.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/controller/viewmodes/arbitrary_controller.coffee
Auto-merging app/assets/javascripts/oxalis/controller/url_manager.coffee
Auto-merging app/assets/javascripts/oxalis/controller/combinations/skeletontracing_plane_controller.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/controller/combinations/skeletontracing_plane_controller.coffee
Auto-merging app/assets/javascripts/oxalis/controller.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/controller.coffee
Auto-merging app/assets/javascripts/oxalis/constants.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/oxalis/constants.coffee
Auto-merging app/assets/javascripts/libs/request.coffee
Auto-merging app/assets/javascripts/dashboard/views/dashboard_task_list_item_view.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/dashboard/views/dashboard_task_list_item_view.coffee
Auto-merging app/assets/javascripts/admin/views/tasktype/task_type_item_view.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/admin/views/tasktype/task_type_item_view.coffee
Auto-merging app/assets/javascripts/admin/views/tasktype/task_type_form_view.coffee
Auto-merging app/assets/javascripts/admin/views/statistic/achievement_view.coffee
Auto-merging app/assets/javascripts/admin/views/project/project_list_item_view.coffee
CONFLICT (content): Merge conflict in app/assets/javascripts/admin/views/project/project_list_item_view.coffee
Automatic merge failed; fix conflicts and then commit the result.

[hotzenklotz]

Stuff that need testing:

• [x] Creating/Editing Tasks with Rotation
• [x] Hiding menus when in "anonymous" mode
• [x] Opening Traceing View in correct Mode
• [x] "Get next task" Feature
• [x] Modal when getting a new TaskType
• [x] Time limits for anonymous users
• [x] FPS counter
• [x] Show Anonymous Tracing Links
• [x] Deleting the active node and jumping/animating to previos node

[tmbo]

@hotzenklotz whats the branch name?

[hotzenklotz]

Sorry. master-merge

[tmbo]

@hotzenklotz ich hab den merge soweit angefangen, das er compiliert, muss aber noch mal drüber schauen. du solltest jetzt aber auf jeden fall erstmal weitermachen können.

Sind noch ein paar sachen offen, die schreib ich dann wenn ich zuhause bin.

[hotzenklotz]

@tmbo I believe the server still ignores the editRotation and isForAnonymous attributes when trying to edit/modify a task. It also does not send these attributes on a request to /api/tasks/:id.

[hotzenklotz]

@tmbo Task deletion seems broken. In the task overview table I can delete tasks successfully, but after a window refresh they are all back.