Commits · ae2118ed09902e3b8582cf68f54f77cfef2dad5f · mantidproject / mantid

This project is mirrored from https://github.com/mantidproject/mantid.git. Pull mirroring updated 24 minutes ago.

Jun 29, 2014
- refs #9581 fixing error related to changes in #9769 · ae2118ed
  Alex Buts authored 10 years ago
  
  ae2118ed
Jun 27, 2014

refs #9581 updated branch to master and fixing merge conflicts · 4fb55151

Alex Buts authored 10 years ago

caused by the documentation changes.

Merge branch 'master' into feature/9581_SphinxChanges

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
	Code/Mantid/docs/source/algorithms/DetectorEfficiencyCor-v1.rst
	Code/Mantid/docs/source/algorithms/LoadInstrument-v1.rst
	Code/Mantid/docs/source/algorithms/MergeMD-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst

4fb55151

Jun 26, 2014
- Merge remote branch 'origin/bugfix/9748_live_listener_race' · 26ab2ba3
  Lynch, Vickie authored 10 years ago
  
  26ab2ba3
- Merge remote-tracking branch 'origin/feature/9529_property_manager_alignandfocuspowder' · 7fe7371c
  Peterson, Peter authored 10 years ago
  
  7fe7371c
- Merge remote branch 'origin/feature/9760_not_warnings' · 05553ad3
  Michael Reuter authored 10 years ago
  
  05553ad3
- Merge remote-tracking branch 'origin/bugfix/9736_calib_sum_zero_spec' · a897b6fb
  Karl Palmen authored 10 years ago
  
  a897b6fb
- Merge remote-tracking branch 'origin/bugfix/9764_snspowder_binary_ops' · 8893dfa3
  Zhou, Wenduo authored 10 years ago
  
  8893dfa3
- Re #9764. Changing binary operations to be in-place again. · 78bdc903
  Peterson, Peter authored 10 years ago
  
  78bdc903
- Refs #9760 removed one warning and other to notice · 942f3cd0
  Lynch, Vickie authored 10 years ago
  
  942f3cd0
- Merge remote-tracking branch 'origin/feature/9572_documentation_check' · 35a7f5c1
  Karl Palmen authored 10 years ago
  
  35a7f5c1
- Merge remote-tracking branch 'origin/bugfix/9757_docs_category_text_windows' · ebeab29e
  Karl Palmen authored 10 years ago
  
  ebeab29e
- Merge remote-tracking branch 'origin/master' into feature/9572_documentation_check · e13afe01
  Peterson, Peter authored 10 years ago
  
  Re #9572. Conflicts: Code/Mantid/docs/source/algorithms/RadiusSum-v1.rst
  e13afe01
- Fix category display names & links when generated on Windows. · c9629022
  Gigg, Martyn Anthony authored 10 years ago
  
  The \-style separators were causing confusion as all paths need to be relative unix-style paths. Refs #9757
  c9629022
- Merge remote-tracking branch 'origin/bugfix/9729_remove_spaces_from_larmor_idf' · 1b6c8939
  Roman Tolchenov authored 10 years ago
  
  1b6c8939
- Merge remote-tracking branch 'origin/bugfix/9675_fix_crash_showdets_raw_file' · 5d8aea53
  Samuel Jackson authored 10 years ago
  
  5d8aea53
- Merge remote-tracking branch 'origin/feature/9337_IN16b_reduction' · 43071b8f
  Peter Parker authored 10 years ago
  
  43071b8f
- Refs #9736 Use FindDetectorsOutsideLimits instead. · 38e6e15d
  Samuel Jackson authored 10 years ago
  
  Also do a little light refactoring while we're here.
  38e6e15d
- Merge remote-tracking branch 'origin/feature/9394_loader_bilby_' · cbf47f05
  Karl Palmen authored 10 years ago
  
  cbf47f05
- Merge remote-tracking branch 'origin/bugfix/9688_indirect_moments_alg_runner' · fd74eede
  Peter Parker authored 10 years ago
  
  fd74eede
Jun 25, 2014
- Merge remote branch 'origin/feature/6972_offlinehelp_integration' · 555cb085
  Michael Reuter authored 10 years ago
  
  555cb085
- Merge remote-tracking branch 'origin/bugfix/9739_py_fit_functions_missed' · e0f84c16
  Peterson, Peter authored 10 years ago
  
  e0f84c16
- Re #9572. Getting rid of last sphinx warning. · d37d33c2
  Peterson, Peter authored 10 years ago
  
  d37d33c2
- Merge remote-tracking branch 'origin/bugfix/9749_fix_remaining_sphinx_errors' · a9c3be65
  Peterson, Peter authored 10 years ago
  
  a9c3be65
- Re #9572. Fixing up documentation. · 577a0ee9
  Peterson, Peter authored 10 years ago
  
  577a0ee9
- Merge remote-tracking branch 'origin/master' into feature/9572_documentation_check · 160f94ca
  Peterson, Peter authored 10 years ago
  
  Re #9572. Conflicts: Code/Mantid/docs/source/algorithms/PDLoadCharacterizations-v1.rst Code/Mantid/docs/source/algorithms/RadiusSum-v1.rst Code/Mantid/docs/source/algorithms/RawFileInfo-v1.rst
  160f94ca
- Re #9572. Fixing documentation markup. · 35bcd5b1
  Peterson, Peter authored 10 years ago
  
  35bcd5b1
- Merge remote-tracking branch 'origin/feature/9686_mcstas_doc_update' · 2ebad7df
  Karl Palmen authored 10 years ago
  
  2ebad7df
- Remove cout statement · 52c28517
  Gigg, Martyn Anthony authored 10 years ago
  
  Refs #9749
  52c28517
- Remove an unused connection. · 91731e89
  Gigg, Martyn Anthony authored 10 years ago
  
  Refs #9749
  91731e89
- Merge remote-tracking branch 'origin/bugfix/9750_hide_show_properties_on_value_change' · 4515dc86
  Gigg, Martyn Anthony authored 10 years ago
  
  4515dc86
- Refs #9729 - Remove commented-out line. · 82abe6ec
  Peter Parker authored 10 years ago
  
  82abe6ec
- Refs #9729 - Updated IDF from Rob. · 4f5261f6
  Peter Parker authored 10 years ago
  
  4f5261f6
- Fix more sphinx warnings. · c6e9a710
  Gigg, Martyn Anthony authored 10 years ago
  
  Refs #9749
  c6e9a710
- Re #9572. Removing sphinx errors. · e4d5fee7
  Peterson, Peter authored 10 years ago
  
  e4d5fee7
- Merge remote-tracking branch 'origin/feature/9128_hfir_reduction_flowchart' · 1af6c0d0
  Peter Parker authored 10 years ago
  
  1af6c0d0
- Re #6972. Fixed the window title. · dd9dff6c
  Peterson, Peter authored 10 years ago
  
  dd9dff6c
- Re #6972. Went back to QWebView for rendering pages. · eda478bf
  Peterson, Peter authored 10 years ago
  
  eda478bf
- Refs #9739 Correct formatting of function definition. · 2e98e7a9
  Samuel Jackson authored 10 years ago
  
  2e98e7a9
- Fix more docs sphinx errors. · 42db01a0
  Gigg, Martyn Anthony authored 10 years ago
  
  Refs #9749
  42db01a0
- Fix a few more docs errors. · 6a6fb17e
  Gigg, Martyn Anthony authored 10 years ago
  
  Refs #9749
  6a6fb17e