Skip to content

Analysis refactor sync w master 2 #2141

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.

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

Merged
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
3601c29
fix #1505
antgonza Jan 2, 2017
0d6788e
improving some GUI stuff
antgonza Jan 3, 2017
12406cc
improving some GUI stuff - missing lines
antgonza Jan 3, 2017
958fcbe
pull upstream master
antgonza Jan 4, 2017
a57ef23
addressing all comments
antgonza Jan 5, 2017
2ead7a6
ready for review
antgonza Jan 5, 2017
73a78e7
fix #1987
antgonza Jan 16, 2017
e64a22a
Merge pull request #2036 from antgonza/fix-1505
josenavas Jan 16, 2017
0dcae8b
Merge pull request #2047 from antgonza/fix-1987
josenavas Jan 17, 2017
4a5bbbc
initial commit
antgonza Jan 18, 2017
f99975c
requested changes
antgonza Jan 18, 2017
ed899a8
Merge pull request #2049 from antgonza/add-processing-suggestions
josenavas Jan 18, 2017
d508320
fix filter job list
antgonza Jan 18, 2017
025cc1e
Merge pull request #2050 from antgonza/fix-filter-job-list
josenavas Jan 18, 2017
599bcde
Fixing server cert (#2051)
josenavas Jan 19, 2017
d12ccfe
fix get_studies
antgonza Jan 20, 2017
b33983b
flake8
antgonza Jan 20, 2017
b4f1b1f
fix #503
antgonza Jan 20, 2017
62a1b93
fix #2010
antgonza Jan 20, 2017
2e36141
fix #1913
antgonza Jan 21, 2017
e006e20
fix errors
antgonza Jan 21, 2017
c174693
Merge pull request #2052 from antgonza/fix-get_studies
josenavas Jan 23, 2017
131dd6a
Merge pull request #2053 from antgonza/fix-by-blinking
josenavas Jan 23, 2017
ccb55bd
addressing @josenavas comment
antgonza Jan 24, 2017
dfe2e83
flake8
antgonza Jan 24, 2017
15fcceb
Merge pull request #2056 from antgonza/fix-1913
josenavas Jan 24, 2017
7f97f2a
fix #1010
antgonza Jan 26, 2017
9eb9dbb
fix #1066 (#2058)
antgonza Jan 26, 2017
23104d7
addressing @josenavas comments
antgonza Jan 27, 2017
1f1e826
fix #1961
antgonza Jan 27, 2017
19a9dda
fix #1837
antgonza Jan 27, 2017
19889f9
Automatic jobs & new stats (#2057)
antgonza Jan 27, 2017
4e380e0
Merge pull request #2060 from antgonza/fix-1961
wasade Jan 28, 2017
6f0dd71
generalizing this functionality
antgonza Jan 28, 2017
a7925b8
Merge branch 'master' of https://github.com/biocore/qiita into fix-1805
antgonza Jan 28, 2017
9d3fa5c
fix #1805
antgonza Jan 29, 2017
a70163b
adding button
antgonza Jan 29, 2017
1626859
fix errors
antgonza Jan 29, 2017
ed9fc65
fix #1816
antgonza Jan 29, 2017
ade8cbe
fixing failures tests
antgonza Jan 30, 2017
4b19b45
fix #1959
antgonza Jan 30, 2017
d9b41e8
addressing @josenavas comments
antgonza Feb 1, 2017
5ef06ae
addressing @josenavas comments
antgonza Feb 2, 2017
5e3504a
fixing error
antgonza Feb 2, 2017
d10096a
Merge branch 'master' of https://github.com/biocore/qiita into fix-1010
antgonza Feb 2, 2017
661342f
fixed?
antgonza Feb 2, 2017
fcd249b
addressing @josenavas comments
antgonza Feb 3, 2017
f3c1216
Merge pull request #2063 from antgonza/fix-1816
josenavas Feb 3, 2017
a91a6fd
Merge pull request #2064 from antgonza/fix-1959
tanaes Feb 3, 2017
7b9fa6f
addressing @wasade comments
antgonza Feb 3, 2017
33bcbe5
Merge pull request #2059 from antgonza/fix-1010
josenavas Feb 3, 2017
5e4bd9b
Merge branch 'master' of https://github.com/biocore/qiita into fix-1837
antgonza Feb 3, 2017
8bf3d6e
fix flake8
antgonza Feb 3, 2017
7807bac
Merge pull request #2061 from antgonza/fix-1837
josenavas Feb 3, 2017
6360675
generate biom and metadata release (#2066)
antgonza Feb 3, 2017
811b7a7
database changes to fix 969
antgonza Feb 3, 2017
751d4ad
adding delete
antgonza Feb 3, 2017
65a86df
addressing @josenavas comments
antgonza Feb 3, 2017
b1817dd
addressing @ElDeveloper comments
antgonza Feb 4, 2017
18d77e1
duh!
antgonza Feb 4, 2017
01c656c
Merge pull request #2071 from antgonza/fix-969-db
josenavas Feb 6, 2017
53188a6
fix generate_biom_and_metadata_release (#2072)
antgonza Feb 7, 2017
1ab4e3b
Fixing merge conflicts with master
josenavas Feb 8, 2017
1e8332e
Merge branch 'analysis-refactor' of https://github.com/biocore/qiita …
josenavas Feb 9, 2017
3e3f6e1
fixing timestamp
antgonza Feb 9, 2017
6a20c1b
rm formats
antgonza Feb 9, 2017
a1b3c90
st -> pt
antgonza Feb 9, 2017
a3505c2
moving to ISO 8601 - wow :'(
antgonza Feb 13, 2017
c8113ea
fix errors
antgonza Feb 13, 2017
f4835d5
addressing @wasade comments
antgonza Feb 13, 2017
7d70a38
fixing private/public studies
antgonza Feb 15, 2017
4bf4808
Merge pull request #2080 from antgonza/fix-private_public-stats-page
josenavas Feb 15, 2017
aa68a21
Merge pull request #2075 from antgonza/fix-timestamp
wasade Feb 15, 2017
0c6ffa7
sanbox-to-sandbox
antgonza Feb 15, 2017
586660b
flake8
antgonza Feb 15, 2017
7bae13e
fixing other issues
antgonza Feb 16, 2017
cf801a4
Merge pull request #2082 from antgonza/sanbox-to-sandbox
josenavas Feb 16, 2017
7c2454e
adding share documentation
antgonza Mar 3, 2017
c2eb6ae
psycopg2 <= 2.7
antgonza Mar 3, 2017
aeeac62
psycopg2 < 2.7
antgonza Mar 3, 2017
2795046
Merge pull request #2085 from antgonza/sharing-help
josenavas Mar 3, 2017
56b7da5
init commit
antgonza Mar 21, 2017
ba2745b
fixing conflicts
antgonza Mar 21, 2017
8e3ec27
fixing errors
antgonza Mar 21, 2017
890d465
fixing errors due to update
antgonza Mar 21, 2017
55fe223
Making the download work
josenavas Mar 21, 2017
d96da86
Fixing tests
josenavas Mar 22, 2017
0c136c6
working status
antgonza Mar 22, 2017
a9bc599
adding tags, the right way!
antgonza Mar 22, 2017
0af93ff
fix error
antgonza Mar 22, 2017
1859c88
Addressing @antgonza's comments
josenavas Mar 22, 2017
e90ad50
Adding missing test
josenavas Mar 22, 2017
587e5bf
Ignoring tgz - thanks @antgonza
josenavas Mar 24, 2017
56d8b0a
addressing @josenavas comments
antgonza Mar 25, 2017
2fd68bf
list study tags
antgonza Mar 26, 2017
c457554
fix error
antgonza Mar 26, 2017
bba8f03
adding tags to public
antgonza Mar 27, 2017
8ef50c1
adding docs
antgonza Mar 27, 2017
e6a65a3
addressing @wasade comment
antgonza Mar 27, 2017
208bac3
Merge pull request #2093 from antgonza/fix-1805
wasade Mar 27, 2017
fd0b879
addressing @josenavas and @wasade comments
antgonza Mar 27, 2017
d6f5223
addressing @wasade request
antgonza Mar 27, 2017
2369a5e
erge branch 'master' of https://github.com/biocore/qiita into listing…
antgonza Mar 27, 2017
d3555ac
Merge pull request #2088 from antgonza/adding-tags
wasade Mar 27, 2017
fdb6723
Merge branch 'master' of https://github.com/biocore/qiita into listin…
antgonza Mar 27, 2017
31dae8d
fix #2091
antgonza Mar 29, 2017
e306f32
option 2: @ElDeveloper and @josenavas
antgonza Mar 29, 2017
64e7225
Merge pull request #2095 from antgonza/fix-2091
josenavas Mar 29, 2017
d803f42
Merge pull request #2092 from antgonza/listing-tags
wasade Mar 29, 2017
8f6d193
A minimal REST API for Qiita (#2094)
ElDeveloper Mar 30, 2017
e07a880
ENH/DOC: update/add samples to sample information via rest (#2097)
wasade Apr 2, 2017
c309aa6
Changing how artifact visibility works (#2098)
antgonza Apr 4, 2017
1acc9b2
fixing edit check access
antgonza Apr 5, 2017
a8946bf
Merge pull request #2100 from antgonza/fix-edit_check_access
tanaes Apr 5, 2017
28e18fe
fix
antgonza Apr 5, 2017
a60cec2
Merge pull request #2101 from antgonza/patch-53_fix
josenavas Apr 5, 2017
dc254ba
fix #2086
antgonza Apr 6, 2017
b6eb3bd
flak8
antgonza Apr 6, 2017
6ad9a35
addressing @ElDeveloper comments + fixes
antgonza Apr 6, 2017
17341a0
adding the final changes
antgonza Apr 10, 2017
cc7f0d0
fix failures
antgonza Apr 10, 2017
2b8d608
get_qiita_version -> generate_biom_and_metadata_release
antgonza Apr 10, 2017
4765055
download raw data
antgonza Apr 10, 2017
0f0be35
adding missing empty files
antgonza Apr 10, 2017
dc0b029
Adding endpoint to retrieve list of person (#2103)
josenavas Apr 10, 2017
56a20b4
fix #2086 (#2102)
antgonza Apr 10, 2017
c31ea7d
fixing conflicts
antgonza Apr 10, 2017
324a385
addressing @wasade comments and fix errors
antgonza Apr 11, 2017
f7b61e7
fix error?
antgonza Apr 11, 2017
5c598c7
rm vfabu + addressing @wasade and @josenavas comments + fix errors
antgonza Apr 11, 2017
7d1ea83
just being dumb!
antgonza Apr 11, 2017
bef4640
Merge pull request #2104 from antgonza/download-raw-data
wasade Apr 11, 2017
5489845
Deblur quality mention (#2107)
wasade Apr 18, 2017
6c91bd8
Revised rst values used for section headers (#2108)
wasade Apr 18, 2017
b5c7fd5
Fixing latlongs (#2120)
josenavas Apr 28, 2017
4ecff71
public studies are being shown in the user own studies
antgonza Apr 29, 2017
cde1294
fix #2069 - adding tests
antgonza Apr 29, 2017
219f479
flake8
antgonza Apr 29, 2017
50bfc4a
Merge pull request #2122 from antgonza/user-kept-public-study
josenavas Apr 29, 2017
0dd5496
Improving study list speed (#2123)
antgonza May 4, 2017
2282e74
fixing download buttons show (#2127)
antgonza May 4, 2017
d3b72ce
connecting tutorials to CMI
antgonza May 6, 2017
504b83e
adding link in main page
antgonza May 6, 2017
e9f86d2
fixing prep getting-started
antgonza May 6, 2017
7d7a399
mv complex designs
antgonza May 7, 2017
30141ad
fix idents
antgonza May 7, 2017
659cb94
Merge pull request #2130 from antgonza/connecting-with-cmi-workshops
May 9, 2017
1f47f06
limiting number of jobs retrieved
antgonza May 19, 2017
9bb1fd5
Merge pull request #2134 from antgonza/limit-jobs
wasade May 22, 2017
490b89d
Merge branch 'analysis-refactor' of https://github.com/biocore/qiita …
josenavas Jun 1, 2017
0a6868a
Trying again
josenavas Jun 1, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions qiita_pet/webserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
CreateStudyAJAX, ShareStudyAJAX, StudyApprovalList, ArtifactGraphAJAX,
VAMPSHandler, PrepTemplateGraphAJAX, StudyTags, StudyGetTags,
ListCommandsHandler, ListOptionsHandler, PrepTemplateSummaryAJAX,
PrepTemplateAJAX, NewArtifactHandler, SampleAJAX,
StudyDeleteAjax, ArtifactAdminAJAX,
NewPrepTemplateAjax, DataTypesMenuAJAX, StudyFilesAJAX, ArtifactGetSamples,
WorkflowHandler, WorkflowRunHandler, JobAJAX, AutocompleteHandler)
PrepTemplateAJAX, NewArtifactHandler, SampleAJAX, StudyDeleteAjax,
ArtifactAdminAJAX, NewPrepTemplateAjax, DataTypesMenuAJAX, StudyFilesAJAX,
ArtifactGetSamples, WorkflowHandler, WorkflowRunHandler, JobAJAX,
AutocompleteHandler)
from qiita_pet.handlers.artifact_handlers import (
ArtifactSummaryAJAX, ArtifactAJAX, ArtifactSummaryHandler,
ProcessArtifactHandler)
Expand Down