Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[EEG Browser][Bugfix] Fix Epochs and Electrodes URL Retrieval #7811

Merged

Conversation

jesscall
Copy link
Contributor

@jesscall jesscall commented Nov 9, 2021

Brief summary of changes

This PR addresses the issue reported in #7810

Testing instructions (if applicable)

  1. Go to EEG Browser
  2. Ensure that the events panel and electrode panels are visible

Screen Shot 2021-11-09 at 10 05 30 AM

Screen Shot 2021-11-09 at 10 05 39 AM

Link(s) to related issue(s)

@jesscall jesscall added Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label) 24.0.0-bugs Issues or bug fix PRs that were raised during the testing of release 24.0.0 labels Nov 9, 2021
@driusan driusan added the Critical to release PR or issue is key for the release to which it has been assigned label Nov 9, 2021
@cmadjar cmadjar added the Passed Manual Tests PR has undergone proper testing by at least one peer label Nov 12, 2021
Copy link
Collaborator

@cmadjar cmadjar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@cmadjar
Copy link
Collaborator

cmadjar commented Nov 12, 2021

@jesscall there are conflicts with the main branch though that will need to be resolved

@jesscall jesscall force-pushed the 2021_11_09_bugfix_epoch_and_electrode_URL_index branch from a7a42d4 to c50af96 Compare November 12, 2021 16:59
@jesscall
Copy link
Contributor Author

@christinerogers rebased!

@christinerogers
Copy link
Contributor

christinerogers commented Nov 12, 2021

rebased for @cmadjar 🎉 (by @jesscall not by me :)

@jesscall
Copy link
Contributor Author

oohh whoops sorry!

@cmadjar
Copy link
Collaborator

cmadjar commented Nov 12, 2021

Nice, thank you @jesscall! @driusan ready for you!

@driusan driusan merged commit ff55383 into aces:main Nov 15, 2021
@ridz1208 ridz1208 added this to the 24.0.0 milestone Nov 17, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
24.0.0-bugs Issues or bug fix PRs that were raised during the testing of release 24.0.0 Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label) Critical to release PR or issue is key for the release to which it has been assigned Passed Manual Tests PR has undergone proper testing by at least one peer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[EEG Browser] Events and Electrode Panels Not Showing
5 participants