Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a7dfa655

Commit a7dfa655 authored 11 years ago by Samuel Jackson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/7031_deleting_scripts'

Conflicts:
	Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui

Refs #7031

parents 52b4bd03 cb8e4a7f

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h 28 additions, 0 deletions

Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
Code/Mantid/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h 9 additions, 2 deletions

...ository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp 222 additions, 1 deletion

...d/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
Code/Mantid/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h 123 additions, 4 deletions

...ramework/ScriptRepository/test/ScriptRepositoryTestImpl.h
Code/Mantid/Images/emptytrash.png 0 additions, 0 deletions

Code/Mantid/Images/emptytrash.png
Code/Mantid/Images/images.qrc 1 addition, 0 deletions

Code/Mantid/Images/images.qrc
Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h 39 additions, 13 deletions

Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h
Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.h 14 additions, 2 deletions

...antid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.h
Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui 0 additions, 1 deletion

...ntid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui
Code/Mantid/MantidQt/API/src/RepoModel.cpp 210 additions, 22 deletions

Code/Mantid/MantidQt/API/src/RepoModel.cpp
Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp 97 additions, 5 deletions

Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp

with 743 additions and 50 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