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

Feature/concept dnd select #134

Merged
merged 29 commits into from
Jul 17, 2018
Merged

Feature/concept dnd select #134

merged 29 commits into from
Jul 17, 2018

Commits on Apr 27, 2018

  1. WIP: initial

    Marcus Baitz committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    84b75e4 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. refactoring and changes

    Marcus Baitz committed May 4, 2018
    Configuration menu
    Copy the full SHA
    34d5b85 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. changes

    Marcus Baitz committed May 8, 2018
    Configuration menu
    Copy the full SHA
    b8e9377 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. changes

    Marcus Baitz committed May 14, 2018
    Configuration menu
    Copy the full SHA
    d2a0a25 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. fix tests

    Marcus Baitz committed May 15, 2018
    Configuration menu
    Copy the full SHA
    2b481f0 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. changes

    Marcus Baitz committed May 16, 2018
    Configuration menu
    Copy the full SHA
    306252b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2018

  1. fix modal layer

    Marcus Baitz committed May 24, 2018
    Configuration menu
    Copy the full SHA
    0cc745a View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. changes

    Marcus Baitz committed May 25, 2018
    Configuration menu
    Copy the full SHA
    87feee1 View commit details
    Browse the repository at this point in the history

  2. mock api added

    Marcus Baitz committed May 25, 2018
    Configuration menu
    Copy the full SHA
    4c63cdf View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. fix test

    Marcus Baitz committed May 31, 2018
    Configuration menu
    Copy the full SHA
    4373f8b View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. demo data changes

    Marcus Baitz committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    ef91bf7 View commit details
    Browse the repository at this point in the history

  2. drag and drop file into forms

    Marcus Baitz committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    89193ea View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. change placeholder

    Marcus Baitz committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    bd44cfa View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. fix missing filter values

    Marcus Baitz committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    b1e5fd2 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. merge develop

    Marcus Baitz committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    d561803 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/concept-dnd-select 

    # Conflicts:
#	README.md
#	frontend/app/api/index.js
#	frontend/lib/js/api/api.js
#	frontend/package.json
#	frontend/pom.xml
#	frontend/yarn.lock
#	pom.xml
#	selenium-test/pom.xml
    Marcus Baitz committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    142bab5 View commit details
    Browse the repository at this point in the history

  3. set initial test parameters

    Marcus Baitz committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    d5a9b75 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. Merge branch 'release/1.9.0' into feature/concept-dnd-select

    Marcus Baitz committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    e0971f1 View commit details
    Browse the repository at this point in the history

  2. refactoring

    Marcus Baitz committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    d6b2f7c View commit details
    Browse the repository at this point in the history

  3. renamed label: uploadConceptListModal

    Marcus Baitz committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    f99ef35 View commit details
    Browse the repository at this point in the history

  4. added maxWidth to Dropzone

    Marcus Baitz committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    51d0f87 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. run script build-app for publish

    Marcus Baitz committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    9df8c24 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/1.9.0' into feature/concept-dnd-select 

    # Conflicts:
#	frontend/app/src/js/forms/example-form/ExampleForm.js
#	frontend/lib/js/external-forms/ExternalFormsContainer.js
#	frontend/lib/js/external-forms/form-concept-group/FormConceptGroup.js
#	pom.xml
#	selenium-test/pom.xml
    Marcus Baitz committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    5aed204 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. fix version

    Marcus Baitz committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    2bdbaf3 View commit details
    Browse the repository at this point in the history

  2. update actions

    Marcus Baitz committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    bcaffde View commit details
    Browse the repository at this point in the history

  3. version to 1.9.0-rc.1 changed

    Marcus Baitz committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    5791767 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. enable drag&drop files for InputMultiSelect

    Marcus Baitz committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    d7b92fc View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. changes

    Marcus Baitz committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    bfe52e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge branch 'release/1.9.0' into feature/concept-dnd-select

    @MarcusBaitz
    MarcusBaitz committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    8209b79 View commit details
    Browse the repository at this point in the history