mirror of
https://github.com/chenasraf/snpr.git
synced 2026-05-18 01:39:01 +00:00
removed conflicts accidentally merged before
This commit is contained in:
Bastian Greshake
@@ -126,7 +126,7 @@
|
||||
</div>
|
||||
<div id="collapseTen" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
You can easily add this phenotype as long as you are logged in. Just visit <%=link_to("the page for phenotype creation", {:controller => "phenotypes",:action => "new"})%>, and enter a name and a description that enables other users to understand what you are interested in.
|
||||
You can easily add this phenotype as long as you are logged in. Just visit <%=link_to("the page for phenotype creation", {:controller => "phenotypes",:action => "new"})%>, and enter a name and a description that enables other users to understand what you are interested in.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -180,11 +180,7 @@
|
||||
</div>
|
||||
<div id="collapseSciThree" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
You can easily add this phenotype as long as you are logged in. Just visit <%=link_to("the page for phenotype creation", {:controller => "phenotypes",:action => "new"})%> and enter a name and a description that enables other users to understand what you are interested in.
|
||||
=======
|
||||
You can easily add this phenotype as long as you are logged in. Just visit <%=link_to("the page for phenotype creation", {:controller => "phenotypes",:action => "new"})%>, and enter a name and a description that enables other users to understand what you are interested in.
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -232,11 +228,7 @@
|
||||
</div>
|
||||
<div id="collapseSciSeven" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
If you have used openSNP (code or data) in your work we would be really happy if you could <a href="journals.plos.org/plosone/article?id=10.1371/journal.pone.0089204">cite our paper, which was published in PLOS ONE in 2014</a>.
|
||||
=======
|
||||
If you have used openSNP (code or data) in your work, we would be really happy if you could <a href="journals.plos.org/plosone/article?id=10.1371/journal.pone.0089204">cite our paper, which was published in PLOS ONE in 2014</a>.
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -254,11 +246,7 @@
|
||||
</div>
|
||||
<div id="collapsePhenoOne" class="accordion-body collapse in">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
<strong>1.</strong>You should read the description on the phenotype you are about to enter. Often the description gives further details on which kind of answers people are interested in. You can also take a look on the answers which are given so far by other users. This should also give you a feeling about what kind of information is wanted for this phenotype. <br/><strong>2.</strong> As soon as you start to enter your own variation we will try to auto-complete your writing to avoid duplicate entries into the openSNP-database. Having multiple entries for the same thing, like "blue-green" plus "green-blue" in case of eye-colour makes it harder for (citizen) scientists to use the data for their studies. <br/><strong>3.</strong> The thing you are about to enter doesn't get auto-completed? Great. You are about to enter a variation which has not been reported so far, have fun entering your data!
|
||||
=======
|
||||
<strong>1.</strong>You should read the description on the phenotype you are about to enter. Often the description gives further details on which kind of answers people are interested in. You can also take a look at the answers which are given so far by other users. This should also give you a feeling about what kind of information is wanted for this phenotype. <br/><strong>2.</strong> As soon as you start to enter your own variation, we will try to auto-complete your writing to avoid duplicate entries into the openSNP database. Having multiple entries for the same thing, like "blue-green" plus "green-blue" in case of eye-colour makes it harder for (citizen) scientists to use the data for their studies. <br/><strong>3.</strong> The thing you are about to enter doesn't get auto-completed? Great. You are about to enter a variation which has not been reported so far, have fun entering your data!
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -270,11 +258,7 @@
|
||||
</div>
|
||||
<div id="collapsePhenoTwo" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
<strong>1.</strong> Use a reasonable name for your characteristic. Don't make it too long, but at the same time make sure that people get the general idea of what you want to know. <br/><strong>2.</strong> You should also make sure that the same phenotype is not already available in the openSNP-database. As soon as you start writing your characteristics name openSNP will try to auto-complete what you are writing. This should reduce duplicate phenotypes, so if you are about to enter "eye-colour" you will get a suggestions for the already available "eye-color" (Sorry, we can't solve the AE / BE issue here).<br/><strong>3.</strong> Write a description about the characteristic you are interested in. Give users some words why this is interesting. Maybe add what research has been done so far on this phenotype. Links to further web-resources and/or Wikipedia might also be a good idea. If you already have suggestions which different answers might apply to this phenotype: List them in the description. <br/><strong>4.</strong> Enter your own variation: The last field, "variation" is meant to carry your own variation for this phenotype. Don't enter all possible answers (You can list those in the description). Other users can easily add their own variation and take your suggestions from the description or - if you forgot to list a possible answer - give completely new answers.
|
||||
=======
|
||||
<strong>1.</strong> Use a reasonable name for your characteristic. Don't make it too long, but at the same time make sure that people get the general idea of what you want to know. <br/><strong>2.</strong> You should also make sure that the same phenotype is not already available in the openSNP database. As soon as you start writing your characteristics name, openSNP will try to autocomplete what you are writing. This should reduce duplicate phenotypes, so if you're about to enter "eye-colour" you will get suggestions for the already available "eye-color" (Sorry, we can't solve the AE / BE issue here).<br/><strong>3.</strong> Write a description about the characteristic you are interested in. Explain to users why this is interesting. Maybe add a note about what research has been done so far on this phenotype. Links to further web-resources and/or Wikipedia might also be a good idea. If you already have suggestions which different answers might apply to this phenotype, list them in the description. <br/><strong>4.</strong> Enter your own variation: the last field, "variation" is meant to carry your own variation for this phenotype. Don't enter all possible answers (You can list those in the description). Other users can easily add their own variation and take your suggestions from the description or, if you forgot to list a possible answer, give completely new answers.
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -313,11 +297,7 @@
|
||||
</div>
|
||||
<div id="collapseFitThree" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
Yes, you can choose which for which categories we should save the data. For example you can share our activity-data, so people can see the number of steps you have taken for each day, along with the floors you have climbed, but keep your body and sleep data on <em>FitBit</em>.Two things you should keep in mind: You can (de)activate the saving of data for different categories at any time. <br/><br/>1. If you deactivate a category we will delete all of your data of this category from <em>openSNP</em> (but of course not on <em>Fitbit</em>).<br/>2. If activate a category we will try to save as many data from the past as possible. So if there is past data you don't want to share you probably should not activate it (or delete the data from <em>Fitbit</em>).
|
||||
=======
|
||||
Yes, you can choose which categories we should save. For example, you can share our activity data so people can see the number of steps you have taken for each day, along with the floors you have climbed but keep your body and sleep data on <em>FitBit</em>. Two things you should keep in mind: you can (de)activate the saving of data for different categories at any time. <br/><br/>1. If you deactivate a category we will delete all of your data of this category from <em>openSNP</em> (but of course not on <em>Fitbit</em>).<br/>2. If activate a category we will try to save as many data from the past as possible. So if there is past data you don't want to share, you probably should not activate it (or delete the data from <em>Fitbit</em>).
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -329,11 +309,7 @@
|
||||
</div>
|
||||
<div id="collapseFitFour" class="accordion-body collapse">
|
||||
<div class="accordion-inner">
|
||||
<<<<<<< HEAD
|
||||
No, if you connect your <em>Fitbit</em> account with <em>openSNP</em> we only have read-access. The read-access gives us access to all data you have in your <em>Fitbit</em> account, but we will only read and save the data for which you have given us permission. We're sorry that you have to trust us in this point but the <em>Fitbit</em> API currently doesn't allow for a more granular setting.
|
||||
=======
|
||||
No, if you connect your <em>Fitbit</em> account with <em>openSNP</em> we only have read-access. The read-access gives us access to all data you have in your <em>Fitbit</em> account, but we will only read and save the data for which you have given us permission. We're sorry that you have to trust us in this regard, but the <em>Fitbit</em> API currently doesn't allow for a more granular setting.
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -516,17 +492,10 @@ The general URL-schema for DAS-feature-requests is http://opensnp.org/das/$USER_
|
||||
|
||||
<div id="api">
|
||||
<legend>Using JSON</legend>
|
||||
<<<<<<< HEAD
|
||||
We provide some methods to make it easier to get data back from <em>openSNP</em>. Currently we are implementing some <i><a href="http://en.wikipedia.org/wiki/JSON">JavaScript Object Notation</a></i> (short: JSON) methods that will make it easier to code some awesome <em>openSNP</em>-utilizing stuff. As you can see on the Wikipedia-page there are many JSON-parsers around for all major programming languages and it is fairly human readable as well. Plus: It is one of the de facto webstandards for APIs. The full overview of the openSNP JSON API is on <a href="https://github.com/gedankenstuecke/snpr/wiki/JSON-API">GitHub at this link</a>.
|
||||
|
||||
<legend>The method I need is missing and/or I need more help!?</legend>
|
||||
There are many ways in which this problem can be fixed. First of all: If you are able to code some <em>Rails</em> and have got some basic understanding of <em>JSON</em> feel invited to help us with the development of <em>openSNP</em>. The source code is freely available at <a href="https://github.com/gedankenstuecke/snpr">GitHub</a> and we are always looking for some motivated people who want to join us. Just start coding the stuff you are interested in and make a pull request. Or what about <a href="http://groups.google.com/group/snpr-development">joining the openSNP development mailinglist/Google group and you can get to know us a bit better?</a> <br/>But don't worry if you don't feel like spending that much time with us (letting alone having that much time left): We are working on implementing more of this stuff, so if you've got a great idea that we should absolutely include just let us know: Write us at <a href="mailto:info@opensnp.org">info@opensnp.org</a> or drop <a href="http://opensnp.org/messages/new?user_to_send=23">Philipp</a> or <a href="http://opensnp.org/messages/new?user_to_send=1">Basti</a> a note. And the same is true if you need some more support with those methods already in place.
|
||||
=======
|
||||
We provide some methods to make it easier to get data back from <em>openSNP</em>. Currently we are implementing some <i><a href="http://en.wikipedia.org/wiki/JSON">JavaScript Object Notation</a></i> (short: JSON) methods that will make it easier to code some awesome <em>openSNP</em>-utilizing stuff. As you can see on the Wikipedia-page, there are many JSON-parsers around for all major programming languages, and it is fairly human readable as well. Plus: it's one of the de-facto webstandards for APIs. The full overview of the openSNP JSON API is <a href="https://github.com/gedankenstuecke/snpr/wiki/JSON-API">on GitHub</a>.
|
||||
|
||||
<legend>The method I need is missing and/or I need more help!?</legend>
|
||||
There are many ways in which this problem can be fixed. First of all, if you are able to code some <em>Rails</em> and have got some basic understanding of <em>JSON</em> feel invited to help us with the development of <em>openSNP</em>. The source code is freely available at <a href="https://github.com/gedankenstuecke/snpr">GitHub</a>, and we are always looking for some motivated people who want to join us. Just start coding the stuff you are interested in and make a pull request. Or what about <a href="http://groups.google.com/group/snpr-development">joining the openSNP development mailinglist/Google group and you can get to know us a bit better?</a> <br/>But don't worry; if you don't feel like spending that much time with us (let alone having that much time left), we're working on implementing more features. So if you've got a great idea that we should absolutely include, just let us know: write us at <a href="mailto:info@opensnp.org">info@opensnp.org</a> or drop <a href="http://opensnp.org/messages/new?user_to_send=23">Philipp</a> or <a href="http://opensnp.org/messages/new?user_to_send=1">Basti</a> a note. And the same is true if you need some more support with those methods already in place.
|
||||
>>>>>>> master
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user