-
Notifications
You must be signed in to change notification settings - Fork 80
Analysis refactor master #2070
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
antgonza
merged 104 commits into
qiita-spots:analysis-refactor
from
josenavas:analysis-refactor-master
Feb 6, 2017
Merged
Analysis refactor master #2070
Changes from all commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
3601c29
fix #1505
antgonza 0d6788e
improving some GUI stuff
antgonza 12406cc
improving some GUI stuff - missing lines
antgonza 958fcbe
pull upstream master
antgonza a57ef23
addressing all comments
antgonza 2ead7a6
ready for review
antgonza 931e566
New DB structure
josenavas a2b883e
Adding python patch
josenavas e737f64
Adding a biom so we can actually execute the patch
josenavas 6bc0303
Fixing the patch to correctly transfer the information from the old s…
josenavas 331012d
Fixing patch
josenavas eabe25d
Fixing patch and a few other bits to make the patch run successfully
josenavas 0c40bc0
These files are no longer needed
josenavas 602acc3
Removing unused code
josenavas ad4deea
Droping analysis status table
josenavas aa3e96f
Linking the analysis with all the artifacts
josenavas d222e08
Fixing typo
josenavas 14be3b0
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas 39f6beb
Fixing HTML and dbschema files
josenavas 8c2be56
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas 4dd357c
Adding analyisis jobs
josenavas 209e838
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas b24833d
Extending the artifact to work with the analysis
josenavas 8b7f222
Allowing multiomics datatype
josenavas b381993
Adding private_job_submitter and modifying proc job handler to use it
josenavas ab65fa2
Adding logging column to the analysis
josenavas 40656f2
Merge branch 'analysis-refactor-db' into analysis-refactor-fix-analysis
josenavas c4c8420
Adding datatype to the analysis-processing job table
josenavas 0cd9f27
Adding REST endpoint to access the analysis metadata
josenavas 8207513
Adding private jobs to plugin
josenavas f307cd4
Fixing typo
josenavas 78c8095
Fixing analysis
josenavas b3936c8
Fixing the processing jobs complete
josenavas 19c3f7d
Removing the old job code
josenavas 055b53e
Oops removed the wrong file
josenavas 46c322d
Removing QiitaStatusObject because it is not used
josenavas 4d2e14d
fixing metautil
josenavas befb4e2
Fixing porntal, setup and sql tests
josenavas 09f2722
Fixing user and util
josenavas d1cdc8e
Fixing qiita_db
josenavas 73a78e7
fix #1987
antgonza e64a22a
Merge pull request #2036 from antgonza/fix-1505
josenavas 099b575
Merge branch 'master' of https://github.com/biocore/qiita into analys…
josenavas 681e1cf
Updating to master
josenavas 43eb1ed
Addressing @antgonza's comments
josenavas 0dcae8b
Merge pull request #2047 from antgonza/fix-1987
josenavas 4a5bbbc
initial commit
antgonza f99975c
requested changes
antgonza ed899a8
Merge pull request #2049 from antgonza/add-processing-suggestions
josenavas d508320
fix filter job list
antgonza 025cc1e
Merge pull request #2050 from antgonza/fix-filter-job-list
josenavas 599bcde
Fixing server cert (#2051)
josenavas d12ccfe
fix get_studies
antgonza b33983b
flake8
antgonza b4f1b1f
fix #503
antgonza 62a1b93
fix #2010
antgonza 2e36141
fix #1913
antgonza e006e20
fix errors
antgonza c174693
Merge pull request #2052 from antgonza/fix-get_studies
josenavas 131dd6a
Merge pull request #2053 from antgonza/fix-by-blinking
josenavas ccb55bd
addressing @josenavas comment
antgonza dfe2e83
flake8
antgonza 15fcceb
Merge pull request #2056 from antgonza/fix-1913
josenavas 7f97f2a
fix #1010
antgonza 9eb9dbb
fix #1066 (#2058)
antgonza 23104d7
addressing @josenavas comments
antgonza 1f1e826
fix #1961
antgonza 19a9dda
fix #1837
antgonza 19889f9
Automatic jobs & new stats (#2057)
antgonza 4e380e0
Merge pull request #2060 from antgonza/fix-1961
wasade 6f0dd71
generalizing this functionality
antgonza ed9fc65
fix #1816
antgonza d016833
Taking into account non-phylogenetic metrics in beta diversity
josenavas 4b19b45
fix #1959
antgonza 8d1f0c2
Merge branch 'analysis-refactor-fix-analysis' of github.com:josenavas…
josenavas 894379c
Fixing merge conflicts
josenavas a80c0ac
Addressing @antgonza's comments
josenavas 5d63afa
Merge branch 'analysis-refactor-fix-analysis' into analysis-refactor-…
josenavas c571bee
Merge branch 'analysis-refactor-remove-old' into analysis-refactor-qi…
josenavas d9b41e8
addressing @josenavas comments
antgonza 005fc44
Merge branch 'analysis-refactor-qiita-db' into analysis-refactor-master
josenavas a4fceb7
Fixing merge conflicts
josenavas 5ef06ae
addressing @josenavas comments
antgonza 5e3504a
fixing error
antgonza d10096a
Merge branch 'master' of https://github.com/biocore/qiita into fix-1010
antgonza 661342f
fixed?
antgonza fc649ab
Fixing merge conflicts
josenavas fcd249b
addressing @josenavas comments
antgonza e053c94
Actually fixing merge conflicts
josenavas f3c1216
Merge pull request #2063 from antgonza/fix-1816
josenavas a91a6fd
Merge pull request #2064 from antgonza/fix-1959
tanaes 7b9fa6f
addressing @wasade comments
antgonza 33bcbe5
Merge pull request #2059 from antgonza/fix-1010
josenavas 5e4bd9b
Merge branch 'master' of https://github.com/biocore/qiita into fix-1837
antgonza 8bf3d6e
fix flake8
antgonza 7807bac
Merge pull request #2061 from antgonza/fix-1837
josenavas 6360675
generate biom and metadata release (#2066)
antgonza 811b7a7
database changes to fix 969
antgonza 751d4ad
adding delete
antgonza 65a86df
addressing @josenavas comments
antgonza b1817dd
addressing @ElDeveloper comments
antgonza 18d77e1
duh!
antgonza 01c656c
Merge pull request #2071 from antgonza/fix-969-db
josenavas 4b78294
Solving merge conflicts
josenavas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
-----BEGIN CERTIFICATE----- | ||
MIICQzCCAawCCQDD7K/frIbu8DANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJV | ||
MIICRTCCAa4CCQDPGmrQ4bra7TANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJV | ||
UzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVNhbiBEaWVnbzENMAsGA1UEChMEVUNT | ||
RDETMBEGA1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTE2 | ||
MTIxOTE2MDA1NFoXDTE3MDExODE2MDA1NFowZjELMAkGA1UEBhMCVVMxCzAJBgNV | ||
BAgTAkNBMRIwEAYDVQQHEwlTYW4gRGllZ28xDTALBgNVBAoTBFVDU0QxEzARBgNV | ||
BAsTCktuaWdodCBMYWIxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0B | ||
AQEFAAOBjQAwgYkCgYEAq6ChN/5vk1fn45Ys5inttHe8IntBQtU31oKy+2IR+znT | ||
GBvG/iht0veG5sbjlkm+Hn4auk5lR9EOmnTy+fl44LJ81rZuYmy3mjLSAHwmx7ee | ||
ZTJ2lNjH/Blq5vC4VmPQ3Ka7zMusOTZSBDw6k8r6bxbMgarXc+rQtDvQfv2QITsC | ||
AwEAATANBgkqhkiG9w0BAQUFAAOBgQBBir71K7HdTbU7129ZYLDyeXJfAjzCsSxj | ||
evSqa6PJuh5PODdPyO01Hyxb5J/aHzmE5FRZKMLdgOTlqCpQjyMMvVc6UJzX5bZo | ||
x6Y5gvoTNeCfaD0N6eZxxd7BqFGq+gmqk5U1cyKf+QjIhu/Q4p/Ga+Cx9b3t/Sk+ | ||
/iUPu/otBw== | ||
RDETMBEGA1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MCAXDTE3 | ||
MDExOTA4MTQ1NloYDzIxMTYxMjI2MDgxNDU2WjBmMQswCQYDVQQGEwJVUzELMAkG | ||
A1UECBMCQ0ExEjAQBgNVBAcTCVNhbiBEaWVnbzENMAsGA1UEChMEVUNTRDETMBEG | ||
A1UECxMKS25pZ2h0IExhYjESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3 | ||
DQEBAQUAA4GNADCBiQKBgQCroKE3/m+TV+fjlizmKe20d7wie0FC1TfWgrL7YhH7 | ||
OdMYG8b+KG3S94bmxuOWSb4efhq6TmVH0Q6adPL5+XjgsnzWtm5ibLeaMtIAfCbH | ||
t55lMnaU2Mf8GWrm8LhWY9DcprvMy6w5NlIEPDqTyvpvFsyBqtdz6tC0O9B+/ZAh | ||
OwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAGLau2DhrdnR5P2C2rGZuSaHLYCsVPJO | ||
nj3Q+v5md1UzTDitlzHwM3pX1QBLxfiTJ6e7/0QLkrDceYKOfU/eucLGM1KG1YjS | ||
nB39W2BNLKXu4QXWJUx4WC1Qxib9wbxxm4NyMb0ir2/PZTs+gKMtguBUyVHqETvs | ||
n1b0mapYTJ/Q | ||
-----END CERTIFICATE----- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@antgonza can you review this section? This was added in master and I had a bit of trouble solving the conflicts in here but I think I end up placing this code in the correct location.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