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.

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

[OX-766] Merge several branches into dev, test #2

Closed
tmbo opened this issue Aug 27, 2013 · 1 comment
Closed

[OX-766] Merge several branches into dev, test #2

tmbo opened this issue Aug 27, 2013 · 1 comment
Assignees

Comments

@tmbo
Copy link
Member

tmbo commented Aug 27, 2013

[reporter="georg", created="Wed, 21 Aug 2013 21:26:16 +0200"]

Log Time

@ghost ghost assigned georgwiese Aug 27, 2013
georgwiese added a commit that referenced this issue Sep 24, 2013
@tmbo
Copy link
Member Author

tmbo commented Oct 13, 2013

Can this one get closed?

daniel-wer added a commit that referenced this issue Aug 18, 2017
daniel-wer added a commit that referenced this issue Oct 21, 2017
daniel-wer added a commit that referenced this issue Aug 16, 2018
daniel-wer added a commit that referenced this issue Aug 20, 2018
* write first version of function that writes files to check flow types against backend objects, add function to misc, annotation, task, dataset e2e files

* add flow checks to remainder of e2e files, add timetracking data to test db and update snapshots

* update snapshots, add eslintignore

* run flow after e2e tests to check the generated files as well

* adjust text in gitkeep file for flow-check

* apply PR feedback

* apply PR feedback #2
daniel-wer added a commit that referenced this issue Sep 17, 2018
* first working version of tracing version restore

* added types and categorized some update action batches to show better description and icon

* improve batch description, save before opening version restore view

* rework flow types for ServerUpdateActions

* fix missing null checks

* only scroll version list in version history view

* remove obsolete import

* PR feedback #1, show info alert instead of tracing actions

