User fetzer has pushed new remote branch:

bug-18156-xnat-file-upload

User fetzer has pushed new remote branch:

bug-18156-xnat-upload-feature

User fetzer has pushed new remote branch:

bug-18156-xnat-upload-feature-2

[5fb169]: Merge branch 'bug-18156-xnat-upload-feature-2'

Merged commits:

2016-02-26 17:35:17 Andreas Fetzer [8393c6]
Undo of project-template changes. Use the state of the current master again

2016-02-26 17:25:29 Andreas Fetzer [c3be7b]
Undo of property view changes. This should be done via property extensions

2016-02-26 17:24:30 Andreas Fetzer [dfe9a7]
Fixed icon for data manager context menu extension

2016-02-26 17:14:58 Andreas Fetzer [d9f58e]
Added documentation for XNAT tree-browser plugin

2016-02-26 17:11:01 Andreas Fetzer [3e33bb]
Added new icons for tree-browser

2016-02-26 04:04:10 Andreas Fetzer [66b35a]
Quickfix for experiment creation

2016-02-25 17:00:36 Andreas Fetzer [d08a56]
Fixed duplicate info widgets

Conflicts:
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp

2016-02-24 23:46:36 Andreas Fetzer [08eb6e]
Fixed exception due to empty file path

2016-02-24 23:43:10 Andreas Fetzer [d5230c]
Updated CTK

2016-02-24 23:42:35 Andreas Fetzer [bd3567]
Use busy indicator for progressbar if downloading DICOM series via ZIP

2016-02-22 23:41:38 Andreas Fetzer [7ab6b5]
Removed selection provider.

Since the QmitkXNATEditor is no longer in use we do not need a selection
provider.

2016-02-22 23:40:51 Andreas Fetzer [742402]
Adapted signal connection due to rename in CTK

2016-02-22 23:40:03 Andreas Fetzer [83567d]
Removed workaround code for xnat icon from data manager

2016-02-19 23:41:16 Andreas Fetzer [7cea55]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into xnat-test

Conflicts:
Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt
CMakeExternals/CTK.cmake
CMakeLists.txt
Modules/Core/src/DataManagement/mitkDataNode.cpp
Modules/ImageStatistics/mitkIntensityProfile.cpp
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

2016-02-19 22:58:46 Andreas Fetzer [07ab91]
Merge remote-tracking branch 'origin/personal/fetzer/cgs2015.06-release-xnat' into xnat-test

Conflicts:
Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt
CMakeExternals/CTK.cmake
CMakeExternals/MITKData.cmake
CMakeLists.txt
Modules/Core/include/mitkAffineInteractor.h
Modules/Core/include/mitkDisplayGeometry.h
Modules/Core/include/mitkModeOperation.h
Modules/Core/include/mitkMoveBaseDataInteractor.h
Modules/Core/include/mitkPointSetInteractor.h
Modules/Core/include/mitkPositionTracker.h
Modules/Core/include/mitkSlicesRotator.h
Modules/Core/include/mitkSlicesSwiveller.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorAddOn.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorEvent.h
Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorVtkCameraController.h
Modules/InputDevices/WiiMote/mitkKalmanFilter.h
Modules/InputDevices/WiiMote/mitkWiiMoteAddOn.h
Modules/InputDevices/WiiMote/mitkWiiMoteAllDataEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteButtonEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteCalibrationEvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteIREvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteMultiIREvent.h
Modules/InputDevices/WiiMote/mitkWiiMoteThread.h
Modules/InputDevices/WiiMote/mitkWiiMoteVtkCameraController.h
Modules/QtWidgets/include/QmitkStdMultiWidget.h
Modules/Segmentation/Interactions/mitkContourInteractor.h
Modules/Segmentation/Interactions/mitkExtrudedContourInteractor.h
Modules/Segmentation/Interactions/mitkRegionGrow3DTool.h
Modules/SegmentationUI/Qmitk/QmitkRegionGrow3DToolGUI.h

2016-01-19 15:46:02 Andreas Fetzer [45b670]
Merge remote-tracking branch 'origin/personal/metzger/XNATRefreshOnIndex' into releases/snapshot-CGS-Workbench-2015.05

2016-01-19 12:26:55 Andreas Fetzer [aa4be0]
Fixed XNAT preferences

2016-01-19 09:54:52 Andreas Fetzer [9282f1]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2016-01-19 09:32:58 Andreas Fetzer [124aa2]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2016-01-19 01:37:19 Andreas Fetzer [0a59e4]
Added preference listener

2016-01-19 01:34:12 Andreas Fetzer [430d37]
Added directory button to xnat preference page

2016-01-18 10:50:18 Andreas Fetzer [c5dae2]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2016-01-18 10:48:38 Andreas Fetzer [f72896]
Use regular qRestAPI again, since all changes are integrated

2016-01-18 10:38:42 Andreas Fetzer [46b04b]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2016-01-17 21:19:30 Andreas Fetzer [e2fe02]
Allow bigger input values for double spinboxes in the property view
in case of ScalarRangeMinMax

2016-01-14 19:22:25 Jasmin Metzger [87049c]
Add refresh option to contextmenu. User can refresh xnat-tree item by right-click on index.

2015-11-30 16:02:02 Andreas Fetzer [9db466]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2015-11-03 18:16:21 Caspar Goch [f45f52]
COMP: Copy only if source directory exists

2015-11-02 18:28:31 Caspar Goch [2b6e3f]
added documentation

2015-11-02 16:53:33 Andreas Fetzer [1605f9]
Adapted copy destination for OS X

2015-10-28 15:27:48 Caspar Goch [cccf13]
Copy the CTK Qt plugin files to the binary tree

This will copy the plugin files to a default directory for Qt plugins.
Thus they should be automatically found. Currently this is only needed for
the command line modules plugin. We might need special consideration for
mac paths.

2015-11-11 11:52:02 Andreas Fetzer [5a1e4d]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

Conflicts:
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSessionManager.cpp

2015-11-11 11:49:20 Andreas Fetzer [fcfd24]
Added possibility to set http proxy for XNAT connections

2015-09-17 13:10:06 Andreas Fetzer [ab3496]
Use proxy settings of the system when connecting to XNAT

2015-09-15 10:11:44 Andreas Fetzer [9735ad]
Merge remote-tracking branch 'origin/releases/2015-05-02' into releases/snapshot-CGS-Workbench-2015.05

2015-09-10 12:54:49 Caspar Goch [55224b]
Merge remote-tracking branch 'origin/bug-19216-nsis-installer-does-not-produce-desktop-icons' into releases/2015-05-02

2015-09-09 14:23:56 Andreas Fetzer [02c4f0]
Merge remote-tracking branch 'origin/releases/2015-05-02' into releases/snapshot-CGS-Workbench-2015.05

2015-09-09 14:20:18 Andreas Fetzer [40d42b]
Fixed crash due to invalid session

2015-09-09 10:23:21 Andreas Fetzer [c1a48e]
Added handling for session timeout

2015-09-04 12:39:19 Andreas Fetzer [86eb56]
Fixed include

2015-09-04 10:43:33 Andreas Fetzer [62a4f9]
Merge remote-tracking branch 'origin/bug-19233-EnableSurfaces-In-PointBasedReg' into releases/snapshot-CGS-Workbench-2015.05

2015-09-04 10:38:07 Andreas Fetzer [d835bf]
Merge remote-tracking branch 'origin/bug-19233-EnableSurfaces-In-PointBasedReg' into releases/snapshot-CGS-Workbench-2015.05

2015-09-03 13:44:13 Andreas Fetzer [e069f4]
Added copy url to clipboard entry to XNAT context menu

2015-09-03 12:10:38 Caspar Goch [025458]
Updating version to 2015.05.2

2015-09-02 15:37:03 Caspar Goch [da856f]
Merge remote-tracking branch 'origin/bug-19216-nsis-installer-does-not-produce-desktop-icons' into releases/2015-05-02

