Code

Show active users modal #2863

Code

Merged

fm3 merged 32 commits intomasterscalableminds/webknossos:masterfrom show-active-users-modalscalableminds/webknossos:show-active-users-modalCopy head branch name to clipboardAug 13, 2018

+554-81

Commits

Commits on Jul 4, 2018

• Added usersWithOpenTasks to the admin api. Added a button to the projects-view that displays all users with open tasks of the selected project in a modal

  MichaelBuessemeyer

  committed
  4c0ccc9

  Copy full SHA for 4c0ccc9

Commits on Jul 6, 2018

• added method to transfer many tasks at once to admin_rest_api, created a modified copy of the task_transfer_modal to control a bulk task transfer

  MichaelBuessemeyer

  committed
  c65843c

  Copy full SHA for c65843c

• adding a fetch function, that fetches all users with open tasks -> onhold, waiting for backend to provide the api request

  MichaelBuessemeyer

  committed
  18129e5

  Copy full SHA for 18129e5

• creating mock data, ongoing

  MichaelBuessemeyer

  committed
  a94b18f

  Copy full SHA for a94b18f

Commits on Jul 8, 2018

• added mock data, the modal is now working and displayable but has no real functionallity

  MichaelBuessemeyer

  committed
  d285460

  Copy full SHA for d285460

• fixed flow errors

  MichaelBuessemeyer

  committed
  93bce49

  Copy full SHA for 93bce49

Commits on Jul 9, 2018

• fixed flow errors and added some error handling if no project was selected

  MichaelBuessemeyer

  committed
  f31013b

  Copy full SHA for f31013b

• [WIP] transfer annotations to different user for api #2862

  

  Youri K

  committed
  a3acacf

  Copy full SHA for a3acacf

• Merge branch 'master' of github.com:scalableminds/webknossos into add-api-request-for-open-tasks

  

  Youri K

  committed
  5628221

  Copy full SHA for 5628221

• [WIP] route for transferring active tasks of a project to a user #2862

  

  Youri K

  committed
  df84522

  Copy full SHA for df84522

• routes for showing active tasks and transfering them #2862

  

  Youri K

  committed
  b88a2ea

  Copy full SHA for b88a2ea

• Merge branch 'master' of github.com:scalableminds/webknossos into show-active-users-modal

  MichaelBuessemeyer

  committed
  0aa6baf

  Copy full SHA for 0aa6baf

• Merge branch 'show-active-users-modal' of github.com:scalableminds/webknossos into add-api-request-for-open-tasks

  

  Youri K

  committed
  16c6f52

  Copy full SHA for 16c6f52

• added changelog, moved error message to messages, fixed flow error

  MichaelBuessemeyer

  committed
  7c958f5

  Copy full SHA for 7c958f5

Commits on Jul 11, 2018

• added the request for active users to the admin_rest_api and used it to display the table in the modal

  MichaelBuessemeyer

  committed
  9c21832

  Copy full SHA for 9c21832

Commits on Jul 12, 2018

• added a type for activeUsers, added an api request to transfer all active tasks of a project, transfer modal only renders if set to visible

  MichaelBuessemeyer

  committed
  7fc64d3

  Copy full SHA for 7fc64d3

• reverted changelog -> entry for this issue still missing

  MichaelBuessemeyer

  committed
  923aaba

  Copy full SHA for 923aaba

• added changelog entry

  MichaelBuessemeyer

  committed
  586f21d

  Copy full SHA for 586f21d

• Merge branch 'master' into show-active-users-modal

  MichaelBuessemeyer

  authored
  f368318

  Copy full SHA for f368318

• added message for successful transfer, added transfer functionality, and change api call to post-type

  MichaelBuessemeyer

  committed
  dd9c02b

  Copy full SHA for dd9c02b

• Merge branch 'show-active-users-modal' of github.com:scalableminds/webknossos into show-active-users-modal

  MichaelBuessemeyer

  committed
  1bf3214

  Copy full SHA for 1bf3214

• corrected changelog entry

  MichaelBuessemeyer

  committed
  6ea5366

  Copy full SHA for 6ea5366

• added error handling to the transfer request, added an error message to messages

  MichaelBuessemeyer

  committed
  69ca333

  Copy full SHA for 69ca333

• refeshed snapshots

  MichaelBuessemeyer

  committed
  3d0c911

  Copy full SHA for 3d0c911

Commits on Jul 30, 2018

• merge master into show-active-users-modal

  fm3

  committed
  330e19c

  Copy full SHA for 330e19c

Commits on Aug 9, 2018

• refactored requested changes

  MichaelBuessemeyer

  committed
  c00e535

  Copy full SHA for c00e535

• resolved conflicts

  MichaelBuessemeyer

  committed
  b3e83a7

  Copy full SHA for b3e83a7

• updated snapshots and resolved auto merging errors

  MichaelBuessemeyer

  committed
  464ac2e

  Copy full SHA for 464ac2e

Commits on Aug 10, 2018

• fixed flow type problems

  MichaelBuessemeyer

  committed
  f3c31b8

  Copy full SHA for f3c31b8

• fixed linter issues

  MichaelBuessemeyer

  committed
  970f3d7

  Copy full SHA for 970f3d7

• added a spinner while fetching data

  MichaelBuessemeyer

  committed
  0a2aba0

  Copy full SHA for 0a2aba0

Commits on Aug 13, 2018

• disallow transferring tasks to users who cannot access the dataset

  fm3

  committed
  6b5b4af

  Copy full SHA for 6b5b4af