Skip to content

Commit

Permalink
Merge branch 'release-4.2.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@noedelta
noedelta committed Apr 17, 2020
2 parents 239ef64 + 271bc4d commit b4b859f
Show file tree
Hide file tree
Showing 7 changed files with 269 additions and 46 deletions.
16 changes: 8 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
<groupId>uk.ac.ebi.intact.service.sandbox</groupId>
<artifactId>intact-view</artifactId>
<packaging>war</packaging>
<version>4.2.12</version>
<version>4.2.13</version>

<name>IntAct Services :: View</name>


<scm>
<connection>scm:git:https://github.com/EBI-IntAct/intact-view.git</connection>
<developerConnection>scm:git:https://github.com/EBI-IntAct/intact-view.git</developerConnection>
<url>https://github.com/EBI-IntAct/intact-view</url>
<connection>scm:git:https://github.com/EBI-IntAct/former-intact-view.git</connection>
<developerConnection>scm:git:https://github.com/EBI-IntAct/former-intact-view.git</developerConnection>
<url>https://github.com/EBI-IntAct/former-intact-view</url>
<tag>HEAD</tag>
</scm>

<properties>
<core.version>2.6.5</core.version>
<dataexchange.version>2.1.10</dataexchange.version>
<dataexchange.version>3.0.42</dataexchange.version>
<spring.version>3.1.2.RELEASE</spring.version>

<debug>false</debug>
Expand Down Expand Up @@ -511,7 +511,7 @@
<dependency>
<groupId>uk.ac.ebi.intact.dataexchange</groupId>
<artifactId>intact-cvutils</artifactId>
<version>2.1.9</version>
<version>${dataexchange.version}</version>
<exclusions>
<exclusion>
<groupId>lucene</groupId>
Expand All @@ -527,7 +527,7 @@
<dependency>
<groupId>uk.ac.ebi.intact.dataexchange.psimi</groupId>
<artifactId>intact-psixml-exchange</artifactId>
<version>2.1.9</version>
<version>${dataexchange.version}</version>
<exclusions>
<exclusion>
<groupId>cpdetector</groupId>
Expand Down Expand Up @@ -572,7 +572,7 @@
<dependency>
<groupId>uk.ac.ebi.intact.dataexchange.psimi</groupId>
<artifactId>intact-solr-core</artifactId>
<version>2.1.9.3</version>
<version>${dataexchange.version}</version>
<exclusions>
<exclusion>
<groupId>woodstox</groupId>
Expand Down
26 changes: 23 additions & 3 deletions src/main/webapp/home_content.xhtml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:p="http://java.sun.com/jsf/html"
xmlns:h="http://java.sun.com/jsf/html"
>

<section class="grid_24">
<section class="grid_18">
<div id="covid_panel" style="height:84px; background: #fcefa1; border-color: gold; border-style: solid; border-width: 2px; vertical-align: middle; padding: 6px">
<div class="grid_20 push_2" style="text-align: center; padding: 4px">
<b>COVID19-related interactions at IntAct's Coronavirus dataset.</b><br/>
More info: <a href="https://www.ebi.ac.uk/intact/resources/datasets"
target="blank">Dataset description</a><br/>
Browse: <a href="https://www.ebi.ac.uk/intact/query/annot:%22dataset:coronavirus%22"
target="blank">Coronavirus dataset</a><br/>
Download: FTP Coronavirus dataset in <h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Coronavirus.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="vertical-align: middle; border:0px solid;"/>
</h:outputLink>
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi30/datasets/Coronavirus.zip">
<h:graphicImage alt="PSI 3.0" value="/images/psi30.png"
style="vertical-align: middle; border:0px solid;"/>
</h:outputLink>

</div>
</div>
<section class="grid_24" style="padding-top: 10px">
<section class="grid_18">
<section class="grid_24">
<h2>IntAct Molecular Interaction Database</h2>

Expand Down
Binary file added src/main/webapp/images/psi30.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 99 additions & 16 deletions src/main/webapp/pages/documentation/downloads_content.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,19 @@
style="border:0px solid"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:cardiac&quot;">
<span class="icon icon-functional"
data-icon="="><strong>Cardiac</strong></span>
</h:outputLink>
- Interactions involving cardiac related proteins
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Cardiac.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:cardiac&quot;">
<span class="icon icon-functional"
data-icon="="><strong>Cardiac</strong></span>
</h:outputLink>
- Interactions involving cardiac related proteins
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Cardiac.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:chromatin&quot;">
Expand All @@ -147,6 +147,30 @@
style="border:0px solid"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:coronavirus&quot;">
<span class="icon icon-functional" data-icon="="><strong>Coronavirus</strong></span>
</h:outputLink>
- Interactions investigated in the context of Coronavirus.
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Coronavirus.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:crohn's disease&quot;">
<span class="icon icon-functional" data-icon="="><strong>Crohn's disease</strong></span>
</h:outputLink>
- Interactions of proteins identified as having a link to Crohn's disease.
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Crohn's_disease.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:cyanobacteria&quot;">
Expand All @@ -171,7 +195,42 @@
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid"/>
</h:outputLink>

</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:huntington's&quot;">
<span class="icon icon-functional" data-icon="="><strong>Huntington's</strong></span>
</h:outputLink>
- Publications describing interactions involved in Huntington's disease.
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Huntington's.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:ibd&quot;">
<span class="icon icon-functional" data-icon="="><strong>IBD</strong></span>
</h:outputLink>
- Inflammatory bowel disease
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/IBD.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:neurodegeneration&quot;">
<span class="icon icon-functional" data-icon="="><strong>Neurodegeneration</strong></span>
</h:outputLink>
- Publications depicting interactions involved in neurodegenerative diseases
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Neurodegeneration.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
Expand All @@ -186,6 +245,30 @@
style="border:0px solid"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:rare diseases&quot;">
<span class="icon icon-functional" data-icon="="><strong>Rare diseases</strong></span>
</h:outputLink>
- Interactions investigated in the context of Rare genetic disease
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Rare_diseases.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:ulcerative colitis&quot;">
<span class="icon icon-functional" data-icon="="><strong>Ulcerative colitis</strong></span>
</h:outputLink>
- Interactions of proteins identified as having a link to ulcerative colitis
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/Ulcerative_colitis.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid;"/>
</h:outputLink>
</li>
</ul>

<h3 id="compDs">Computationally maintained datasets</h3>
Expand Down Expand Up @@ -233,13 +316,13 @@
</li>
<li>
<h:outputLink
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:msd&quot;">
value="http://www.ebi.ac.uk/intact/query/annot:&quot;dataset:pdbe&quot;">
<span class="icon icon-functional"
data-icon="="><strong>PDBe</strong></span>
</h:outputLink>
- Data obtained from the Protein Data Bank Europe
<h:outputLink
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/MSD.zip">
value="ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psi25/datasets/PDBe.zip">
<h:graphicImage alt="PSI 2.5" value="/images/psi25.png"
style="border:0px solid"/>
</h:outputLink>
Expand Down
Loading

0 comments on commit b4b859f

Please sign in to comment.