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

Analysis refactor GUI part2 #2077

Merged
merged 67 commits into from
Feb 15, 2017
Merged

Analysis refactor GUI part2 #2077

merged 67 commits into from
Feb 15, 2017

Commits on Jan 2, 2017

  1. fix qiita-spots#1505

    @antgonza
    antgonza committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    3601c29 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. improving some GUI stuff

    @antgonza
    antgonza committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    0d6788e View commit details
    Browse the repository at this point in the history

  2. improving some GUI stuff - missing lines

    @antgonza
    antgonza committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    12406cc View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. pull upstream master

    @antgonza
    antgonza committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    958fcbe View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. addressing all comments

    @antgonza
    antgonza committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    a57ef23 View commit details
    Browse the repository at this point in the history

  2. ready for review

    @antgonza
    antgonza committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    2ead7a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2017

  1. fix qiita-spots#1987

    @antgonza
    antgonza committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    73a78e7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request qiita-spots#2036 from antgonza/fix-1505 

    Fix 1505
    @josenavas
    josenavas committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    e64a22a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Merge pull request qiita-spots#2047 from antgonza/fix-1987 

    fix qiita-spots#1987
    @josenavas
    josenavas committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    0dcae8b View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. initial commit

    @antgonza
    antgonza committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    4a5bbbc View commit details
    Browse the repository at this point in the history

  2. requested changes

    @antgonza
    antgonza committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    f99975c View commit details
    Browse the repository at this point in the history

  3. Merge pull request qiita-spots#2049 from antgonza/add-processing-sugg… 

    …estions

Processing recommendations and pipelines
    @josenavas
    josenavas committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    ed899a8 View commit details
    Browse the repository at this point in the history

  4. fix filter job list

    @antgonza
    antgonza committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    d508320 View commit details
    Browse the repository at this point in the history

  5. Merge pull request qiita-spots#2050 from antgonza/fix-filter-job-list 

    fix filter job list
    @josenavas
    josenavas committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    025cc1e View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Fixing server cert (qiita-spots#2051)

    @josenavas @antgonza
    josenavas authored and antgonza committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    599bcde View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2017

  1. fix get_studies

    @antgonza
    antgonza committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    d12ccfe View commit details
    Browse the repository at this point in the history

  2. flake8

    @antgonza
    antgonza committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    b33983b View commit details
    Browse the repository at this point in the history

  3. fix qiita-spots#503

    @antgonza
    antgonza committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    b4f1b1f View commit details
    Browse the repository at this point in the history

  4. fix qiita-spots#2010

    @antgonza
    antgonza committed Jan 20, 2017
    Configuration menu
    Copy the full SHA
    62a1b93 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2017

  1. fix qiita-spots#1913

    @antgonza
    antgonza committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    2e36141 View commit details
    Browse the repository at this point in the history

  2. fix errors

    @antgonza
    antgonza committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    e006e20 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2017

  1. Merge pull request qiita-spots#2052 from antgonza/fix-get_studies 

    fix get_studies
    @josenavas
    josenavas committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    c174693 View commit details
    Browse the repository at this point in the history

  2. Merge pull request qiita-spots#2053 from antgonza/fix-by-blinking 

    Fix by blinking
    @josenavas
    josenavas committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    131dd6a View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2017

  1. addressing @josenavas comment

    @antgonza
    antgonza committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    ccb55bd View commit details
    Browse the repository at this point in the history

  2. flake8

    @antgonza
    antgonza committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    dfe2e83 View commit details
    Browse the repository at this point in the history

  3. Merge pull request qiita-spots#2056 from antgonza/fix-1913 

    fix qiita-spots#1913
    @josenavas
    josenavas committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    15fcceb View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. fix qiita-spots#1010

    @antgonza
    antgonza committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    7f97f2a View commit details
    Browse the repository at this point in the history

  2. fix qiita-spots#1066 (qiita-spots#2058)

    @antgonza @ElDeveloper
    antgonza authored and ElDeveloper committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    9eb9dbb View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. addressing @josenavas comments

    @antgonza
    antgonza committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    23104d7 View commit details
    Browse the repository at this point in the history

  2. fix qiita-spots#1961

    @antgonza
    antgonza committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    1f1e826 View commit details
    Browse the repository at this point in the history

  3. fix qiita-spots#1837

    @antgonza
    antgonza committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    19a9dda View commit details
    Browse the repository at this point in the history

  4. Automatic jobs & new stats (qiita-spots#2057) 

    * fix qiita-spots#814, fix qiita-spots#1636

* fixing error in test-env

* fixing stats.html call

* adding img

* addressing @josenavas comments

* rm for loops

* addresssing @ElDeveloper comments
    @antgonza @ElDeveloper
    antgonza authored and ElDeveloper committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    19889f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2017

  1. Merge pull request qiita-spots#2060 from antgonza/fix-1961 

    fix qiita-spots#1961
    @wasade
    wasade committed Jan 28, 2017
    Configuration menu
    Copy the full SHA
    4e380e0 View commit details
    Browse the repository at this point in the history

  2. generalizing this functionality

    @antgonza
    antgonza committed Jan 28, 2017
    Configuration menu
    Copy the full SHA
    6f0dd71 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2017

  1. fix qiita-spots#1816

    @antgonza
    antgonza committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    ed9fc65 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. fix qiita-spots#1959

    @antgonza
    antgonza committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    4b19b45 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2017

  1. addressing @josenavas comments

    @antgonza
    antgonza committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    d9b41e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. addressing @josenavas comments

    @antgonza
    antgonza committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    5ef06ae View commit details
    Browse the repository at this point in the history

  2. fixing error

    @antgonza
    antgonza committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    5e3504a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/biocore/qiita into fix-1010

    @antgonza
    antgonza committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    d10096a View commit details
    Browse the repository at this point in the history

  4. fixed?

    @antgonza
    antgonza committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    661342f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

  1. addressing @josenavas comments

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    fcd249b View commit details
    Browse the repository at this point in the history

  2. Merge pull request qiita-spots#2063 from antgonza/fix-1816 

    fix qiita-spots#1816
    @josenavas
    josenavas committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    f3c1216 View commit details
    Browse the repository at this point in the history

  3. Merge pull request qiita-spots#2064 from antgonza/fix-1959 

    fix qiita-spots#1959
    @tanaes
    tanaes committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    a91a6fd View commit details
    Browse the repository at this point in the history

  4. addressing @wasade comments

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    7b9fa6f View commit details
    Browse the repository at this point in the history

  5. Merge pull request qiita-spots#2059 from antgonza/fix-1010 

    fix qiita-spots#1010
    @josenavas
    josenavas committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    33bcbe5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/biocore/qiita into fix-1837

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    5e4bd9b View commit details
    Browse the repository at this point in the history

  7. fix flake8

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    8bf3d6e View commit details
    Browse the repository at this point in the history

  8. Merge pull request qiita-spots#2061 from antgonza/fix-1837 

    fix qiita-spots#1837
    @josenavas
    josenavas committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    7807bac View commit details
    Browse the repository at this point in the history

  9. generate biom and metadata release (qiita-spots#2066) 

    * initial commit

* adding portal

* addressing @josenavas comments

* pid -> qiita_artifact_id

* addressing @josenavas comments

* addressing @ElDeveloper comments

* rm 50.sql
    @antgonza @ElDeveloper
    antgonza authored and ElDeveloper committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    6360675 View commit details
    Browse the repository at this point in the history

  10. database changes to fix 969

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    811b7a7 View commit details
    Browse the repository at this point in the history

  11. adding delete

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    751d4ad View commit details
    Browse the repository at this point in the history

  12. addressing @josenavas comments

    @antgonza
    antgonza committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    65a86df View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2017

  1. addressing @ElDeveloper comments

    @antgonza
    antgonza committed Feb 4, 2017
    Configuration menu
    Copy the full SHA
    b1817dd View commit details
    Browse the repository at this point in the history

  2. duh!

    @antgonza
    antgonza committed Feb 4, 2017
    Configuration menu
    Copy the full SHA
    18d77e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Merge pull request qiita-spots#2071 from antgonza/fix-969-db 

    database changes to fix 969
    @josenavas
    josenavas committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    01c656c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. fix generate_biom_and_metadata_release (qiita-spots#2072) 

    * fix generate_biom_and_metadata_release

* addressing @ElDeveloper comment
    @antgonza @ElDeveloper
    antgonza authored and ElDeveloper committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    53188a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Fixing merge conflicts with master

    @josenavas
    josenavas committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    1ab4e3b View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. Merge branch 'analysis-refactor' of https://github.com/biocore/qiita … 

    …into analysis-refactor
    @josenavas
    josenavas committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    1e8332e View commit details
    Browse the repository at this point in the history

  2. Removing qiita ware code that will not be used anymore

    @josenavas
    josenavas committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    cb67d3d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'analysis-refactor' of https://github.com/biocore/qiita … 

    …into analysis-refactor-gui-part1
    @josenavas
    josenavas committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    5a5127d View commit details
    Browse the repository at this point in the history

  4. Organizing the handlers and new analysis description page

    @josenavas
    josenavas committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    0033480 View commit details
    Browse the repository at this point in the history

  5. Connecting the analysis creation and making interface responsive

    @josenavas
    josenavas committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    3809ad5 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Addressing @antgonza's comments

    @josenavas
    josenavas committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    067f14f View commit details
    Browse the repository at this point in the history

  2. Solving merge conflicts

    @josenavas
    josenavas committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    cf4862d View commit details
    Browse the repository at this point in the history

  3. Removing unused code

    @josenavas
    josenavas committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    a6595a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. Fixing merge conflicts

    @josenavas
    josenavas committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    378d7ff View commit details
    Browse the repository at this point in the history