Merge remote-tracking branch 'origin/release-next' (7fa8257d) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

7fa8257d

Commit 7fa8257d authored 6 years ago by mantid-builder

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release-next'

parents dd79a45e 1b98e8e0

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

Framework/API/src/ScriptBuilder.cpp 6 additions, 1 deletion

Framework/API/src/ScriptBuilder.cpp
Framework/API/test/ScriptBuilderTest.h 70 additions, 0 deletions

Framework/API/test/ScriptBuilderTest.h
Framework/DataHandling/src/LoadLog.cpp 20 additions, 12 deletions

Framework/DataHandling/src/LoadLog.cpp
Framework/DataHandling/test/LoadLogTest.h 39 additions, 6 deletions

Framework/DataHandling/test/LoadLogTest.h
Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py 1 addition, 1 deletion

Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
scripts/Interface/compile_sans_ui.py 0 additions, 1 deletion

scripts/Interface/compile_sans_ui.py
scripts/Interface/reduction_application.py 4 additions, 61 deletions

scripts/Interface/reduction_application.py
scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py 1 addition, 14 deletions

.../Interface/reduction_gui/instruments/dgs_interface_dev.py
scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py 0 additions, 10 deletions

...ce/reduction_gui/instruments/diffraction_interface_dev.py
scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py 1 addition, 12 deletions

...terface/reduction_gui/instruments/eqsans_interface_dev.py
scripts/Interface/reduction_gui/instruments/interface.py 0 additions, 6 deletions

scripts/Interface/reduction_gui/instruments/interface.py
scripts/Interface/reduction_gui/widgets/cluster_status.py 0 additions, 273 deletions

scripts/Interface/reduction_gui/widgets/cluster_status.py
scripts/Interface/ui/CMakeLists.txt 0 additions, 2 deletions

scripts/Interface/ui/CMakeLists.txt
scripts/Interface/ui/cluster_details_dialog.ui 0 additions, 219 deletions

scripts/Interface/ui/cluster_details_dialog.ui
scripts/Interface/ui/cluster_status.ui 0 additions, 170 deletions

scripts/Interface/ui/cluster_status.ui
scripts/Interface/ui/reduction_main.ui 1 addition, 17 deletions

scripts/Interface/ui/reduction_main.ui

with 143 additions and 805 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment