Skip to content
Snippets Groups Projects
  • Benjamin Jakimow's avatar
    92e642e1
    scripts/create_plugin: · 92e642e1
    Benjamin Jakimow authored
    - refactoring
    - added ABOUT.html to plugin folder
    
    scripts/updateexternals.py
    - refactoring
    
    ui/eotest_resources.qrc:
    - renamed resource prefix from timeseriesviewer to eotimeseriesviewer
    
    repaired tests
    
    Merge branch 'develop' of bitbucket.org:jakimowb/eo-time-series-viewer into develop
    
    # Conflicts:
    #	eotimeseriesviewer/__init__.py
    #	eotimeseriesviewer/externals/qps/classification/classificationscheme.py
    #	eotimeseriesviewer/externals/qps/crosshair/crosshair.py
    #	eotimeseriesviewer/externals/qps/enmap.tif.aux.xml
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/core.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/gdalmetadata.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/vectorlabeling.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/vectorlayerfields.py
    #	eotimeseriesviewer/externals/qps/layerproperties.py
    #	eotimeseriesviewer/externals/qps/plotstyling/plotstyling.py
    #	eotimeseriesviewer/externals/qps/speclib/core.py
    #	eotimeseriesviewer/externals/qps/speclib/gui.py
    #	eotimeseriesviewer/externals/qps/speclib/io/artmo.py
    #	eotimeseriesviewer/externals/qps/speclib/io/asd.py
    #	eotimeseriesviewer/externals/qps/speclib/io/clipboard.py
    #	eotimeseriesviewer/externals/qps/speclib/io/csvdata.py
    #	eotimeseriesviewer/externals/qps/speclib/io/envi.py
    #	eotimeseriesviewer/externals/qps/speclib/io/rastersources.py
    #	eotimeseriesviewer/externals/qps/speclib/io/specchio.py
    #	eotimeseriesviewer/externals/qps/speclib/io/vectorsources.py
    #	eotimeseriesviewer/externals/qps/speclib/spectrallibrarywidget.ui
    #	eotimeseriesviewer/externals/qps/testing.py
    #	eotimeseriesviewer/externals/qps/ui/gdalmetadatamodelwidget.ui
    #	eotimeseriesviewer/tests.py
    #	eotimeseriesviewer/utils.py
    #	scripts/create_runtestsbat.py
    #	scripts/deploy.py
    #	scripts/iconselect.py
    #	scripts/make.py
    #	scripts/setuprepository.py
    #	scripts/svg2png.txt
    #	scripts/updateexternals.py
    92e642e1
    History
    scripts/create_plugin:
    Benjamin Jakimow authored
    - refactoring
    - added ABOUT.html to plugin folder
    
    scripts/updateexternals.py
    - refactoring
    
    ui/eotest_resources.qrc:
    - renamed resource prefix from timeseriesviewer to eotimeseriesviewer
    
    repaired tests
    
    Merge branch 'develop' of bitbucket.org:jakimowb/eo-time-series-viewer into develop
    
    # Conflicts:
    #	eotimeseriesviewer/__init__.py
    #	eotimeseriesviewer/externals/qps/classification/classificationscheme.py
    #	eotimeseriesviewer/externals/qps/crosshair/crosshair.py
    #	eotimeseriesviewer/externals/qps/enmap.tif.aux.xml
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/core.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/gdalmetadata.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/vectorlabeling.py
    #	eotimeseriesviewer/externals/qps/layerconfigwidgets/vectorlayerfields.py
    #	eotimeseriesviewer/externals/qps/layerproperties.py
    #	eotimeseriesviewer/externals/qps/plotstyling/plotstyling.py
    #	eotimeseriesviewer/externals/qps/speclib/core.py
    #	eotimeseriesviewer/externals/qps/speclib/gui.py
    #	eotimeseriesviewer/externals/qps/speclib/io/artmo.py
    #	eotimeseriesviewer/externals/qps/speclib/io/asd.py
    #	eotimeseriesviewer/externals/qps/speclib/io/clipboard.py
    #	eotimeseriesviewer/externals/qps/speclib/io/csvdata.py
    #	eotimeseriesviewer/externals/qps/speclib/io/envi.py
    #	eotimeseriesviewer/externals/qps/speclib/io/rastersources.py
    #	eotimeseriesviewer/externals/qps/speclib/io/specchio.py
    #	eotimeseriesviewer/externals/qps/speclib/io/vectorsources.py
    #	eotimeseriesviewer/externals/qps/speclib/spectrallibrarywidget.ui
    #	eotimeseriesviewer/externals/qps/testing.py
    #	eotimeseriesviewer/externals/qps/ui/gdalmetadatamodelwidget.ui
    #	eotimeseriesviewer/tests.py
    #	eotimeseriesviewer/utils.py
    #	scripts/create_runtestsbat.py
    #	scripts/deploy.py
    #	scripts/iconselect.py
    #	scripts/make.py
    #	scripts/setuprepository.py
    #	scripts/svg2png.txt
    #	scripts/updateexternals.py
Code owners
Assign users and groups as approvers for specific file changes. Learn more.