From adaf3c23bd8a4169c412373a897fb69167102060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Mon, 22 Feb 2021 12:51:59 +0100
Subject: [PATCH 1/6] Add TOC with markdown tag
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d33b1d46..d3127cc0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
# How to contribute to FAIDARE
-[_TOC_]
+[[_TOC_]]
## Git management
--
GitLab
From dfbcc06533d0696927e32602ccc9f66127a0c99f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Mon, 22 Feb 2021 12:53:53 +0100
Subject: [PATCH 2/6] Add TOC with markdown tag
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 2543f94e..20f005d6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
# FAIDARE: FAIR Data-finder for Agronomic Research
This application provides web services (based on the BrAPI standard) and a web interface with easy to use filters to facilitates the access to plant datasets from a federation of sources.
+[[_TOC_]]
+
## How to contribute
Look at the [contribution guide](CONTRIBUTING.md).
--
GitLab
From 2b984e9656ee175d26bae453bb2dffb5a33fd369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Mon, 22 Feb 2021 17:25:09 +0100
Subject: [PATCH 3/6] Add PlantBioinfoPF DMP
---
frontend/src/assets/faidare/LEGAL-MENTIONS.md | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/frontend/src/assets/faidare/LEGAL-MENTIONS.md b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
index 6710d8b8..bc4b96a0 100644
--- a/frontend/src/assets/faidare/LEGAL-MENTIONS.md
+++ b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
@@ -5,16 +5,22 @@ By browsing this web site, you acknowledge and accept its general terms of use d
## Intellectual property
Except where otherwise noted, content on this site is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by/4.0/).
-The logo is the property of INRA and you are not allowed to re-use it for your own work and purpose.
+
+The logo is the property of INRAE and you are not allowed to re-use it for your own work and purpose.
## Content
-The portal maintained by INRA allows to find public data across a federation of databases.
+The portal is maintained by URGI, an INRAE unit, and its data management plan follows the one defined for the Plant Bioinformatics Facility (PlantBioinfoPF) that hosts it: [Data Management Plan (DOI: 10.15454/9HM5UI)](https://doi.org/10.15454/9HM5UI).
+
+The access to the web site can be interrupted at any moment and without prior warning in case of force majeure or if the editor decides to terminate its provision of service.
+
+The portal allows to find public data across a federation of databases.
The licences associated to data are therefore defined by the institutes in charge of them.
-Users are sole responsible for the searches they carry out, as well as for the interpretation and for the use they make of the results.
+The portal links to external web sites.
+INRAE does not take responsibility of the content of these web site.
-The access to the web site can be interrupted at any moment and without prior warning in case of force majeure or if the editor decides to terminate its provision of service.
+Users are sole responsible for the searches they carry out, as well as for the interpretation and for the use they make of the results.
Users are informed that their use of the results should not infringe on current legislation or the recommendations of the French Data Protection Authority (CNIL) with respect to personal data.
Users are warned that the information must be used for strictly professional purposes only and downloading screen shots in order to constitute or enrich a database is contrary to French law and therefore forbidden, as is its use for commercial or advertising purposes (CNIL).
@@ -23,11 +29,6 @@ The portal may give access to personal and professional data concerning technica
This information helps to identify and acknowledge the authors of the scientific works.
This personal information is attached to the produced datasets and follows the data life cycle.
-## Hyperlinks
-
-The portal links to external web sites.
-INRA does not take responsibility of the content of these web site.
-
## Personal data
Technical data (date, hour, IP address of the computer of the visitor, pages viewed) are collected only for the statistical analysis of the usage of the portal.
@@ -46,4 +47,4 @@ If you wish to exercise this right and obtain information about yourself, please
The editor might change the terms of use and user’s rights without prior warning.
-Last update: 2019 June 25th
+Last update: 2021 February 22th
--
GitLab
From 45669abfa73c8ae6fb9c17f6efdab070fdb5ce23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Mon, 22 Feb 2021 17:50:15 +0100
Subject: [PATCH 4/6] Rename "legal mentions" in "terms of use"
---
frontend/src/app/navbar/navbar.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/navbar/navbar.component.html b/frontend/src/app/navbar/navbar.component.html
index 01465fc3..bbafeb37 100644
--- a/frontend/src/app/navbar/navbar.component.html
+++ b/frontend/src/app/navbar/navbar.component.html
@@ -46,7 +46,7 @@
<!-- Join us link -->
<a class="dropdown-item" routerLink="/join" routerLinkActive="true" title="Join us">Join us</a>
<!-- Legal mentions link -->
- <a class="dropdown-item" routerLink="/legal" routerLinkActive="true" title="Legal mentions" >Legal mentions</a>
+ <a class="dropdown-item" routerLink="/legal" routerLinkActive="true" title="Terms of use">Terms of use</a>
<!-- Help link -->
<a class="dropdown-item" routerLink="/help" routerLinkActive="true" title="Help">Help</a>
</div>
--
GitLab
From 2f88234c6a2e22d8b93f97254a4bdcd8124eb837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Fri, 26 Feb 2021 17:05:31 +0100
Subject: [PATCH 5/6] Remove unworking link
---
frontend/src/assets/faidare/ABOUT.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/assets/faidare/ABOUT.md b/frontend/src/assets/faidare/ABOUT.md
index dd96099f..a1daa992 100644
--- a/frontend/src/assets/faidare/ABOUT.md
+++ b/frontend/src/assets/faidare/ABOUT.md
@@ -10,4 +10,4 @@ FAIDARE offers more detailed search and data retrieval capabilities and it takes
It has been developed by [INRA-URGI](http://urgi.versailles.inra.fr/) in collaboration with [**Elixir Plant**](https://elixir-europe.org/communities/plant-sciences), [**Phenome-Emphasis.fr**](https://www.phenome-emphasis.fr/phenome_eng/Methodological-projects/MCP2-Distributed-Information-system) and [**Elixir-fr/IFB**](https://www.france-bioinformatique.fr).
-If you want to join the FAIDARE federation, please read the [HOW TO JOIN guide](HOW-TO-JOIN.md) and [contact us](mailto:urgi-contact@inra.fr?subject=%5BFAIDARE%5D).
+If you want to join the FAIDARE federation, please read the "Join us" section and [contact us](mailto:urgi-contact@inra.fr?subject=%5BFAIDARE%5D).
--
GitLab
From 75bbd238c6f63b85641205aaeecece16de9cb12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9lia=20Michotey?= <celia.michotey@inra.fr>
Date: Fri, 26 Feb 2021 17:22:02 +0100
Subject: [PATCH 6/6] Add PF DOI and a grace period before extinction
---
frontend/src/assets/faidare/LEGAL-MENTIONS.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/frontend/src/assets/faidare/LEGAL-MENTIONS.md b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
index bc4b96a0..21aa25f5 100644
--- a/frontend/src/assets/faidare/LEGAL-MENTIONS.md
+++ b/frontend/src/assets/faidare/LEGAL-MENTIONS.md
@@ -10,9 +10,10 @@ The logo is the property of INRAE and you are not allowed to re-use it for your
## Content
-The portal is maintained by URGI, an INRAE unit, and its data management plan follows the one defined for the Plant Bioinformatics Facility (PlantBioinfoPF) that hosts it: [Data Management Plan (DOI: 10.15454/9HM5UI)](https://doi.org/10.15454/9HM5UI).
+The portal is maintained by URGI, an INRAE unit, and its [Data Management Plan (DOI: 10.15454/9HM5UI)](https://doi.org/10.15454/9HM5UI) has been defined in the frame of the [Plant Bioinformatics Facility (PlantBioinfoPF, DOI: 10.15454/1.5572414581735654E12)](https://doi.org/10.15454/1.5572414581735654E12) that hosts the portal.
-The access to the web site can be interrupted at any moment and without prior warning in case of force majeure or if the editor decides to terminate its provision of service.
+Access to this web site can be interrupted at any time and without prior warning in case of force majeure.
+In case of a planned service interruption, users will be notified in advance by the editor as far as possible.
The portal allows to find public data across a federation of databases.
The licences associated to data are therefore defined by the institutes in charge of them.
--
GitLab