2015-08-31 19:53:47 Jasmin Metzger [89d015]
Merge branch 'personal/metzger/CGS-Workbench-2015.05-xnat' into releases/snapshot-CGS-Workbench-2015.05

2015-08-31 19:50:57 Jasmin Metzger [05e4a5]
Change xnat tree view button icons.

2015-08-27 17:24:41 Andreas Fetzer [62655d]
Remove Redland from library search paths

2015-08-27 17:11:13 Andreas Fetzer [38aebc]
Merge remote-tracking branch 'origin/bug-18500-ImplementationOfRdfTripleStoreBaseApiIntegrationFixes' into releases/snapshot-CGS-Workbench-2015.05

2015-08-27 17:10:41 Andreas Fetzer [febd88]
Merge remote-tracking branch 'origin/bug-18500-ImplementationOfRdfTripleStoreBaseApiIntegration' into releases/snapshot-CGS-Workbench-2015.05

2015-08-27 16:23:18 Andreas Fetzer [122a5b]
Merge remote-tracking branch 'origin/releases/2015-05-02' into releases/snapshot-CGS-Workbench-2015.05

2015-08-26 13:47:56 Jasmin Metzger [2e8ce6]
Set some properties for loading DICOM RT data with the predefined values correctly.

2015-08-26 16:52:17 Andreas Fetzer [6f301e]
Merge branch 'bug-19163-ReleaseBasedBugfix' into releases/2015-05-02

2015-08-26 16:50:47 Andreas Fetzer [33235d]
Deactivated unified TitleAndToolBarOnMac again

The fix was accidentally undone by a previous merge conflict.
This leads to strange application behaviour on Qt 4 and is not really
supported for Qt5

2015-08-26 16:20:07 Christoph Kolb [02d52e]
Merge branch 'bug-19270-ExpandPointSetGeometryInsertOperation' into releases/2015-05-02

2015-08-26 14:37:28 Caspar Goch [e18ffc]
Merge remote-tracking branch 'origin/bug-19245-expand-new-nodes-in-datamanager' into releases/2015-05-02

2015-08-26 14:37:03 Caspar Goch [0ccfae]
Merge remote-tracking branch 'origin/bug-16115-store-geometry-in-pointset-file' into releases/2015-05-02

2015-08-24 18:29:28 Caspar Goch [e6630f]
Merge remote-tracking branch 'origin/bug-19203-NavigatorViewsCrashOnOpen' into releases/2015-05-02

Conflicts:
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

2015-08-20 13:18:09 Caspar Goch [3750d0]
Merge branch 'bug-19140-pre-loaded-library-sring-list' into releases/2015-05-02

2015-08-19 12:56:19 Caspar Goch [11c10b]
Merge remote-tracking branch 'origin/bug-19097-fix-incomplete-preferences-list' into releases/2015-05-02

2015-08-12 16:13:54 Stefan Kislinskiy [63c9cf]
Merge branch 'bug-18859-fix-interaction-with-interpolated-planarfigures-rebased' into releases/2015-05-02

2015-08-12 10:37:10 Christoph Kolb [fef3ba]
Merge remote-tracking branch 'origin/bug-19188-FixPointSetDataInteractorForTimeDataRelease' into releases/2015-05-02

2015-08-06 14:29:05 Caspar Goch [4c1dd7]
Merge remote-tracking branch 'origin/bug-19217-turn-text-icons-into-path' into releases/2015-05-02

2015-08-05 17:27:14 Caspar Goch [d42ee4]
Merge remote-tracking branch 'origin/bug-19196-boost-site-config' into releases/2015-05-02

2015-08-05 16:04:38 Caspar Goch [f349cd]
Merge branch 'bug-12666-new-module-data-type-mini-app-tutorial' into releases/2015-05-02

2015-08-05 14:48:55 Jens Kleesiek [a8ea4b]
Merge branch 'bug-19181-OsxMacPortsVigraFixRelease' into releases/2015-05-02

