Commits · 2fdde41d1c56542ef076d2386729cabf1906db6c · mantidproject / mantid · GitLab

This project is mirrored from https://github.com/mantidproject/mantid.git. Pull mirroring updated Feb 03, 2023.

05 Mar, 2014 4 commits
- Merge remote-tracking branch 'origin/feature/9114_mcstas_new_format' · 2fdde41d
  Peter Parker authored Mar 05, 2014
  
  2fdde41d
- Merge remote-tracking branch 'origin/bugfix/9073_experimentinfo_doc_fix' · 680debf4
  Michael Reuter authored Mar 05, 2014
  
  680debf4
- Merge remote-tracking branch 'origin/bugfix/9058_same_colour_for_multiple_y_columns' · 601d72b4
  Jay Rainey authored Mar 05, 2014
  
  601d72b4
- Torben changed code to load new mcstas format. re #9114 · d9c1ee15
  Anders Markvardsen authored Mar 05, 2014
  
  d9c1ee15
04 Mar, 2014 8 commits
- Merge remote-tracking branch 'origin/feature/8947_propertysettings_to_python' · 229ac258
  Jose Borreguero authored Mar 04, 2014
  
  229ac258
- Merge remote-tracking branch 'origin/feature/9047_example_flowchart_wiki' · 7970a77d
  Nick Draper authored Mar 04, 2014
  
  7970a77d
- Modify the display of default handling in flowchart re #9047 · 38e22f1a
  Karl Palmen authored Mar 04, 2014
```
Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
```
  38e22f1a
- Improve Flowchart and correct description of SecondPeriod re #9047 · d31f57a0
  Karl Palmen authored Mar 04, 2014
```
Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
```
  d31f57a0
- Merge remote branch 'origin/feature/9108_SCDCalibratePanels_error' · 467886d4
  Peterson, Peter authored Mar 04, 2014
  
  467886d4
- Merge remote-tracking branch 'origin/feature/8281_sqw_interface_tidy' · 44da0a17
  Peter Parker authored Mar 04, 2014
  
  44da0a17
- Merge remote-tracking branch 'origin/feature/9014_isis_sans_dependency' · b917118a
  Peter Parker authored Feb 28, 2014
  
  b917118a
- Merge branch 'master' of github.com:mantidproject/mantid into feature/8281_sqw_interface_tidy · bc4e086d
  Samuel Jackson authored Mar 04, 2014
```
Refs #8281

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
```
  bc4e086d
03 Mar, 2014 17 commits
- Refs #9108 input parameters for sample offset · f8fb67a6
  Lynch, Vickie authored Mar 03, 2014
  
  f8fb67a6
- Merge remote branch 'origin/feature/9106_RemoveLogsWhiteList' · 7d5da4ea
  Peterson, Peter authored Mar 03, 2014
  
  7d5da4ea
- Merge remote branch 'origin/task/8983_rm_workspaceitr' · d5236763
  Peterson, Peter authored Mar 03, 2014
  
  d5236763
- Merge remote-tracking branch 'origin/feature/8991_sassenafft_header_remove' · 673033ca
  Savici, Andrei T authored Mar 03, 2014
  
  673033ca
- Removed LoadNexusLog dependency. Refs #9106 · 35f2bcb5
  Savici, Andrei T authored Mar 03, 2014
  
  35f2bcb5
- Export VisibleWhenProperty to Python. · afc25ada
  Gigg, Martyn Anthony authored Mar 03, 2014
```
Refs #8947
```
  afc25ada
- Export setPropertySettings method on Python PropertyManager. · 10e96724
  Gigg, Martyn Anthony authored Mar 03, 2014
```
Refs #8947
```
  10e96724
- Export EnabledWhenProperty to Python. · 5d3b4507
  Gigg, Martyn Anthony authored Mar 03, 2014
```
Refs #8947
```
  5d3b4507
- Export base IPropertySettings class to Python. · 198e7dc0
  Gigg, Martyn Anthony authored Mar 03, 2014
```
Refs #8947
```
  198e7dc0
- Refs #9058. Name variable better. · e33309e8
  Arturs Bekasovs authored Mar 03, 2014
  
  e33309e8
- Fix broken Scale*Tests · f4307dd8
  Gigg, Martyn Anthony authored Mar 03, 2014
```
Refs #8983
```
  f4307dd8
- Remove WorkspaceIterator usage in tests. · 41d43a04
  Gigg, Martyn Anthony authored Feb 11, 2014
```
Refs #8983
```
  41d43a04
- Remove WorkspaceIteratorCodeTest · 8b4d456e
  Gigg, Martyn Anthony authored Feb 10, 2014
```
Refs #8983
```
  8b4d456e
- Remove WorkspaceIterator code · 03eb920f
  Gigg, Martyn Anthony authored Feb 10, 2014
```
Refs #8983
```
  03eb920f
- Remove workspace iterators from UserAlgorithms · c9d93ec2
  Gigg, Martyn Anthony authored Feb 10, 2014
```
Refs #8983
```
  c9d93ec2
- Remove WorkspaceIterator from SaveRKH. · ce04425e
  Gigg, Martyn Anthony authored Feb 10, 2014
```
Refs #8983
```
  ce04425e
- Checkpoint workspace iterator removal. · 9cecd2c9
  Gigg, Martyn Anthony authored Feb 10, 2014
```
Refs #8983
```
  9cecd2c9
01 Mar, 2014 1 commit
- Refs #9108 add sample positions to attributes · 817e8a58
  Lynch, Vickie authored Mar 01, 2014
  
  817e8a58
28 Feb, 2014 10 commits
- Add option to keep some logs in RemoveLogs. Refs #9106 · c9fe52a6
  Savici, Andrei T authored Feb 28, 2014
  
  c9fe52a6
- Merge remote branch 'origin/feature/8994_export_vulcan_log' · d94ee817
  Peterson, Peter authored Feb 28, 2014
  
  d94ee817
- Merge remote branch 'origin/feature/8994_export_vulcan_log' · 51840576
  Peterson, Peter authored Feb 28, 2014
  
  51840576
- Cleaned cmake file. Refs #8994. · 00f6260e
  Zhou, Wenduo authored Feb 28, 2014
  
  00f6260e
- Improved wiki. Refs #8994. · 3b5df557
  Zhou, Wenduo authored Feb 28, 2014
  
  3b5df557
- Refs #9058. Create layout for every curve, not just once. · 3519ca98
  Arturs Bekasovs authored Feb 28, 2014
```
Otherwise the color and symbol type are set only once and are the same for all the curves.
```
  3519ca98
- Merge remote-tracking branch 'origin/bugfix/9018_validate_inputs' · 2e7138a4
  Zhou, Wenduo authored Feb 28, 2014
  
  2e7138a4
- Merge remote-tracking branch 'origin/bugfix/8304_python_unittests_ubuntu' · 08ec745d
  Savici, Andrei T authored Feb 28, 2014
  
  08ec745d
- Merge remote-tracking branch 'origin/bugfix/9048_smallWinBugs' · c2fff94a
  Nick Draper authored Feb 28, 2014
  
  c2fff94a
- Corrected CMakeList.txt for unit test. Refs #8994. · e0ac4c40
  Zhou, Wenduo authored Feb 28, 2014
  
  e0ac4c40