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

Scottx611x/own public datasets #1124

Merged
merged 26 commits into from
May 13, 2016
Merged

Scottx611x/own public datasets #1124

merged 26 commits into from
May 13, 2016

Commits on May 11, 2016

  1. Add url to view for taking ownership of a dataset

    @scottx611x
    scottx611x committed May 11, 2016
    Configuration menu
    Copy the full SHA
    77452f9 View commit details
    Browse the repository at this point in the history

  2. Add view that takes a relative url to a dataset's isa-archive and the… 

    …n proceeds to reimport that file for the current user
    @scottx611x
    scottx611x committed May 11, 2016
    Configuration menu
    Copy the full SHA
    3ebfd27 View commit details
    Browse the repository at this point in the history

  3. Add button/logic to take ownership and reimport a public dataset in D… 

    …ataset details tab
    @scottx611x
    scottx611x committed May 11, 2016
    Configuration menu
    Copy the full SHA
    5c824cc View commit details
    Browse the repository at this point in the history

  4. Add placeholder code so Fritz can "Angularize this"

    @scottx611x
    scottx611x committed May 11, 2016
    Configuration menu
    Copy the full SHA
    656306b View commit details
    Browse the repository at this point in the history

  5. Change view to work with Angular and Django Templates

    @scottx611x
    scottx611x committed May 11, 2016
    Configuration menu
    Copy the full SHA
    549e166 View commit details
    Browse the repository at this point in the history

  6. Catch more fine grain errors.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    7703c53 View commit details
    Browse the repository at this point in the history

  7. Add a new property called refinery-tooltip-hide-when="<EXPRESSION>"… 

    … which will close the tooltip once this expression is true. This is needed when the host tag is a button which gets disabled on a click because the tooltip doesn't operate on disabled button, hence it would stay forever without closing it programatically.
    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    0a903be View commit details
    Browse the repository at this point in the history

  8. Service that calls the take over ownership method for a data set.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    a9f732c View commit details
    Browse the repository at this point in the history

  9. Add data set import logic.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    297f718 View commit details
    Browse the repository at this point in the history

  10. Add import button to the data set preview panel.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    d8dc246 View commit details
    Browse the repository at this point in the history

  11. Turn the a tag into a button because it only triggers a method and do… 

    …esn't link anywhere.
    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    b4a817b View commit details
    Browse the repository at this point in the history

  12. Remove Django temporary template.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    190af25 View commit details
    Browse the repository at this point in the history

  13. Bind context to the method.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    ffb08dd View commit details
    Browse the repository at this point in the history

  14. Fix an issue loading the data set details for shared data sets.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    a676a53 View commit details
    Browse the repository at this point in the history

  15. Simplify code.

    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    405ee8a View commit details
    Browse the repository at this point in the history

  16. Reload the data set list after a successful import so that the import… 

    …ed data set is listed.
    @flekschas
    flekschas committed May 11, 2016
    Configuration menu
    Copy the full SHA
    aad40a2 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2016

  1. Remove CSRF exempt as its not needed.

    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    ade16fc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into scottx611x/own_public_datasets 

    # Conflicts:
#	refinery/ui/source/js/dashboard/directives/data-set-preview.js
    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    cbc398b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into scottx611x/own_public_datasets

    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    77fab47 View commit details
    Browse the repository at this point in the history

  4. Check whether the request comes from AJAX or is a normal POST.

    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    8a4701d View commit details
    Browse the repository at this point in the history

  5. Send special header so that Django can actually detect the AJAX request.

    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    0de47f7 View commit details
    Browse the repository at this point in the history

  6. Load preview data of the newly imported data set after the successful… 

    … import.
    @flekschas
    flekschas committed May 12, 2016
    Configuration menu
    Copy the full SHA
    af6c727 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2016

  1. Reset the import status every time data set details are loaded.

    @flekschas
    flekschas committed May 13, 2016
    Configuration menu
    Copy the full SHA
    2aeee08 View commit details
    Browse the repository at this point in the history

  2. Add method get_isa_archive to DataSet model

    @scottx611x
    scottx611x committed May 13, 2016
    Configuration menu
    Copy the full SHA
    9d421ff View commit details
    Browse the repository at this point in the history

  3. Add logic to tell if we are coming from the old Django Template or not

    @scottx611x
    scottx611x committed May 13, 2016
    Configuration menu
    Copy the full SHA
    a7758fb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'scottx611x/own_public_datasets' of https://github.com/p… 

    …arklab/refinery-platform into scottx611x/own_public_datasets
    @scottx611x
    scottx611x committed May 13, 2016
    Configuration menu
    Copy the full SHA
    a2bfb02 View commit details
    Browse the repository at this point in the history