2015-08-05 14:29:53 Jens Kleesiek [705c9f]
bug-19181 for bug-fix release

2015-07-30 15:10:03 Andreas Fetzer [65ccbc]
Fixed url parsing error

2015-07-30 13:35:05 Christoph Kolb [98c640]
get the correct iterators for the timestep

2015-07-30 09:44:18 Andreas Fetzer [7a1233]
Workaround for XNAT context menu icon

2015-07-29 22:41:18 Andreas Fetzer [e63082]
Merge branch 'releases/snapshot-CGS-Workbench-2015.05' of mitk.org:MITK into releases/snapshot-CGS-Workbench-2015.05

2015-07-29 22:39:42 Andreas Fetzer [eb7f90]
Fixed widget layout

2015-07-29 22:33:23 Andreas Fetzer [ee393c]
Improved context menu upload

Now a preselection is offered if already some resource folders exists
and the parent node has a valid xnat url

2015-07-29 17:46:40 unknown [1fda0b]
Merge branch 'personal/metzger/CGS-Workbench-2015.05-xnat' into releases/snapshot-CGS-Workbench-2015.05

2015-07-29 17:43:47 unknown [9e47c2]
Add some more icons for the xnatTreeModel.

2015-07-29 17:40:27 unknown [53a953]
Add export macro to dialog

2015-07-28 22:12:01 Andreas Fetzer [acfa76]
Fixed slow contourmodelset mapper 3d

This was originally implemented by Stefan Kislinskiy
Use vtkPolyLines instead of vtkTubes

2015-07-28 11:15:53 Andreas Fetzer [e193a2]
Added datamanager context menu for upload to XNAT

Selected datanodes can now be uploaded to XNAT via the datamanager
context menu.

2015-07-28 10:34:52 Andreas Fetzer [b0f33f]
Fixed incomplete xnat.url property

2015-07-28 10:34:25 Andreas Fetzer [12f8e1]
Fixed evaluation of QMessageBox and QDialog return values

2015-07-24 20:55:49 Marco Nolden [f7d004]
Merge branch 'bug-19163-ReleaseBasedBugfix' into releases/snapshot-CGS-Workbench-2015.05

2015-07-24 20:55:04 Marco Nolden [303f72]
Merge branch 'bug-19163-ReleaseBasedBugfix' into releases/2015-05-02

2015-07-09 09:06:21 Michael Goetz [4da4ba]
Restored if-condition

2015-07-24 14:08:00 Andreas Fetzer [77f161]
Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05

2015-07-24 13:24:30 Andreas Fetzer [2018fc]
Setting xnat url as property after downloading files

2015-07-24 12:58:04 Andreas Fetzer [5bbe9a]
Improved DICOM loading usability

2015-07-23 10:25:00 Jasmin Metzger [b88998]
Merge remote-tracking branch 'origin/releases/2015-05-02' into releases/snapshot-CGS-Workbench-2015.05

Conflicts:
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

2015-07-23 09:22:00 Andreas Fetzer [9e719c]
Delete temp file after uploading

2015-07-23 08:30:57 Andreas Fetzer [02be6c]
Fixed build errors

2015-07-22 21:13:57 Andreas Fetzer [7852ea]
Update CTK again

2015-07-22 21:13:30 Andreas Fetzer [f91a60]
Merge branch 'bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06-release-xnat

Conflicts:
CMakeExternals/CTK.cmake
Modules/XNAT/files.cmake
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui

2015-07-22 17:30:45 Jasmin Metzger [113664]
Merge remote-tracking branch 'origin/bug-19125-image-cropper-multicomponent-crash' into releases/2015-05-02

2015-07-22 13:28:33 Andreas Fetzer [93755a]
Improved icons

2015-07-22 13:00:45 Andreas Fetzer [cab7b8]
Finished upload to XNAT via QmitkXnatTreeBrowser

Using QProgressBar for progress feedback
Fixed DragNDrop upload
Added QMessageBoxes for status messages

2015-07-21 18:02:53 Andreas Fetzer [6d433d]
Usability improvements

Added buttons for upload, download and resource folder creation.
Upload has still to be implemented

2015-07-21 11:55:58 Andreas Fetzer [fd44c7]
Added upload and download buttons

2015-07-21 11:38:22 Jasmin Metzger [e03a38]
Merge remote-tracking branch 'origin/bug-19169-fix-documentation-issues-for-2015-05-bugfix' into releases/2015-05-02

2015-07-21 11:27:27 Jasmin Metzger [5868fd]
Merge remote-tracking branch 'origin/bug-19133-old-docu-links-fixed' into releases/2015-05-02

2015-07-21 11:01:26 Andreas Fetzer [c8402d]
Updated CTK

2015-07-20 15:59:57 Andreas Fetzer [605a61]
Merge branch 'bug-19174-disable-blueberry-command-framework-release-base' into releases/2015-05-02

2015-07-20 15:59:19 Andreas Fetzer [3c7a91]
Merge branch 'bug-16232-undo-ram-issue-release-base' into releases/2015-05-02

2015-07-17 16:50:32 Tobias Norajitra [8e8db1]
Merge branch 'bug-14605-StatisticsForLineProfiles-rel-0515' into releases/2015-05-02

2015-07-17 16:50:04 Tobias Norajitra [95ca12]
Declaration included.

2015-07-17 16:48:31 Tobias Norajitra [8e5aa5]
Merge branch 'bug-14605-StatisticsForLineProfiles-rel-0515' into releases/2015-05-02

2015-07-17 16:05:54 Tobias Norajitra [295427]
Image statistics calculation for line profiles.

2015-07-15 16:47:47 Jasmin Metzger [1f438e]
Merge remote-tracking branch 'origin/bug-19163-ReleaseBasedBugfix' into releases/2015-05-02

Conflicts:
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

2015-07-15 16:38:15 Jasmin Metzger [75fc48]
Merge branch 'bug-18482-IntegrationBranchForBugFixRelease2015.05.2' into releases/2015-05-02

2015-06-25 14:18:38 Matthias Eisenmann [1f3945]
Adapted documentation of SetData method.

Conflicts:
Modules/Core/include/mitkDataNode.h

2015-06-25 14:17:36 Matthias Eisenmann [9af40f]
Refactoring.

Conflicts:
Modules/Core/src/DataManagement/mitkDataNode.cpp
Modules/Core/test/mitkDataNodeTest.cpp

2015-06-24 19:58:08 Matthias Eisenmann [5ec6b9]
Added check for nullptr before accessing baseData.
Only clear property list if data types differ but base data is not null.

Conflicts:
Modules/Core/src/DataManagement/mitkDataNode.cpp

2015-06-24 19:56:48 Matthias Eisenmann [bc80f3]
Added check for nullptr before accessing baseData.
Only clear property list if data types differ but base data is not null.

2015-07-15 15:48:00 Jasmin Metzger [24a364]
Merge remote-tracking branch 'origin/bug-18482-DataNodeSetDefaultPropertyFix' into bug-18482-IntegrationBranchForBugFixRelease2015.05.2

2015-07-15 14:21:07 Michael Goetz [fc1380]
Added QActions for Undo/Redo

Conflicts:
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

2015-06-25 14:12:45 Eric Heim [10cd9f]
COMP: Fixed test path on windows for python tests

2015-06-25 13:55:10 Eric Heim [33fe5b]
COMP: Remove cmake error when wrong qt version is used with python. Now python is disabled with a warning.

2015-06-25 11:34:01 Eric Heim [a21026]
COMP: Correct warning message if python is used in wrong configuration

2015-06-25 10:40:05 Eric Heim [e26f6f]
COMP: Removed CMAKE error and disable python with a warning if it is enabled in debug mode.

2015-06-24 14:29:33 Eric Heim [d5d7b9]
Enable Python in all configuration builds

2015-06-24 14:10:50 Eric Heim [7339ef]
Added sanity checks for Qt version and build type for python wrapping

2015-06-03 16:54:45 Michael Brehler [580aae]
COMP: revert python from all configuration because of Qt Version conflict

2015-06-03 16:15:47 Michael Brehler [3253af]
check for 32bit in build all configuration and disable python and numpy

2015-07-15 11:07:25 Jasmin Metzger [0a4918]
Merge remote-tracking branch 'origin/bug-18859-fix-interaction-with-interpolated-planarfigures-rebased' into releases/2015-05-02

2015-07-08 16:55:09 Stefan Kislinskiy [de5507]
Fixed index mapping between proxy model and actual model of the list view.

2015-07-08 15:09:31 Stefan Kislinskiy [0ee77a]
Fixed search routine for finding the DepartmentLogo preference key.

2015-07-08 15:08:28 Stefan Kislinskiy [345857]
Handle a few more error cases gracefully and explicitly flush the written logo to disk.

2015-07-14 14:19:31 Jasmin Metzger [3a83f7]
Merge remote-tracking branch 'origin/bug-18084-IntegrationBranchBeforeNewRelease' into releases/2015-05-02

2015-07-14 14:16:57 Jasmin Metzger [4bd82a]
Merge remote-tracking branch 'origin/bug-19016-error-in-fixup-spacing-rebased' into releases/2015-05-02

2015-07-14 14:11:55 Jasmin Metzger [bf0ce0]
Merge remote-tracking branch 'origin/bug-18955-mutex-lock-DICOMITKSeriesGDCMReader-rebased' into releases/2015-05-02

2015-07-13 08:55:29 Andreas Fetzer [6b5e0a]
Fixed treebrowser context menu

2015-07-13 08:58:37 Andreas Fetzer [e3c764]
CTK Update

2015-07-06 14:22:08 Andreas Fetzer [6f8de1]
Merge remote-tracking branch 'origin/bug-19143-EraseTheXnatEditorWithoutDeleting' into personal/fetzer/cgs2015.06-release-xnat

2015-07-06 14:02:45 Andreas Fetzer [2c1a2d]
Merge remote-tracking branch 'origin/bug-19095-CreateXnatProjectSubjectExperimentPerRightClickTreeBrowser' into personal/fetzer/cgs2015.06-release-xnat

1. Conflicts:
2. Modules/XNAT/files.cmake
3. Modules/XNAT/src/QmitkXnatProjectInfoWidget.cpp
4. Modules/XNAT/src/QmitkXnatSubjectInfoWidget.cpp
5. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
6. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

2015-07-06 13:53:57 Andreas Fetzer [62b406]
Merge remote-tracking branch 'origin/bug-19051-VisualizationOfMetaInformationForXnatObjects' into personal/fetzer/cgs2015.06-release-xnat

1. Conflicts:
2. Modules/XNAT/CMakeLists.txt
3. Modules/XNAT/files.cmake
4. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
5. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

2015-07-06 13:48:53 Andreas Fetzer [4f97e5]
Merge remote-tracking branch 'origin/bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06-release-xnat

1. Conflicts:
2. CMakeExternals/CTK.cmake
3. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.cpp
4. Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp

2015-06-09 15:47:41 Nico Riecker [4ab928]
updated the test image in the mitk-data repository

(cherry picked from commit ea5e7598253ce05bc331f2b453b92183cd6f9cf3)

2015-06-23 18:04:02 Jasmin Metzger [b5ae30]
Merge remote-tracking branch 'origin/bug-17844-RT-Refactoring-PluginIntegrationQt5' into releases/snapshot-CGS-Workbench-2015.05

2015-06-23 10:27:11 Daniel Knorr [800464]
Added a completer for a lineedit to use all session types of an experiment.
Fixed some copy mistakes.

2015-06-05 13:42:22 Daniel Knorr [e4ef5a]
deleted name row in experiment widget.

2015-06-05 13:40:14 Daniel Knorr [8b0411]
Update Treeview after create new object is now executed.
Change order of lineedits in subject widget.

