Merge branch 'master' into T24196-Integration
ff1bd198f8df
Actions

Description

Merge branch 'master' into T24196-Integration

Conflicts:
Modules/QtWidgets/files.cmake
Modules/QtWidgets/include/QmitkDataStorageTreeModel.h
Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp
Plugins/org.mitk.gui.qt.common/files.cmake

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance

floca	Authored on May 14 2018, 5:12 PM
floca	Pushed on May 14 2018, 5:13 PM

Parents

rMITK625a70e780ad: add icon for clearing optinal single selection widget
rMITK1551e1432e9a: Work around for the wrong locale

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITKff1bd198f8df: Merge branch 'master' into T24196-Integration (authored by floca).May 14 2018, 5:12 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

1551e1432e9a Work around for the wrong locale
Author
floca
Browse Repository
No Builds
No Audits
e0700b39d385 Merge branch 'T24703-Use_MITK_serialization_to_allow_saving_of_custom_propertie…
Author
seitela
Browse Repository
No Builds
No Audits
49aa2b93fbf9 Merge branch 'T24719-EIDnullptrEVENT'
Author
kislinsk
Browse Repository
No Builds
No Audits
0e3930e8a972 Correct name of wrongly renamed constant
Author
kislinsk
Browse Repository
No Builds
No Audits
fa90de7c27b6 Merge remote-tracking branch 'origin/T24718-DefaultUpdateRateTrackingToolbox'
Author
franza
Browse Repository
No Builds
No Audits
30985c52d8e2 Merge remote-tracking branch 'origin/T24685-NDI-Aurora-two-5DoF-tools-on-one…
Author
franza
Browse Repository
No Builds
No Audits
9750436fbf7e COMP: removed unused variable
Author
franza
Browse Repository
No Builds
No Audits
772a5add535c Changed default update rate to 30 Hz
Author
franza
Browse Repository
No Builds
No Audits
bc24b92dbc92 Merge branch 'master' of ssh://phabricator.mitk.org:2222/source/mitk Trying to…
Author
• steint
Browse Repository
No Builds
No Audits
d908e73a99af Merge branch 'T23338-fix-dicom-loading-special-character' Trying to fix T23338…
Author
• steint
Browse Repository
No Builds
No Audits
cdb7ea64ea01 Merge remote-tracking branch 'origin/T24685-NDI-Aurora-two-5DoF-tools-on-one…
Author
franza
Browse Repository
No Builds
No Audits
2055c4834d75 Improved utf 8 conversion
Author
• steint
Browse Repository
No Builds
No Audits
0905b6300273 Serializes all the properties of the associated DataNode and reads all the…
Author
milano
Browse Repository
No Builds
No Audits
6a6c2016ad2a Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
fc90d4ecf26b Fixed windows build errors
Author
goetzm
Browse Repository
No Builds
No Audits
6b09997f4a1a Removed unused Removed unused
Author
goetzm
Browse Repository
No Builds
No Audits
56dc1d31e57e Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
babc01c20d45 Typos
Author
goetzm
Browse Repository
No Builds
No Audits
131d0ca76ee7 Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
0823ba39b353 Extended Switches for Warning-free
Author
goetzm
Browse Repository
No Builds
No Audits
29d8c069c169 Basic stuff
Author
goetzm
Browse Repository
No Builds
No Audits
e103b9aac3dd Wrapped for variable space correlation
Author
goetzm
Browse Repository
No Builds
No Audits
11fdd0c83642 Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
267942127d65 Order of function in cpp file
Author
goetzm
Browse Repository
No Builds
No Audits
220dff341143 Fixed Typo
Author
goetzm
Browse Repository
No Builds
No Audits
89ff55346ce7 Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
051a0abc8aaf Removed unused variable
Author
goetzm
Browse Repository
No Builds
No Audits
3f8201d7947e Merge branch 'T22714-Bugfix'
Author
goetzm
Browse Repository
No Builds
No Audits
599ab40d7d7a Removed non-existing file
Author
goetzm
Browse Repository
No Builds
No Audits
ad2d6bbada43 Merge branch 'T24394-TestFirstOrder'
Author
goetzm
Browse Repository
No Builds
No Audits
73ffad456ea2 Merge branch 'T24408-TestsuiteIntensityVolumeHistogram'
Author
goetzm
Browse Repository
No Builds
No Audits
7bd057638cd7 Merge branch 'T24403-TestCooc2'
Author
goetzm
Browse Repository
No Builds
No Audits
3f2dbda1c449 Merge branch 'T22714-CreateBasicImageProcessingModule'
Author
goetzm
Browse Repository
No Builds
No Audits
40bf3b2d158b Smaller Error corrections
Author
goetzm
Browse Repository
No Builds
No Audits
bd7a3427bf57 Added Test for Simple Stat.
Author
goetzm
Browse Repository
No Builds
No Audits
c684836cc5e1 Corrected wrong image range
Author
goetzm
Browse Repository
No Builds
No Audits
5c2194bba0cf All relevant tested
Author
goetzm
Browse Repository
No Builds
No Audits
00a20c04b32f Added all features
Author
goetzm
Browse Repository
No Builds
No Audits
b5c25b66d067 Added additional features
Author
goetzm
Browse Repository
No Builds
No Audits
d85355216e03 Added some features
Author
goetzm
Browse Repository
No Builds
No Audits
a00108c67c9f Set install dirs
Author
• goch
Browse Repository
No Builds
No Audits
36bf6a732418 Fixed T24700 CEST_normalization_fails_due_to_illformed_offset Merge branch…
Author
floca
Browse Repository
No Builds
No Audits
5e403c255cff Fixed T24700
Author
floca
Browse Repository
No Builds
No Audits
85eefc9c8b16 Merge branch 'T24697-MITKDataMaster'
Author
kislinsk
Browse Repository
No Builds
No Audits
04482608eb05 Clone MITK-Data head
Author
kislinsk
Browse Repository
No Builds
No Audits
9f4ced107fb8 Merge branch 'T24696-StUpdate'
Author
neher
Browse Repository
No Builds
No Audits
e0930039a19d Update reaction to param change
Author
neher
Browse Repository
No Builds
No Audits
e5ef7c76ee24 Added some features. Not all of course
Author
goetzm
Browse Repository
No Builds
No Audits
31297dac752d Added Test
Author
goetzm
Browse Repository
No Builds
No Audits
9470e15c5e15 Added new FO Class
Author
goetzm
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.

Merge branch 'master' into T24196-Integrationff1bd198f8dfActions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge branch 'master' into T24196-Integration
ff1bd198f8df
Actions