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

Merge release with main branch for rebasing #272

Merged
merged 16 commits into from
Oct 16, 2024
Merged

Merge release with main branch for rebasing #272

merged 16 commits into from
Oct 16, 2024

Commits on Oct 10, 2024

  1. Merge pull request #259 from lincbrain/master 

    Merge into production: Include minor sleep call to handle WebKnossos cookie being set
    @aaronkanzer
    aaronkanzer authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    46f0779 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #261 from lincbrain/master 

    Merge into production: poll for cookie before opening url
    @aaronkanzer
    aaronkanzer authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c9f6047 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #263 from lincbrain/master 

    Merge into production: Longer delay with console log for webknossos login
    @aaronkanzer
    aaronkanzer authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    dde7c39 View commit details
    Browse the repository at this point in the history

  4. Even longer wait poll for webknossos

    Aaron Kanzer authored and Aaron Kanzer committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b009bb8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #264 from lincbrain/ak-longer 

    Even longer wait poll for webknossos
    @aaronkanzer
    aaronkanzer authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    857fac7 View commit details
    Browse the repository at this point in the history

  6. Add 2 second delay until window is opened

    Aaron Kanzer authored and Aaron Kanzer committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ade8fb0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #265 from lincbrain/ak-2-sec 

    Add 2 second delay until window is opened
    @aaronkanzer
    aaronkanzer authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f3240f8 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Use fetch instead of axios call for cookies

    Aaron Kanzer authored and Aaron Kanzer committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    2d9830d View commit details
    Browse the repository at this point in the history

  2. remove unncessary import

    Aaron Kanzer authored and Aaron Kanzer committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    274bf60 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #266 from lincbrain/ak-try-fetch 

    Use fetch instead of axios call for cookies
    @aaronkanzer
    aaronkanzer authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d5a87ff View commit details
    Browse the repository at this point in the history

  4. Make nav bar only have one window.open call for WebKnossos

    Aaron Kanzer authored and Aaron Kanzer committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    76a7253 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #267 from lincbrain/ak-href 

    Make nav bar only have one window.open call for WebKnossos
    @aaronkanzer
    aaronkanzer authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9f255e1 View commit details
    Browse the repository at this point in the history

  6. Resolve window.open for WebKNOSSOS in Nav Bar

    Aaron Kanzer authored and Aaron Kanzer committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d3df52f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #268 from lincbrain/ak-bind 

    Resolve window.open for WebKNOSSOS in Nav Bar
    @aaronkanzer
    aaronkanzer authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    63d3a04 View commit details
    Browse the repository at this point in the history

  8. Make webknossos own button outside of nav bar elements for opening ne… 

    …w window
    Aaron Kanzer authored and Aaron Kanzer committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    544ff6e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #270 from lincbrain/ak-remove-list 

    Make webknossos own button outside of nav bar elements for opening new window
    @aaronkanzer
    aaronkanzer authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    893056c View commit details
    Browse the repository at this point in the history