Skip to content

5.18.3#514

Merged
olofsvensson merged 4 commits into
ispyb:masterfrom
olofsvensson:5.18.3
Sep 8, 2020
Merged

5.18.3#514
olofsvensson merged 4 commits into
ispyb:masterfrom
olofsvensson:5.18.3

Conversation

@olofsvensson

Copy link
Copy Markdown
Collaborator

This PR contains patches for the following files:

  • csv/example3.csv
  • js/core/menu/mainmenu.js
  • js/mx/menu/mxmanagermenu.js
  • js/mx/view/prepareexperiment/loadsamplechangerview.js
  • templates/mx/csvpuckformview.template.js
  • templates/mx/datacollectionsummary/datacollections.mxdatacollectiongrid.template.js
  • templates/mx/session.grid.mx.datacollection.template.js

antolinos and others added 4 commits September 8, 2020 09:53
# Conflicts:
#	js/mx/menu/mxmanagermenu.js
#	mx/dev.html
#	saxs/dev.html
#	test/dev.html
#	tracking/dev.html
…Form

More of the same fixe for @eq boolean checks
@olofsvensson olofsvensson merged commit 64b7354 into ispyb:master Sep 8, 2020
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

Successfully merging this pull request may close these issues.

2 participants