Merge remote-tracking branch 'origin/master' into T25882-RewriteCTestScript
77007566ef1e
Actions

Description

Merge remote-tracking branch 'origin/master' into T25882-RewriteCTestScript

Details

Provenance

kislinsk	Authored on Jul 15 2019, 12:26 PM
kislinsk	Pushed on Jul 15 2019, 12:26 PM

Parents

rMITK39b2f11e8a2f: Fix URL
rMITKdac6f9150fbb: Merge branch 'T26290-extend-rest-api'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK77007566ef1e: Merge remote-tracking branch 'origin/master' into T25882-RewriteCTestScript (authored by kislinsk).Jul 15 2019, 12:26 PM

Merged Changes

dac6f9150fbb Merge branch 'T26290-extend-rest-api'
Author
• steint
Browse Repository
No Builds
No Audits
8061f4c8c010 Add headers to requests Make request API broader Add client config (certificate…
Author
• steint
Browse Repository
No Builds
No Audits
fa4f84b3e205 Update CTK to current master
Author
neher
Browse Repository
No Builds
No Audits
331994f7133f Disable ctk app simplePythonSHell (not needed). Remove old PythonQt comment.
Author
neher
Browse Repository
No Builds
No Audits
aaab7695d3f1 Update CTK to current master
Author
neher
Browse Repository
No Builds
No Audits
1eeb2ca8d61f Update PythonQt
Author
neher
Browse Repository
No Builds
No Audits
03c21aff05a7 Merge branch 'T26498-DiffusionRevision'
Author
neher
Browse Repository
No Builds
No Audits
5e37cfc808bf Make member variables protected
Author
neher
Browse Repository
No Builds
No Audits
7d2921a2bf49 Merge branch 'T26381-React-on-DICOM-node-changes'
Author
kalali
Browse Repository
No Builds
No Audits
72b70e69b5d3 Initialize property lists to nullptr
Author
kalali
Browse Repository
No Builds
No Audits
d3b6f8ef38e6 Merge branch 'T26381-React-on-DICOM-node-changes'
Author
kalali
Browse Repository
No Builds
No Audits
6c4e8a58ff2b Use correct data type for distance-function
Author
kalali
Browse Repository
No Builds
No Audits
bc83807ecae0 Update CTK to current master
Author
neher
Browse Repository
No Builds
No Audits
75ddd0471aa7 Adapt QmitkDataStorageComboBoxWithSelectNone to the latest changes
Author
kalali
Browse Repository
No Builds
No Audits
af221a630840 Observe data node / base data property lists
Author
kalali
Browse Repository
No Builds
No Audits
bce6bb6f9d28 Refactor parameter names, comments, order of functions
Author
kalali
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Packages

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

Modules/

CommandLine/

include/

mitkCommandLineParser.h

src/

mitkCommandLineParser.cpp

QtWidgets/

include/

QmitkDataStorageComboBox.h

O3: MITK Reviewer Group II

QmitkDataStorageComboBoxWithSelectNone.h

O3: MITK Reviewer Group II

src/

QmitkDataStorageComboBox.cpp

O3: MITK Reviewer Group II

QmitkDataStorageComboBoxWithSelectNone.cpp

O3: MITK Reviewer Group II

REST/

documentation/

include/

src/

test/

mitkRESTClientTest.cpp

mitkRESTServerTest.cpp

RESTService/

include/

mitkRESTManager.h

src/

mitkRESTManager.cpp

rMITK77007566ef1e

View Options

CMakeExternals/CTK.cmake

View Options

Modules/CommandLine/include/mitkCommandLineParser.h

View Options

Modules/CommandLine/src/mitkCommandLineParser.cpp

View Options

Modules/QtWidgets/include/QmitkDataStorageComboBox.h

View Options

Modules/QtWidgets/include/QmitkDataStorageComboBoxWithSelectNone.h

View Options

Modules/QtWidgets/src/QmitkDataStorageComboBox.cpp

View Options

Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp

View Options

Modules/REST/documentation/REST.dox

View Options

Modules/REST/include/mitkIRESTManager.h

View Options

Modules/REST/include/mitkIRESTObserver.h

View Options

Modules/REST/include/mitkRESTClient.h

View Options

Modules/REST/include/mitkRESTUtil.h

View Options

Modules/REST/src/mitkRESTClient.cpp

View Options

Modules/REST/src/mitkRESTServer.cpp

View Options

Modules/REST/test/mitkRESTClientTest.cpp

View Options

Modules/REST/test/mitkRESTServerTest.cpp

View Options

Modules/RESTService/include/mitkRESTManager.h

View Options

Modules/RESTService/src/mitkRESTManager.cpp

Merge remote-tracking branch 'origin/master' into T25882-RewriteCTestScript77007566ef1eActions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITK77007566ef1e

CMakeExternals/CTK.cmake

Modules/CommandLine/include/mitkCommandLineParser.h

Modules/CommandLine/src/mitkCommandLineParser.cpp

Modules/QtWidgets/include/QmitkDataStorageComboBox.h

Modules/QtWidgets/include/QmitkDataStorageComboBoxWithSelectNone.h

Modules/QtWidgets/src/QmitkDataStorageComboBox.cpp

Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp

Modules/REST/documentation/REST.dox

Modules/REST/include/mitkIRESTManager.h

Modules/REST/include/mitkIRESTObserver.h

Modules/REST/include/mitkRESTClient.h

Modules/REST/include/mitkRESTUtil.h

Modules/REST/src/mitkRESTClient.cpp

Modules/REST/src/mitkRESTServer.cpp

Modules/REST/test/mitkRESTClientTest.cpp

Modules/REST/test/mitkRESTServerTest.cpp

Modules/RESTService/include/mitkRESTManager.h

Modules/RESTService/src/mitkRESTManager.cpp

Merge remote-tracking branch 'origin/master' into T25882-RewriteCTestScript
77007566ef1e
Actions