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

Jkmarx/data import reorganize tabs #1345

Merged
merged 56 commits into from
Aug 16, 2016
Merged

Jkmarx/data import reorganize tabs #1345

merged 56 commits into from
Aug 16, 2016

Commits on Aug 8, 2016

  1. Create a services directory.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    a098525 View commit details
    Browse the repository at this point in the history

  2. Fix merge conflict.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    88c095a View commit details
    Browse the repository at this point in the history

  3. Remove duplicate buttons.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    31e866b View commit details
    Browse the repository at this point in the history

  4. Directive for selecting workflows.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    78d51c7 View commit details
    Browse the repository at this point in the history

  5. Add service for selected workflows.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    fe52546 View commit details
    Browse the repository at this point in the history

  6. Refactor out of scope.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    11f6809 View commit details
    Browse the repository at this point in the history

  7. Add unit test for directive.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    5e90d37 View commit details
    Browse the repository at this point in the history

  8. Add basic unit test for controller.

    @jkmarx
    jkmarx committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    90c0eb0 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. Add comments and fix conditional.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    00487aa View commit details
    Browse the repository at this point in the history

  2. More unit tests for service.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    ab39877 View commit details
    Browse the repository at this point in the history

  3. Remove moment line.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    5c9e2eb View commit details
    Browse the repository at this point in the history

  4. Reorder fields.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    fd6a640 View commit details
    Browse the repository at this point in the history

  5. Tab set to default.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    e4da70b View commit details
    Browse the repository at this point in the history

  6. Organize metadata configurations into sections.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    db38210 View commit details
    Browse the repository at this point in the history

  7. Additional html adjustments.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    15c3df9 View commit details
    Browse the repository at this point in the history

  8. Bold text in required.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    ff64df8 View commit details
    Browse the repository at this point in the history

  9. Change field name.

    @jkmarx
    jkmarx committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    a78578d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Remove blank option.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    fe122b9 View commit details
    Browse the repository at this point in the history

  2. Remove reference ids and added them before sending form.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    f397f1c View commit details
    Browse the repository at this point in the history

  3. Add require to species column.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    6045585 View commit details
    Browse the repository at this point in the history

  4. Remove comments.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    961043c View commit details
    Browse the repository at this point in the history

  5. Add comments.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    94e5b8f View commit details
    Browse the repository at this point in the history

  6. Add redirect back.

    @jkmarx
    jkmarx committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    7510487 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Fix merge conflict.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    de5934e View commit details
    Browse the repository at this point in the history

  2. Add sample-file.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    a9202ad View commit details
    Browse the repository at this point in the history

  3. Adjust gruntfile to build/compile sample-file.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    f336a95 View commit details
    Browse the repository at this point in the history

  4. Adjust text and icon for clarity.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    6b055d2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/parklab/refinery-platform … 

    …into jkmarx/data-import-sample-file
    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    4761ab6 View commit details
    Browse the repository at this point in the history

  6. Make file upload a partial and add a directive.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    e85d0b7 View commit details
    Browse the repository at this point in the history

  7. Swap file upload and isa-tab upload.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    9ff18c0 View commit details
    Browse the repository at this point in the history

  8. Update states.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    4b862d3 View commit details
    Browse the repository at this point in the history

  9. Add padding to data upload section

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    2e917f2 View commit details
    Browse the repository at this point in the history

  10. Update unit test.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    01daf9c View commit details
    Browse the repository at this point in the history

  11. Remove graying out feature.

    @jkmarx
    jkmarx committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    75be405 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Update tab names.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    f97fe46 View commit details
    Browse the repository at this point in the history

  2. Update text for download.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    81d972f View commit details
    Browse the repository at this point in the history

  3. Correct pre-select columns for dataFile and species.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    2f98f68 View commit details
    Browse the repository at this point in the history

  4. Update text.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    2f9b285 View commit details
    Browse the repository at this point in the history

  5. Move to partials for consistency.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    792b3c7 View commit details
    Browse the repository at this point in the history

  6. Remove file ext. text.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    2438f36 View commit details
    Browse the repository at this point in the history

  7. Change button color.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    a847930 View commit details
    Browse the repository at this point in the history

  8. Rename the start import button.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    3e7c795 View commit details
    Browse the repository at this point in the history

  9. Correct button styling.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    540c6ca View commit details
    Browse the repository at this point in the history

  10. Add service.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    df7218b View commit details
    Browse the repository at this point in the history

  11. Restructure radio buttons.

    @jkmarx
    jkmarx committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    cb6c627 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2016

  1. Move radio buttons inline.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    e577eb0 View commit details
    Browse the repository at this point in the history

  2. Add text.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    c55a786 View commit details
    Browse the repository at this point in the history

  3. Adjust cancel button to emphasize.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    ea525b4 View commit details
    Browse the repository at this point in the history

  4. Disable start upload dataset button while files are uploading.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    30334a6 View commit details
    Browse the repository at this point in the history

  5. Add warning text when files are queued.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    2103a4b View commit details
    Browse the repository at this point in the history

  6. Unit test.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    79422a0 View commit details
    Browse the repository at this point in the history

  7. Add unit test for service.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    9cafc52 View commit details
    Browse the repository at this point in the history

  8. Adjust comment.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    6ce67a4 View commit details
    Browse the repository at this point in the history

  9. Move dom helpers to directive.

    @jkmarx
    jkmarx committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    43ceafc View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Update file upload status correctly after a cancel.

    @jkmarx
    jkmarx committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    3ce67c9 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflict.

    @jkmarx
    jkmarx committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    d250882 View commit details
    Browse the repository at this point in the history