Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

import export improvements #521

Merged
merged 16 commits into from
Sep 9, 2015
Merged

import export improvements #521

merged 16 commits into from
Sep 9, 2015

Commits on Aug 28, 2015

  1. [#356] import pipeline from zip (v1)

    @mvi-eea-sk
    mvi-eea-sk committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    4f82620 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/#356_import_export

    @mvi-eea-sk
    mvi-eea-sk committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    a2da128 View commit details
    Browse the repository at this point in the history

  3. [#356] import pipeline from zip (v1) 

    forgot to commit some changes
    @mvi-eea-sk
    mvi-eea-sk committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    f4a99f2 View commit details
    Browse the repository at this point in the history

  4. [#356] import pipeline from zip (v1) 

    fix: pipeline.xml doesn't export jarDirectory in template
    @mvi-eea-sk
    mvi-eea-sk committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    c624109 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. [#356] sto_82v1: user choosing import strategy for 3rd lvl DPU instan… 

    …ces that use the configuration of its template

In system the pipeline is imported to, DPU template with matching name was found, but they have different configuration. Two different import strategies are available:
1. to use the DPU template of the system it is imported to and lose the original configuration (the pipeline may not work the way as in the original system)
2. to replace the DPU instance configuration so it will work exactly as in the system it is imported from
    @mvi-eea-sk
    mvi-eea-sk committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    11b6f94 View commit details
    Browse the repository at this point in the history

  2. [#356] check permission for using 3rd lvl DPU

    @mvi-eea-sk
    mvi-eea-sk committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    a185ec2 View commit details
    Browse the repository at this point in the history

  3. [#356] typo in the name of the method

    @mvi-eea-sk
    mvi-eea-sk committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    b312a4f View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. [#356] exporting version in used_dpu.xml

    @mvi-eea-sk
    mvi-eea-sk committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    cfe0206 View commit details
    Browse the repository at this point in the history

  2. Adjusted EN messages in import dialog

    @tomas-knap
    tomas-knap committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    8bbb4be View commit details
    Browse the repository at this point in the history

  3. [#356] 3rd lvl templates are required to be installed before pipeline… 

    … import
    @mvi-eea-sk
    mvi-eea-sk committed Sep 7, 2015
    4 Configuration menu
    Copy the full SHA
    f1fc9e9 View commit details
    Browse the repository at this point in the history

  4. [#356] missing dpu jar table remodeled to show reason for hindering p… 

    …ipeline import
    @mvi-eea-sk
    mvi-eea-sk committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    1ee5711 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. Merge branch 'feature/#356_import_export' of https://github.com/Unifi… 

    …edViews/Core into feature/#356_import_export
    @tomas-knap
    tomas-knap committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    8affdce View commit details
    Browse the repository at this point in the history

  2. Adjusted EN label for conflicts during import

    @tomas-knap
    tomas-knap committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    3f08ff2 View commit details
    Browse the repository at this point in the history

  3. [#356] layout adjustment, missing localization of table columns added… 

    …, update of SK localization
    @mvi-eea-sk
    mvi-eea-sk committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    cc5c2c9 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. Merge branch 'develop' into feature/#356_import_export 

    Conflicts:
	commons-app/src/main/java/cz/cuni/mff/xrg/odcs/commons/app/pipeline/transfer/ImportService.java
	frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/dialog/PipelineImport.java
	frontend/src/main/resources/frontend-messages.properties
	frontend/src/main/resources/frontend-messages_sk.properties
    @mvi-eea-sk
    mvi-eea-sk committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    265db78 View commit details
    Browse the repository at this point in the history

  2. [#356] updated labels or tooltip of EN and SK localization

    @mvi-eea-sk
    mvi-eea-sk committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    3e03597 View commit details
    Browse the repository at this point in the history