Commits · 33e58f0459ef6f891c1a6d66264abcb94dc53054 · mantidproject / mantid

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

05 Jan, 2018 4 commits
- Merge pull request #21387 from mantidproject/21263_WS_Locks_causing_context_menus_to_wait · 33e58f04
  Martyn Gigg authored Jan 05, 2018
```
Stop ws locks causing context menus to wait
```
  33e58f04
- Merge pull request #21497 from mantidproject/rm_file · 385e6f7e
  Martyn Gigg authored Jan 05, 2018
```
Removing unwanted data file
```
  385e6f7e
- Merge pull request #21384 from mantidproject/21377_engggui_plot_ws_without_fitted_peaks · dd8d6eca
  Martyn Gigg authored Jan 05, 2018
```
Engineering Diffraction GUI - add option to not overplot fit results
```
  dd8d6eca
- Merge pull request #21330 from ebknudsen/master · 1f0d6487
  Martyn Gigg authored Jan 05, 2018
```
c and c++ compiler version may be different and hence their allowed compiler options
```
  1f0d6487
04 Jan, 2018 11 commits
- Merge pull request #21502 from mantidproject/fix_isis_powder_test · c06672dc
  Hahn, Steven authored Jan 04, 2018
```
Fix failing system test on OSX
```
  c06672dc
- Increase test tolerance for OSX · ee9dc077
  Samuel Jackson authored Jan 04, 2018
  
  ee9dc077
- Merge remote-tracking branch 'origin' into 21263_WS_Locks_causing_context_menus_to_wait · e73d1510
  Nick Draper authored Jan 04, 2018
```
re #21263
# Conflicts:
#	qt/widgets/common/src/WorkspacePresenter/WorkspaceTreeWidget.cpp
```
  e73d1510
- Merge remote-tracking branch 'origin' into 21263_WS_Locks_causing_context_menus_to_wait · 11e8c1e5
  Nick Draper authored Jan 04, 2018
  
  11e8c1e5
- cmake config fails if compiler version mismatch · c1e763b3
  Knudsen, Erik Bergbaeck authored Jan 04, 2018
```
Re #21330
When uing gcc/g++ toolchain, cmake will now fail if the versions of gcc
and g++ do not match.
```
  c1e763b3
- removed unwanted data file · 7642a46a
  Anthony Lim authored Jan 04, 2018
  
  7642a46a
- Merge pull request #21420 from mantidproject/21350_isis_powder_pdf_mode · f539f64a
  Martyn Gigg authored Jan 04, 2018
```
ISIS Powder POLARIS validate chopper mode and make its value persistent
```
  f539f64a
- Merge pull request #21355 from mantidproject/21342_engggui_peak_picker_units · 3000a7ea
  Martyn Gigg authored Jan 04, 2018
```
Make handling of expected peak units more robust in EnggFitPeaks
```
  3000a7ea
- Merge pull request #21493 from mantidproject/21492_correct_qmake · 26ae5df2
  Martyn Gigg authored Jan 04, 2018
```
Fix OSX qmake issue
```
  26ae5df2
- Merge pull request #21471 from mantidproject/21334_bounding_box_performance · e069a816
  Savici, Andrei T authored Jan 04, 2018
```
FindPeaksMD performance issue for tube based instruments
```
  e069a816
- Merge pull request #21491 from mantidproject/21461_refactor_QWorkspaceDockView · 1c638d2e
  Savici, Andrei T authored Jan 03, 2018
```
Refactor QWorkspaceDockView
```
  1c638d2e
03 Jan, 2018 16 commits
- Re #21334. Fix doxygen · db0ac317
  Savici, Andrei T authored Jan 03, 2018
  
  db0ac317
- refs #21334. Remove callgrind include · 615a052f
  Owen Arnold authored Jan 03, 2018
  
  615a052f
- refs #21334 formatting fix · 9db818c4
  Owen Arnold authored Jan 03, 2018
  
  9db818c4
- Merge branch '21334_bounding_box_performance' of... · c9ca0647
  Owen Arnold authored Jan 03, 2018
```
Merge branch '21334_bounding_box_performance' of https://github.com/mantidproject/mantid into 21334_bounding_box_performance
```
  c9ca0647
- refs #21334. Tubes can be ObjCompAssemblies · e0f111a3
  Owen Arnold authored Jan 03, 2018
```
This means that have shapes. Therefore only one bounding box calculation needed per tube.
```
  e0f111a3
- Fix type conversion warnings. · 63ad0853
  Martyn Gigg authored Jan 03, 2018
```
Refs #21263
```
  63ad0853
- hopefully this is the final warning re #21263 · 8bb76cb4
  Nick Draper authored Jan 03, 2018
  
  8bb76cb4
- Apply clang format patch · 89cc197a
  Elliot Oram authored Jan 03, 2018
```
Refs #21461
```
  89cc197a
- Add a U to the 1 re #21263 · 144527b8
  Nick Draper authored Jan 03, 2018
  
  144527b8
- Use member variable not local · 9471a82f
  Elliot Oram authored Jan 03, 2018
```
Refs #21461
```
  9471a82f
- Merge pull request #21494 from mantidproject/find_pyqt5_mac · 2177edaf
  Ian Bush authored Jan 03, 2018
```
Improve finding of sip_dir on MacOS
```
  2177edaf
- resolve linux warnings re #21263 · 3fff61d3
  Nick Draper authored Jan 03, 2018
  
  3fff61d3
- Add missing parent QTreeWidget · a2a48ff6
  Elliot Oram authored Jan 03, 2018
```
Refs #21461
```
  a2a48ff6
- use parentWidget over dynaic cast · 8f64221e
  Elliot Oram authored Jan 03, 2018
```
Refs #21461
```
  8f64221e
- Merge pull request #21345 from mantidproject/21331_trustregion_doc_update · e6751372
  Ian Bush authored Jan 03, 2018
```
add reference describing trust-region minimizer
```
  e6751372
- Merge pull request #21390 from ScreamingUdder/19487_new_sample_log_schema_for_kafkaeventlistener · e6664607
  Ian Bush authored Jan 03, 2018
```
Update KafkaEventListener for new message schema
```
  e6664607
02 Jan, 2018 9 commits
- Fix build warning on El Capitan. · 0d59b0bf
  Hahn, Steven authored Jan 02, 2018
  
  0d59b0bf
- Fix path for finding sip_dir. · dceea30c
  Hahn, Steven authored Jan 02, 2018
  
  dceea30c
- clang format re #21263 · 26003ac7
  Nick Draper authored Jan 02, 2018
  
  26003ac7
- better mock fix pt 2 re #21263 · f5d70bc0
  Nick Draper authored Jan 02, 2018
  
  f5d70bc0
- better fix for the mock method re #21263 · 8195a8f3
  Nick Draper authored Jan 02, 2018
  
  8195a8f3
- Merge pull request #21489 from mantidproject/create_usagedata_archive · a425ed3a
  Savici, Andrei T authored Jan 02, 2018
```
Add buildscript to create UsageData.zip
```
  a425ed3a
- clang format re #21263 · 6bf23e8c
  Nick Draper authored Jan 02, 2018
  
  6bf23e8c
- Blind attempt to fix google mock clause re #21263 · ae1200d2
  Nick Draper authored Jan 02, 2018
  
  ae1200d2
- refs #21492. Do not prefix path. · d6f728b6
  Owen Arnold authored Jan 02, 2018
  
  d6f728b6