* in updateActionLog, annotate batches with version number (#3203)

* PR feedback #2, scroll into view, descriptions for other update actions

* adapt changelog and docs

* [docs] point to 'restore older version' from redo/undo, fix typo

* make version restore view's position fixed, style fixes, allow showVersionRestore url parameter that opens the version restore view without fetching the newest tracing
daniel-wer added a commit that referenced this issue Mar 5, 2019
daniel-wer added a commit that referenced this issue Mar 13, 2019
* add first version of add remote dataset view

* add isConnector property to datastores

* add dataset tab to import wk-connect datasets, refactor add dataset state handling

* only show wk-connect tab if there are wk-connect datastores

* Update dataStores.csv

* add some comments

* update snapshots

* apply PR feedback

* apply PR feedback #2

* update changelog

* update migration log

* fix issues after sample datasets merge, use generic useFetch

* fix lint
daniel-wer added a commit that referenced this issue Apr 9, 2019
daniel-wer pushed a commit that referenced this issue Apr 10, 2019
* integrate first version of tensorflow-js segmentation model

* add flood fill and whole viewport prediction

* implement high-perf way of accessing arbitrary cuboid data in front-end

* fix some things, wand is working again

* fix everything

* copy tf models via webpack

* upgrade webpack

* increase node memory

* fix lint, tests

* fix model asset path

* update tensorflowjs to 1.0

* move viewport when pressing alt and moving mouse

* Tensorflow segmentation statistics (#3946)

* [WIP] provide sampled mean and stdev for color layer data

* convert to unsigned, clean up

* best resolution is actually min, not max

* pretty-backend

* adapt tensorflow segmentation to rectangular viewports

* fix lint

* added mean and stdDev fetching route and using it for the magic wand tool

* applied  new formular again

* fixed lint and flow

* predict for next 5 slices as well

* allow tf inference in webworker

* made magic wand tool optional

* fix shard in webpack-dev-server mode

* enabled magic wand tool as default

* fix tests

* use new segem model, restrict viewport to 100x100 voxel for perf

* small perf/cleanup fixes

* load model from right path

* only use webworker if offscreencanvas is supported

* use 3d-floodfill for magic wand

* add and adapt floodfill lib, do 3d floodfill, do tile-based predict and floodfill

* adapt floodfill to work slice for slice, optimize voxel labeling, remove unneccessary floodfill parts

* add flow to floodfill, fix flow

* add magic wand unlimited mode, will predict next x slices until aborted via toast

* use global tiles instead of viewport local, makes everything easier

* update the whole position, so that segments that move out of the viewport later will be correctly predicted

* fix magic wand for xz and yz planes

* fix mean,stddev memoization, refactor common code

* small changes to toast and code

* add new tensorflow model, apply PR feedback #1

* apply PR feedback #2

* update redux-saga and typedefs to 1.0, avoid spawning magic wand twice

* clean up prediction data for old z slices, rename magic wand to automatic brush

* refactor automatic brushing code into own module

* disable magic wand by default

* react to zoom changes, amend automatic brush label

* apply PR feedback #3, use newest model with slightly different normalization, make floodfill_threshold configurable

* disable automatic brush by default
youri-k added a commit that referenced this issue Aug 11, 2020
* load blocks of 10 ids instead of one and remove unnecessary async code

* use hdf dataset for caching and synchronize cache correctly

* log time of handling uncached keys and create new config value for block size

* add cumsum support to access data in a blockwise fashion

* minor refactoring

* shorten range for long cumsum ranges

* fix bb traversal

* add logging

* calc global cuboid for processing

* use correct sorting

* cleanup code

* initialize offset with reader range

* update config

* update changelog

* implement pr feedback
daniel-wer added a commit that referenced this issue Jan 17, 2022
philippotto added a commit that referenced this issue Feb 28, 2022
* initial version of connectome viewer using mocked data

* remove self-synapses from mock data, load agglomerate on check

* merge master

* allow to render multiple Skeletons (skeleton.js)

* refactor and unify restrictions handling in skeletontracing reducer, avoid indentation

* allow merger mode if allowUpdate is false

* load agglomerates from connectome tab into separate section of the store, but still display them

* remove skeletons when unchecking agglomerates

* Add stubs for connectome file backend routes

* validate POST parameters in backend routes

* adapt frontend api routes according to backend route draft, request synapse types and display as Tag next to synapse

* remove obsolete BasicSkeletonTracing and fix tests

* add synapses as single-node trees, use synapse type for node color, dynamically diff connectome data and add/delete synapse trees accordingly, add reset button

* lazy load agglomerate skeletons and toggle visibility otherwise, remove agglomerate skeletons if they are no longer part of the connectome data

* merge master

* Implement single-id case for synapses route

* implement synaptic partner lookup

* include mapping name with connectome file list

* positions for synapses

* add synapse types

* add basic filter ui and filter connectome tree, prepare filtering at state level to remove filtered synapse trees as well

* fix agglomerateIds key, mock typeToString in connectome_view until backend sends correct mapping

* Fix index reading for synapses by agglomerate

* filter both the connectome tab view and the synapses/agglomerates displayed in the viewports

* read synapse types from json

* fix empty array case in hdf reading

* naming things

* dynamically add/remove/show/hide agglomerate skeletons based on filters and checked nodes, enhance filter UI

* replace synapseTypes mock with an error toast if no json file was found and mock types only then

* enable virtual scroll for antd tree to boost performance

* reliably expand all nodes when selecting new agglomerate

* only hide/show synapse trees if they are filtered

* prepare specification of multiple agglomerate ids

* small refactorings, properly persist available connectome files in store, allow to select connectome file

* run importjs

* fix automatic merge

* implement hotlinking of agglomerates in the connectome tab so that they are automatically loaded when opening a link

* add synapse direction filter

* increase performance of hiding/showing/deleting synapses, 10x faster to filter now

* implement getVisibleOrLastSegmentationLayer, update caniuse-lite

* fix number NaN parsing and reset

* query synapses between agglomerate set from connectome file (#5907)

* [WIP] query synapses between agglomerate set from connectome file

* add connectome route for synapses between arbitrary pairs

* consider both directions of agglomerate pairs

Co-authored-by: Daniel Werner <[email protected]>

* improve filtering and small refactorings

* refactor connectomeData data format to be more flat so it's easier to reason about and work with

* allow hotlinking to synapses even if the connectome tab is not visible, lazy-load synapse tree DOM nodes

* do not automatically activate mapping for connectome tab, show info alert to activate

* clean up skeleton when switching segmentation layer in connectome tab

* use native flatMap

* add context menu to second-level segments with the option to show all synapses for them, can be used to 'walk' the connectome

* fix synapse direction filtering, fix initial loading performance which was caused by temporarily disabled virtualization

* fix synapse type filtering for real and simplify code

* remove connectome mock data

* apply PR feedback, use all antd preset colors for synapse types instead of only the first 8

* extract SynapseTree into its own component

* extract ConnectomeFilters and ConnectomeSettings into their own components

* fix agglomerate filtering if synapse direction was filtered

* fix initial auto-expand of all keys

* decrease size of expandedKeys array to only contain valid entries

* check and uncheck all trees representing the same agglomerate

* update docs, clean up when switching connectome file

* fix bug where store updates could be swallowed if the update was triggered by a store listener

* fix tooltips

* add some more comments

* keep activeAgglomerateIds if the connectome file is changed, always delete/add synapse trees instead of hiding/showing since it is faster, less complex, and less error-prone

* fix race condition during connectome activation

* fix connectome initialization if the tab is not visible, add screenshot test and snapshot

* fix typo

* apply PR feedback #1

* apply PR feedback #2

* highlight hovered segment ID when hovering in connectome tab

* add entry to load synapses for agglomerate to context menu, fix mapping activation with subsequent mesh loading, unify segmentation id access

* allow to load synapses for agglomerates in view mode, refactor agglomerate skeleton loading to different actions for normal tracing and connectome to account for different initialization and access restrictions

* agglomerate can have too many nodes or too many edges

* fix error in type definition that popped up after lodash type improvement

* move reset logic to componentDidUpdate and add comment

* add particleSize slider to connectome settings since it would otherwise not be available if there is no skeleton tracing, tweak setting styles to make full use of antd grid without any custom margins or fixed widths

* avoid permanent node selection to fix that every second click didn't jump to the synapse position

* tune instructions on how to get started with the connectome tab

* update changelog

* temporarily enable nightly tests and renew connectome dataset screenshot

* use dev deployment for nightly tests

* revert enabling nightly tests for this branch

* add method to find the ultimatelyRenderedZoomStepAtPosition in contrast to the currentlyRenderedZoomStepAtPosition by waiting until buckets are loaded before checking whether the zoomStep is renderable for a specific position. This is needed to wait for loaded data after an agglomerate file mapping was activated, for example, when activating a mapping through the context menu before loading a precomputed mesh or before loading synapses for an agglomerate

* control visibility of connectome tab via feature flag in application.conf

* temporarily enable Connectome tab via application.conf

* unbump currentLayoutVersion since the connectome tab can be added ad-hoc now

* Apply suggestions from code review

Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
hotzenklotz added a commit that referenced this issue Nov 15, 2022
hotzenklotz added a commit that referenced this issue Jan 5, 2023
* first draft for new organization page

* enable access to orga page in navbar avatar menu

* Add pricing plan schema

* fix navbar links to orga page

* more pricing stuff

* orga page refactoring

* Use default user/storage values for different plans

* Add new model fields

* Assert user count does not exceed includedUsers when joining org

* Pass incudedStorage in MB

* fix deprecation warning

* refactor orga view into sub-components

* adapt enum in scala

* many tweaks to orga view

* added modals for extending pricing plans

* added actual user count to orga page limits

* Insert new fields into organization table

* REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.

* enforce user quota for email invites

* map null value to max int

* handle infinite orga storage

* small re-phrasing

* enforce user limit on email invites

* pretty + lint

* Update conf/evolutions/091-pricing-plans.sql

Co-authored-by: Florian M <[email protected]>

* added background images for pricing plan modals

* added alert when plans is about to exceed

* show a plan expriation warning diectly on the dashboard

* fix content for upgrade plan modal

* prettier

* updated changelog

* adapt test db

* added backend routes for send out pricing plan uprgade emails

* backend formatting

* connect frontend and backend prciing email routes

* stuff

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update conf/messages

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanUsers.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToTeam.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToPower.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanStorage.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/extendPricingPlan.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback and switch background images to JPEGs

* applied PR feedback #2

* PR feedback #3 / fix upgrade modals

* Update frontend/javascripts/admin/onboarding.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback #4

* pretty

* PR feedback #5

* refactored pricing upgrade emails to be a confirmation to the user

* formatting

* fixed warning "plan is about to expire" when it already has expired

* fix evolution schema versioning

* rephrase all reference to "Free" plan to "Basic"

* Add route /pricing/status

* redesigned upgrade modal to show both team power plans

* integrated pricing plan status API

* fix evolutions

* also respect paidUntil in exceeded checks

* disable pricing plan warnings on dashboard for now

* make linter happy

* linting & formatting

* fix default orga DB

* fixed typescript typing errors

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback

* update schema version to 94

* fix CI?

* prevent prcing plan alarms from showing actions for unauthorized people

* added owner check for warnings

* added confirmation toasts on sucessful upgrade requests

* fix toast messages

* migration guide

Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Norman Rzepka <[email protected]>
philippotto added a commit that referenced this issue Jan 9, 2023
# This is the 1st commit message:

show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById

# This is the commit message #2:

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

# This is the commit message #3:

fix incorrect encoding/decoding of node ids between webGL and JS

# This is the commit message #4:

update changelog

# This is the commit message #5:

Update config.yml
philippotto added a commit that referenced this issue Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

Fix some failing validations of neuroglancer URLs (#6722)

* make neuroglancer import compatible with URLs that encode subsources and improve validation in general

* update changelog

Add Pricing Plans to Organization Page (#6602)

* first draft for new organization page

* enable access to orga page in navbar avatar menu

* Add pricing plan schema

* fix navbar links to orga page

* more pricing stuff

* orga page refactoring

* Use default user/storage values for different plans

* Add new model fields

* Assert user count does not exceed includedUsers when joining org

* Pass incudedStorage in MB

* fix deprecation warning

* refactor orga view into sub-components

* adapt enum in scala

* many tweaks to orga view

* added modals for extending pricing plans

* added actual user count to orga page limits

* Insert new fields into organization table

* REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.

* enforce user quota for email invites

* map null value to max int

* handle infinite orga storage

* small re-phrasing

* enforce user limit on email invites

* pretty + lint

* Update conf/evolutions/091-pricing-plans.sql

Co-authored-by: Florian M <[email protected]>

* added background images for pricing plan modals

* added alert when plans is about to exceed

* show a plan expriation warning diectly on the dashboard

* fix content for upgrade plan modal

* prettier

* updated changelog

* adapt test db

* added backend routes for send out pricing plan uprgade emails

* backend formatting

* connect frontend and backend prciing email routes

* stuff

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update conf/messages

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanUsers.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToTeam.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToPower.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanStorage.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/extendPricingPlan.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback and switch background images to JPEGs

* applied PR feedback #2

* PR feedback #3 / fix upgrade modals

* Update frontend/javascripts/admin/onboarding.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback #4

* pretty

* PR feedback #5

* refactored pricing upgrade emails to be a confirmation to the user

* formatting

* fixed warning "plan is about to expire" when it already has expired

* fix evolution schema versioning

* rephrase all reference to "Free" plan to "Basic"

* Add route /pricing/status

* redesigned upgrade modal to show both team power plans

* integrated pricing plan status API

* fix evolutions

* also respect paidUntil in exceeded checks

* disable pricing plan warnings on dashboard for now

* make linter happy

* linting & formatting

* fix default orga DB

* fixed typescript typing errors

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback

* update schema version to 94

* fix CI?

* prevent prcing plan alarms from showing actions for unauthorized people

* added owner check for warnings

* added confirmation toasts on sucessful upgrade requests

* fix toast messages

* migration guide

Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Norman Rzepka <[email protected]>

fixed unreleased changelog

fix changelog typo

disabled "about to exceed storage space" warning
philippotto added a commit that referenced this issue Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

Fix some failing validations of neuroglancer URLs (#6722)

* make neuroglancer import compatible with URLs that encode subsources and improve validation in general

* update changelog

Add Pricing Plans to Organization Page (#6602)

* first draft for new organization page

* enable access to orga page in navbar avatar menu

* Add pricing plan schema

* fix navbar links to orga page

* more pricing stuff

* orga page refactoring

* Use default user/storage values for different plans

* Add new model fields

* Assert user count does not exceed includedUsers when joining org

* Pass incudedStorage in MB

* fix deprecation warning

* refactor orga view into sub-components

* adapt enum in scala

* many tweaks to orga view

* added modals for extending pricing plans

* added actual user count to orga page limits

* Insert new fields into organization table

* REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.

* enforce user quota for email invites

* map null value to max int

* handle infinite orga storage

* small re-phrasing

* enforce user limit on email invites

* pretty + lint

* Update conf/evolutions/091-pricing-plans.sql

Co-authored-by: Florian M <[email protected]>

* added background images for pricing plan modals

* added alert when plans is about to exceed

* show a plan expriation warning diectly on the dashboard

* fix content for upgrade plan modal

* prettier

* updated changelog

* adapt test db

* added backend routes for send out pricing plan uprgade emails

* backend formatting

* connect frontend and backend prciing email routes

* stuff

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update conf/messages

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanUsers.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToTeam.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToPower.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanStorage.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/extendPricingPlan.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback and switch background images to JPEGs

* applied PR feedback #2

* PR feedback #3 / fix upgrade modals

* Update frontend/javascripts/admin/onboarding.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback #4

* pretty

* PR feedback #5

* refactored pricing upgrade emails to be a confirmation to the user

* formatting

* fixed warning "plan is about to expire" when it already has expired

* fix evolution schema versioning

* rephrase all reference to "Free" plan to "Basic"

* Add route /pricing/status

* redesigned upgrade modal to show both team power plans

* integrated pricing plan status API

* fix evolutions

* also respect paidUntil in exceeded checks

* disable pricing plan warnings on dashboard for now

* make linter happy

* linting & formatting

* fix default orga DB

* fixed typescript typing errors

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback

* update schema version to 94

* fix CI?

* prevent prcing plan alarms from showing actions for unauthorized people

* added owner check for warnings

* added confirmation toasts on sucessful upgrade requests

* fix toast messages

* migration guide

Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Norman Rzepka <[email protected]>

fixed unreleased changelog

fix changelog typo

disabled "about to exceed storage space" warning
philippotto added a commit that referenced this issue Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

Fix some failing validations of neuroglancer URLs (#6722)

* make neuroglancer import compatible with URLs that encode subsources and improve validation in general

* update changelog

Add Pricing Plans to Organization Page (#6602)

* first draft for new organization page

* enable access to orga page in navbar avatar menu

* Add pricing plan schema

* fix navbar links to orga page

* more pricing stuff

* orga page refactoring

* Use default user/storage values for different plans

* Add new model fields

* Assert user count does not exceed includedUsers when joining org

* Pass incudedStorage in MB

* fix deprecation warning

* refactor orga view into sub-components

* adapt enum in scala

* many tweaks to orga view

* added modals for extending pricing plans

* added actual user count to orga page limits

* Insert new fields into organization table

* REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.

* enforce user quota for email invites

* map null value to max int

* handle infinite orga storage

* small re-phrasing

* enforce user limit on email invites

* pretty + lint

* Update conf/evolutions/091-pricing-plans.sql

Co-authored-by: Florian M <[email protected]>

* added background images for pricing plan modals

* added alert when plans is about to exceed

* show a plan expriation warning diectly on the dashboard

* fix content for upgrade plan modal

* prettier

* updated changelog

* adapt test db

* added backend routes for send out pricing plan uprgade emails

* backend formatting

* connect frontend and backend prciing email routes

* stuff

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update conf/messages

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanUsers.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToTeam.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToPower.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanStorage.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/extendPricingPlan.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback and switch background images to JPEGs

* applied PR feedback #2

* PR feedback #3 / fix upgrade modals

* Update frontend/javascripts/admin/onboarding.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback #4

* pretty

* PR feedback #5

* refactored pricing upgrade emails to be a confirmation to the user

* formatting

* fixed warning "plan is about to expire" when it already has expired

* fix evolution schema versioning

* rephrase all reference to "Free" plan to "Basic"

* Add route /pricing/status

* redesigned upgrade modal to show both team power plans

* integrated pricing plan status API

* fix evolutions

* also respect paidUntil in exceeded checks

* disable pricing plan warnings on dashboard for now

* make linter happy

* linting & formatting

* fix default orga DB

* fixed typescript typing errors

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback

* update schema version to 94

* fix CI?

* prevent prcing plan alarms from showing actions for unauthorized people

* added owner check for warnings

* added confirmation toasts on sucessful upgrade requests

* fix toast messages

* migration guide

Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Norman Rzepka <[email protected]>

fixed unreleased changelog

fix changelog typo

disabled "about to exceed storage space" warning
philippotto added a commit that referenced this issue Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById (#6724)

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById

remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code

fix incorrect encoding/decoding of node ids between webGL and JS

update changelog

Update config.yml

Fix some failing validations of neuroglancer URLs (#6722)

* make neuroglancer import compatible with URLs that encode subsources and improve validation in general

* update changelog

Add Pricing Plans to Organization Page (#6602)

* first draft for new organization page

* enable access to orga page in navbar avatar menu

* Add pricing plan schema

* fix navbar links to orga page

* more pricing stuff

* orga page refactoring

* Use default user/storage values for different plans

* Add new model fields

* Assert user count does not exceed includedUsers when joining org

* Pass incudedStorage in MB

* fix deprecation warning

* refactor orga view into sub-components

* adapt enum in scala

* many tweaks to orga view

* added modals for extending pricing plans

* added actual user count to orga page limits

* Insert new fields into organization table

* REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.

* enforce user quota for email invites

* map null value to max int

* handle infinite orga storage

* small re-phrasing

* enforce user limit on email invites

* pretty + lint

* Update conf/evolutions/091-pricing-plans.sql

Co-authored-by: Florian M <[email protected]>

* added background images for pricing plan modals

* added alert when plans is about to exceed

* show a plan expriation warning diectly on the dashboard

* fix content for upgrade plan modal

* prettier

* updated changelog

* adapt test db

* added backend routes for send out pricing plan uprgade emails

* backend formatting

* connect frontend and backend prciing email routes

* stuff

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update conf/messages

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanUsers.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToTeam.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanToPower.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/upgradePricingPlanStorage.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* Update app/views/mail/extendPricingPlan.scala.html

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback and switch background images to JPEGs

* applied PR feedback #2

* PR feedback #3 / fix upgrade modals

* Update frontend/javascripts/admin/onboarding.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/organization_cards.tsx

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/organization/pricing_plan_utils.ts

Co-authored-by: Norman Rzepka <[email protected]>

* Update frontend/javascripts/admin/admin_rest_api.ts

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback #4

* pretty

* PR feedback #5

* refactored pricing upgrade emails to be a confirmation to the user

* formatting

* fixed warning "plan is about to expire" when it already has expired

* fix evolution schema versioning

* rephrase all reference to "Free" plan to "Basic"

* Add route /pricing/status

* redesigned upgrade modal to show both team power plans

* integrated pricing plan status API

* fix evolutions

* also respect paidUntil in exceeded checks

* disable pricing plan warnings on dashboard for now

* make linter happy

* linting & formatting

* fix default orga DB

* fixed typescript typing errors

* Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* applied PR feedback

* update schema version to 94

* fix CI?

* prevent prcing plan alarms from showing actions for unauthorized people

* added owner check for warnings

* added confirmation toasts on sucessful upgrade requests

* fix toast messages

* migration guide

Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Norman Rzepka <[email protected]>

fixed unreleased changelog

fix changelog typo

disabled "about to exceed storage space" warning
hotzenklotz added a commit that referenced this issue Apr 13, 2023
hotzenklotz added a commit that referenced this issue Oct 18, 2023
hotzenklotz added a commit that referenced this issue Oct 23, 2023
* WIP: Add Render Animation Worker Job

* cleanup

* lint

* format frontend

* added modal for blender animation

* more tuning for animation modal

* added animation job options to frontend + backend

* further tweaks to animation modal

* assert SD resolution and watermark if organization pricing plan is basic

* iterate on render animation job

* format

* send parameters not as json to worker

* adapt modal to mockup

* pretty

* cleanup modal, make typechecker happy

* rename options to animation_options

* rename animation modal to CreateAnimationModal

* added selected meshes to animation job

* added color layer intensities to animation

* added frontend validaton to create animation job

* tune bounding box and mag selection and checks

* remove coming soon message

* linting

* updated wording

* select correct segmentation layer name and enable modal only for super users

* format

* undo dev-only changes in application.conf

* Update frontend/javascripts/oxalis/view/action-bar/create_animation_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* Update frontend/javascripts/oxalis/view/action-bar/create_animation_modal.tsx

Co-authored-by: Philipp Otto <[email protected]>

* PR feedback

* PR feedback #2

* set default values to undefined

---------

Co-authored-by: Tom Herold <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
hotzenklotz added a commit that referenced this issue Nov 15, 2023
hotzenklotz added a commit that referenced this issue Nov 23, 2023
* updated docs

* docs update #2

* applied some gpt4 feedback

* moar docs

* more docs on the data source formats

* more docs

* Update docs/dashboard.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/datasets.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/datasets.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/datasets.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/datasets.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/getting_started.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/image_stacks.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/image_stacks.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* Update docs/zarr.md

Co-authored-by: Norman Rzepka <[email protected]>

* added PR feedback

* added example video for animations

---------

Co-authored-by: Norman Rzepka <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants