Merge branch 'master' into T26269-ChangeSelectionInStatisticsPlugin
b75fcfc498a7
Actions

Description

Merge branch 'master' into T26269-ChangeSelectionInStatisticsPlugin

Bring the feature-branch in line with the current master.
Merge conflicts had to be resolved but the result contains bugs due to
changes in T26269 and T26348.

Details

Provenance

kalali	Authored on Jan 15 2020, 5:18 PM
kalali	Pushed on Jan 25 2020, 9:53 AM

Parents

rMITKedcb00699a6f: Merge branch 'T26958-MapToSource-in-level-window-preset-dialog'
rMITK649c1b1e2ec4: removed leftover code and comments

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITKb75fcfc498a7: Merge branch 'master' into T26269-ChangeSelectionInStatisticsPlugin (authored by kalali).Jan 15 2020, 5:18 PM

Merged Changes

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

edcb00699a6f Merge branch 'T26958-MapToSource-in-level-window-preset-dialog'
Author
kalali
Browse Repository
No Builds
No Audits
713aa629ad7a Fix T26958
Author
kalali
Browse Repository
No Builds
No Audits
258838df6a80 Merge branch 'T26992-FixRenderingTestHelper'
Author
kislinsk
Browse Repository
No Builds
No Audits
f2e9c3aeb49a Add missing header (macOS)
Author
kislinsk
Browse Repository
No Builds
No Audits
e5aeb4ab1fe5 Merge branch 'T26992-FixRenderingTestHelper'
Author
kislinsk
Browse Repository
No Builds
No Audits
dd8d6da2f746 Reintroduce enhanced OpenGL support test
Author
kislinsk
Browse Repository
No Builds
No Audits
2c98c94e9afb Remove dangling declarations
Author
kislinsk
Browse Repository
No Builds
No Audits
31796e4f314d Merge branch 'T26992-FixRenderingTestHelper'
Author
kislinsk
Browse Repository
No Builds
No Audits
ce4bd875017f Remove flawed OpenGL detection code
Author
kislinsk
Browse Repository
No Builds
No Audits
8abd6f7dca36 Merge branch 'T26971-RunRESTTestsSerial'
Author
kislinsk
Browse Repository
No Builds
No Audits
86879bb05edd Run tests serial
Author
kislinsk
Browse Repository
No Builds
No Audits
49cd8819e818 Merge branch 'T26965-FixTestPathEnv'
Author
kislinsk
Browse Repository
No Builds
No Audits
9fe461be1f57 Append to PATH instead of overriding PATH
Author
kislinsk
Browse Repository
No Builds
No Audits
113ddd8808d2 Merge branch 'T26955-FixPythonTestEnv'
Author
kislinsk
Browse Repository
No Builds
No Audits
8b6094784d76 Reactivate test on Windows
Author
kislinsk
Browse Repository
No Builds
No Audits
1260dfb17afe Add hint to Phabricator task.
Author
kislinsk
Browse Repository
No Builds
No Audits
b89b18f9faa8 Use LD_LIBRARY_PATH to execute mitkPythonTest
Author
kislinsk
Browse Repository
No Builds
No Audits
0e0bcfc78ed1 Merge remote-tracking branch 'origin/T26954-UseFolders'
Author
kislinsk
Browse Repository
No Builds
No Audits
02265dcc26d1 Move MatchPointAlgorithms into Modules
Author
kislinsk
Browse Repository
No Builds
No Audits
8e156483616c Merge remote-tracking branch 'origin/T26954-UseFolders'
Author
kislinsk
Browse Repository
No Builds
No Audits
bac1e5791cb9 Mix missing property name
Author
kislinsk
Browse Repository
No Builds
No Audits
c57f76b198ca Put command-line apps into Modules/Executables folder
Author
kislinsk
Browse Repository
No Builds
No Audits
51ee1c19203d Merge remote-tracking branch 'origin/T26954-UseFolders'
Author
kislinsk
Browse Repository
No Builds
No Audits
ac1c3bd39b0f Categorize remaining targets
Author
kislinsk
Browse Repository
No Builds
No Audits
e3782b339f55 Merge remote-tracking branch 'origin/T26954-UseFolders'
Author
kislinsk
Browse Repository
No Builds
No Audits
f04b1ca5b861 Use folders for target/project organization
Author
kislinsk
Browse Repository
No Builds
No Audits
ba83f51a8ff9 Merge branch 'T26930-FixPreloading'
Author
kislinsk
Browse Repository
No Builds
No Audits
f22aa6c62e6b Fix pre-loading of org.blueberry.core.expressions
Author
kislinsk
Browse Repository
No Builds
No Audits
fc9eb6fb17b5 Merge branch 'T26942-ImproveCESTPrivateTagParsing'
Author
kislinsk
Browse Repository
No Builds
No Audits
d51de1cd1846 Fix wrong assumption made about ASCII format
Author
kislinsk
Browse Repository
No Builds
No Audits
926e62c0b205 Merge branch 'T26942-ImproveCESTPrivateTagParsing'
Author
kislinsk
Browse Repository
No Builds
No Audits
2abe8ed53c56 Make parsing even more robust against unexpected input
Author
kislinsk
Browse Repository
No Builds
No Audits
36f887654582 Merge branch 'T26944-ClearBorderOfRenderWindowMenuButtons'
Author
kislinsk
Browse Repository
No Builds
No Audits
fbc49fc5c831 Prevent stylesheet inheritance in first place
Author
kislinsk
Browse Repository
No Builds
No Audits
fb7ccddc0b51 Merge branch 'T26942-ImproveCESTPrivateTagParsing'
Author
kislinsk
Browse Repository
No Builds
No Audits
66d2e034ea99 Use std::size type for length and offset
Author
kislinsk
Browse Repository
No Builds
No Audits
6a9ff80fa313 Merge branch 'T26942-ImproveCESTPrivateTagParsing'
Author
kislinsk
Browse Repository
No Builds
No Audits
aef3aa0e5c16 Improve and fix parsing of private tags
Author
kislinsk
Browse Repository
No Builds
No Audits
69f7f38253f8 Merge branch 'T26944-ClearBorderOfRenderWindowMenuButtons'
Author
kislinsk
Browse Repository
No Builds
No Audits
cb13b3acdb1f Explicitly clear border of render window menu buttons
Author
kislinsk
Browse Repository
No Builds
No Audits
d02a92d0a398 Merge branch 'T26943-FixShowCrosshair'
Author
kislinsk
Browse Repository
No Builds
No Audits
8199d2f06739 Fix default visibility of crosshair in render window menu
Author
kislinsk
Browse Repository
No Builds
No Audits
85205724ec57 Merge branch 'T26941-WorkaroundCMake3.16'
Author
kislinsk
Browse Repository
No Builds
No Audits
a441d37b79ac Change Python3_INCLUDE_DIR result variable to Python3_INCLUDE_DIRS
Author
kislinsk
Browse Repository
No Builds
No Audits
ec1b19e15871 Merge branch 'T26941-WorkaroundCMake3.16'
Author
kislinsk
Browse Repository
No Builds
No Audits
5d1ec4dd4a69 Work around a bug in CMake 3.16 FindPython3 module
Author
kislinsk
Browse Repository
No Builds
No Audits
462698dbbc2a Merge branch 'T26938-FixExtensionPointContextMenuActionTrigger'
Author
kislinsk
Browse Repository
No Builds
No Audits
cec397e3dd86 Use lambda function for connection
Author
kislinsk
Browse Repository
No Builds
No Audits
89719c8b3d35 Do more clean-up
Author
kislinsk
Browse Repository
No Builds
No Audits
79669e3eeea3 Clean up QmitkDataNodeContextMenu
Author
kislinsk
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 T26269-ChangeSelectionInStatisticsPluginb75fcfc498a7Actions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge branch 'master' into T26269-ChangeSelectionInStatisticsPlugin
b75fcfc498a7
Actions