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 main #2

Merged
merged 657 commits into from
Dec 3, 2024
Merged

Merge main #2

merged 657 commits into from
Dec 3, 2024

Conversation

fhernandezvivanco
Copy link
Collaborator

@fhernandezvivanco fhernandezvivanco commented Dec 2, 2024 •
edited
Loading

  • Merges upstream schanges
  • Fixes an issue that prevented heatmaps to be displayed correctly in the UI

axelboc and others added 30 commits August 27, 2024 16:46
@axelboc @marcus-oscarsson
Improve Cypress logging to help debug CI
b1f387f
@axelboc @marcus-oscarsson
Ensure mount command has been sent before reloading to fix flaky Cypr…
e8d1e5a 
…ess test
@axelboc @marcus-oscarsson
Disable WebSockets when running E2E tests locally to match CI (where …
b67d436 
…WS don't work)
@axelboc @marcus-oscarsson
Wait for canvas click to be fully processed in 3-click centring test …
2a7110f 
…(and simplify test)
@axelboc @marcus-oscarsson
Rethrow error in mountSample
02c70e9
@marcus-oscarsson
[skip ci] Bumped minor version
af6224a
@axelboc @marcus-oscarsson
Clean-up ServerIO
87c68e0
@marcus-oscarsson
[skip ci] Bumped minor version
b37b0ba
@axelboc @marcus-oscarsson
Test log out
f8b0625
@marcus-oscarsson
[skip ci] Bumped minor version
2be5654
@marcus-oscarsson
Make the test correspond to the new beam size handling.
5453da6
@marcus-oscarsson
Add aperture in the expected list
7cab09c
@marcus-oscarsson
Upgrade mxcubecore version.
fe55ba3
@marcus-oscarsson
Upgrade lock file
7f2f962
@marcus-oscarsson
Also update requirements
4e885e6
@marcus-oscarsson
[skip ci] Bumped minor version
6c2990d
@marcus-oscarsson
Removed section about redis
8edf16e
@marcus-oscarsson @fabcor-maxiv
Update docs/source/dev/environment.md
8b724ae 
Co-authored-by: fabcor <fabien.coronis@maxiv.lu.se>
@marcus-oscarsson
Removed fix for specifying python version
579fce3
@marcus-oscarsson
[skip ci] Bumped minor version
a01ff62
@meguiraun @marcus-oscarsson
fix url for posting mesh result data
e2a27b2
@meguiraun @marcus-oscarsson
fix when sending rgb values as three separate elements
9d84ec4
@meguiraun @marcus-oscarsson
handle when result is empty string
f35de84
@meguiraun @marcus-oscarsson
only calculate heatmap value if cell has result data
10b5c7a
@meguiraun @marcus-oscarsson
a method has been deleted some time ago...
ca4e698
@meguiraun @axelboc @marcus-oscarsson
Update ui/src/components/SampleView/DrawGridPlugin.jsx
0a0e779 
Co-authored-by: Axel Bocciarelli <axelboc@gmail.com>
@marcus-oscarsson
[skip ci] Bumped minor version
799d0b9
@elmjag @marcus-oscarsson
move mocked beamline configs to 'demo'
0d84282 
Move out and rename the mocked beamline configuration files folder
out from the test folder. This to make it more clear that it's not
only used by the tests, but also as a 'demo' beamline.

Solves: mxcube#1350
@marcus-oscarsson
[skip ci] Bumped minor version
f4f357d
@elmjag @marcus-oscarsson
fix typos in a comments
f0eadff
marcus-oscarsson and others added 23 commits November 25, 2024 13:59
@marcus-oscarsson
[skip ci] Bumped minor version
6420202
@marcus-oscarsson
[ICAT-SSO] - Initial work an adapting AbstractLims and integration wi…
6af4e5d 
…th SSO
@marcus-oscarsson
[MXCUBECORE] - MXCUBECORE dep. to be updated
bae1009
@marcus-oscarsson
Added section about testing
4548f1a
@marcus-oscarsson
Removed selectProposalAction and replaced it with getLoginInfo
65d6a7c
@marcus-oscarsson
Changed log level from warning to info
775cfb9
@marcus-oscarsson
[skip ci] Bumped minor version
fd02aed
@dependabot @marcus-oscarsson
Bump cross-spawn from 7.0.3 to 7.0.6 in /ui
5a4941e 
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@marcus-oscarsson
[skip ci] Bumped minor version
a8b3480
@axelboc @marcus-oscarsson
Bump versions of GitHub Actions
029f0ef
@axelboc @marcus-oscarsson
Use yaml extension for GH workflows
7eae110
@axelboc @marcus-oscarsson
Disable auto-save for GH workflows
b472a2d
@axelboc @marcus-oscarsson
Remove GH action version comments
c4423bd
@marcus-oscarsson
[skip ci] Bumped minor version
542423c
@fhernandezvivanco
Merge remote-tracking branch 'upstream/develop' into merge_main
a6f1888
@fhernandezvivanco
poetry lock
a352f03
@fhernandezvivanco
poetry lock
91f599a
@fhernandezvivanco
poetry lock
8c54a9b
@fhernandezvivanco
poetry lock
c3ea088
@fhernandezvivanco @marcus-oscarsson
fixes an issue that prevented grid-scan heatmaps to be displayed corr…
f943d28 
…ectly in the UI
@fhernandezvivanco @marcus-oscarsson
fixes grid scan heatmap bug
69283d5
@marcus-oscarsson
[skip ci] Bumped minor version
9d40d8b
@fhernandezvivanco
Merge remote-tracking branch 'upstream/develop' into merge_main
63624b3
erikssod
erikssod approved these changes Dec 3, 2024
View reviewed changes
Copy link
Collaborator

@erikssod erikssod left a comment

Choose a reason for hiding this comment

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

With focus on @fhernandezvivanco commits.

@fhernandezvivanco fhernandezvivanco merged commit c237736 into main Dec 3, 2024
8 of 12 checks passed
@fhernandezvivanco fhernandezvivanco deleted the merge_main branch December 3, 2024 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikssod erikssod erikssod approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.