2015-06-03 16:16:16 Stefan Kislinskiy [3b87fe]
MITK 2015.05.0 version update

2015-06-03 15:27:49 Andreas Fetzer [1cc632]
Fixed warnings

2015-06-03 15:27:38 Andreas Fetzer [11b906]
Fixed Qt 4 compatibility for mac

2015-06-02 11:35:36 Christian Weber [f736e3]
Merge branch 'bug-19110-AddDecpratedDeclarations' into releases/2015-05

2015-06-01 16:45:49 Christian Weber [7210c8]
Mark Functions and Classes as deprecated that will be removed in near future due to restructuring.

2015-05-29 17:06:23 Daniel Knorr [46b701]
Added functionality that on right click a new xnat object is created.
Renamed all widgets. Created a Dialog for entering information.
Adjusted treebrowser to use new widgets with two modes.

2015-05-29 14:57:01 Jasmin Metzger [0309d7]
Merge branch 'bug-15886-UploadTubeGraphTestData' into releases/2015-05

2015-05-29 11:51:31 Andreas Fetzer [ed7a43]
Merge branch 'bug-19108-contourmodel-to-image-windows-crash' into releases/2015-05

2015-05-29 08:17:26 Andreas Fetzer [5e386f]
Merge branch 'bug-5922-coronal-shift-blueberry-tab-issue-macosx' into releases/2015-05

2015-05-28 14:12:37 Andreas Fetzer [194c27]
Merge branch 'bug-19103-wrong-cpp11-nullptr-replacement' into releases/2015-05

2015-05-27 14:31:14 Stefan Kislinskiy [be48cc]
Merge branch 'bug-19059-HideNewMenuAndNewEditorMenuEntries' into releases/2015-05

2015-05-21 15:54:58 Daniel Knorr [4d1f52]
minibreadcrumbs in the widgets.

2015-05-21 13:22:32 Daniel Knorr [84ca18]
Moved Files from XNATUI to XNAT Module.

2015-05-19 12:57:48 Daniel Knorr [0877d8]
Added the functionality to get additional information about some xnat objects.

2015-05-12 11:20:47 Daniel Knorr [a08842]
Added a new module with three widgets for xnat objects.
For detailed information about the specific object.

2015-05-08 17:15:54 Daniel Knorr [1a0c1c]
Adjusted specific Widget for a project.

2015-05-08 16:26:44 Daniel Knorr [3f8c20]
Adjusted CMakeLists to use QWidget.

2015-05-08 16:04:13 Daniel Knorr [206d7e]
Created a new module for xnat widgets.
Added first widget for xnat project.

2015-04-26 22:22:33 Andreas Fetzer [c189be]
WIP Upload file

2015-04-26 22:02:57 Andreas Fetzer [b3e28c]
Cosmetic changes

2015-04-26 21:58:56 Andreas Fetzer [7a8b68]
Enhance QmitkXnatTreeModel for drag and drop support

2015-04-23 22:53:10 Andreas Fetzer [3db9c3]
Created QmitkXnatTreeModel.
Added icons to xnatTreeBrowserView for dataModel, project, subject, experiment.

Conflicts:
Modules/XNAT/files.cmake
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

2015-04-23 22:32:19 Andreas Fetzer [340ec1]
Use QListView instead of QTreeView

Conflicts:
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.cpp

[6638b3]: Merge branch 'bug-18156-xnat-upload-feature-2'

Merged commits:

2016-02-29 09:56:38 Andreas Fetzer [7cc5cb]
COMP Fixed build errors on windows

[d1725c]: Merge branch 'bug-18156-xnat-upload-feature-2'

Merged commits:

2016-02-29 10:26:48 Andreas Fetzer [b45d37]
COMP Code styling + fixed warning

[8457ec]: Merge branch 'bug-18156-xnat-upload-feature-2'

Merged commits:

2016-02-29 11:14:57 Andreas Fetzer [af73c7]
COMP Fixed build error on windows