Diffusion MITK f91a60924f92

Merge branch 'bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06…
f91a60924f92
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Details

Provenance

Authored on Jul 22 2015, 9:13 PM

Parents

rMITK93755afb3bb9: Improved icons
rMITK6b5e0a340a9e: Fixed treebrowser context menu

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITKf91a60924f92: Merge branch 'bug-18156-xnat-upload-feature' into personal/fetzer/cgs2015.06… (authored by • fetzer).Jul 22 2015, 9:13 PM

Merged Changes

93755afb3bb9 Improved icons
Author
• fetzer
Browse Repository
No Builds
No Audits
cab7b842b333 Finished upload to XNAT via QmitkXnatTreeBrowser
Author
• fetzer
Browse Repository
No Builds
No Audits
6d433d23d849 Usability improvements
Author
• fetzer
Browse Repository
No Builds
No Audits
fd44c7360676 Added upload and download buttons
Author
• fetzer
Browse Repository
No Builds
No Audits
c8402dc44fb2 Updated CTK
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Packages

Modules/

XNAT/

O4: MITK Reviewer Group III

include/

QmitkXnatTreeModel.h

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.h

O4: MITK Reviewer Group III

src/

QmitkXnatTreeModel.cpp

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.cpp

O4: MITK Reviewer Group III

QmitkXnatUploadFromDataStorageDialog.ui

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.xnat/

O3: MITK Reviewer Group II

resources/

xnat-download.png

O3: MITK Reviewer Group II

xnat-folder.png

O3: MITK Reviewer Group II

xnat-upload.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

src/

internal/

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserViewControls.ui

O3: MITK Reviewer Group II

rMITKf91a60924f92

Modules/XNAT/files.cmake

Loading...

Modules/XNAT/include/QmitkXnatTreeModel.h

Loading...

Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h

Loading...

Modules/XNAT/src/QmitkXnatTreeModel.cpp

Loading...

Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp

Loading...

Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/files.cmake

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-folder.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui

Loading...