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-548] Hack edge thickness in Windows #5

Closed
tmbo opened this issue Aug 27, 2013 · 17 comments
Closed

[OX-548] Hack edge thickness in Windows #5

tmbo opened this issue Aug 27, 2013 · 17 comments

Comments

@tmbo
Copy link
Member

tmbo commented Aug 27, 2013

[reporter="autoreporter", created="Thu, 28 Mar 2013 14:43:03 +0100"]

So as Daniel told me, setting the edge thickness of a particle Windows is not possible.
From time to time, I really need thicker edges though.
Here is what I would like to use instead:
Pressing "0" would increases the browser zoom level to 500%.
All controls would have to be scaled accordingly, or if that's not easily possible, not showed at all.
The viewport size would be set to 20%

Pressing "0" again would reset everything to where it was before. (Zoom 100%, Viewport size 100%)

Reported by: Kevin Boergens ([email protected])

Log Time

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Sat, 6 Apr 2013 16:04:42 +0200"]

Norman Rzepka
What's your opinion on this?

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="normanrz", created="Thu, 11 Apr 2013 16:53:22 +0200"]

Personally, I don't think it's a good idea.

We can't really zoom the browser interface in a sensible way. Everything will get pixelated or blurry.
Also this hack might cost you guys more than getting a mac. Are the lines correctly displayed on linux boxes?

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Sat, 13 Apr 2013 18:39:14 +0200"]

I see your point. Perhaps my solution was also too local.
But I feel that by now this problem in general has become pretty dramatic.
On a Windows system, it is virtually impossible to find an edge in the viewport where it is not obliquely cut.
Take a look at this:
https://dl.dropboxusercontent.com/u/64223389/wherestheedge.png
Are you able to find the edge without zooming in? (hint: it's turquoise)

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Sat, 13 Apr 2013 18:44:16 +0200"]

Why don't you increase the particle size a tiny bit, in combination with a slightly increased route clipping distance this should clearly indicate where that edge is?

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Sat, 13 Apr 2013 18:49:22 +0200"]

Particle size doesn't have any effect on edge thickness.
Clipping distance doesn't have any effect because the edge is pretty orthogonal (and also it's on the value (40) that Moritz recommends)

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="normanrz", created="Sat, 13 Apr 2013 18:53:06 +0200"]

Would it help to place a larger dot in the spot where the edge pierces the data slice?

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Sat, 13 Apr 2013 18:54:47 +0200"]

I know that it doesn't have any effects on edge thickness but on the particle size, so I thought you would see the particles that belong to this edge, which would indicate where it is.

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Sat, 13 Apr 2013 18:57:40 +0200"]

I like your thinking
The dot should have the diameter that the edge would have on a working setup.
A little alpha might also help to discern them from normal dots.

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Sat, 13 Apr 2013 18:59:39 +0200"]

@daniel: Yeah, that's true.. But I think that Norman made an excellent suggestion. I would be eager to see a demo version of that

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Thu, 25 Apr 2013 00:21:02 +0200"]

Unfortunately this isn't trivial, we would hava to calculate whether an edge cuts the data slice, 1. for every edge inside a tree, because the tree could cut the data slice in more than one spots, 2. for all three planes, 3. in EVERY frame.
This doesn't seem to be an appropriate solution.

Or do you know of a better solution for this kind of problem?

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Thu, 25 Apr 2013 10:36:11 +0200"]

Your solution sounds good.
Do you mean non-trivial in terms of implementing it or in terms of cpu load?

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Wed, 1 May 2013 13:04:28 +0200"]

Sry I missed your comment.
I mean non-trivial in terms of cpu load, just imagine a big tree with > 10000 nodes and what would need to be done in every single frame.

Give me one more day, I'm onto sth. there, seems like we'll be able to make it work

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Wed, 1 May 2013 14:31:54 +0200"]

Ah, I see your point.
I was thinking that per tree it's just an arithmetic operation, so it might be possible.
I'm not sure about that though.
Keep me updated how things are going

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Thu, 2 May 2013 00:25:02 +0200"]

Alright you can start chrome with the

--use-gl=desktop

flag (close all instances before doing so), which tells it to use native open gl drivers instead of chrome's own angle drivers, which will enable different line widths, but is terribly slow (5fps) for me with a NVIDIA GT540M.
Is that the case for you too?

That's a test page to test whether different line widths are supported, but you should also see it in oxalis:

http://alteredqualia.com/tmp/webgl-linewidth-test/

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Thu, 2 May 2013 14:27:07 +0200"]

Not bad!
On my Quadro NVS 295 it's 30fps.
I'll have that tip included in the Oxalis FAQ.
I think that we should revisit this topic from time to time but for now there are more urgent problems.

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="", created="Thu, 2 May 2013 14:29:04 +0200"]

Oh, also ,what's the ratio between edge and node diameter?

Best,
Kevin

@tmbo
Copy link
Member Author

tmbo commented Aug 27, 2013

[author="daniel", created="Thu, 2 May 2013 14:57:21 +0200"]

It's 1:4 currently.

@ghost ghost assigned daniel-wer Aug 27, 2013
@georgwiese georgwiese assigned georgwiese and unassigned daniel-wer Jun 2, 2014
@tmbo tmbo closed this as completed Dec 11, 2015
fm3 pushed a commit that referenced this issue Dec 21, 2017
* switch to new datastore lib

* ignore data directories

* Add new config parameters

* Change version
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants