From 1be06f237e1aebb560c9f8680ec9cec8e6b56f66 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 7 Sep 2018 10:30:58 +0100
Subject: [PATCH] Update about-us
---
.../Views/about-us.component.html | 35 +++++--------------
package.json | 2 +-
2 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/apps/maarch_entreprise/Views/about-us.component.html b/apps/maarch_entreprise/Views/about-us.component.html
index d5c7132d4bf..c2d32420ee4 100755
--- a/apps/maarch_entreprise/Views/about-us.component.html
+++ b/apps/maarch_entreprise/Views/about-us.component.html
@@ -18,9 +18,9 @@
<a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p>
<div>
<ul>
- <li>{{lang.officialWebsite}} : <a target="blank" href="https://maarch.com/">www.maarch.com</a></li>
- <li>{{lang.community}} : <a target="blank" href="https://community.maarch.org/">community.maarch.org</a></li>
- <li>{{lang.documentation}} : <a target="blank" href="https://wiki.maarch.org/Accueil">wiki.maarch.org</a></li>
+ <li>{{lang.officialWebsite}} : <a target="blank" href="https://maarch.com/">https://maarch.com</a></li>
+ <li>{{lang.community}} : <a target="blank" href="https://community.maarch.org/">https://community.maarch.org</a></li>
+ <li>{{lang.documentation}} : <a target="blank" href="https://docs.maarch.org/">https://docs.maarch.org</a></li>
</ul>
</div>
<p> </p>
@@ -30,6 +30,7 @@
<p> </p>
<ul>
<li><a target="blank" href="https://angular.io/">Angular</a></li>
+ <li><a target="blank" href="https://material.angular.io/">Angular Material</a></li>
<li><a target="blank" href="http://getbootstrap.com/">Bootstrap</a></li>
<li><a target="blank" href="http://www.chartjs.org/">Chart.js</a></li>
<li><a target="blank" href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
@@ -50,32 +51,12 @@
</div>
<div class="col-sm-4">
- <h3>Credits</h3>
+ <h3>Crédits</h3>
<hr/>
<ul>
- <li>Florian AZIZIAN</li>
- <li>Damien BUREL</li>
- <li>Bruno CARLIN</li>
- <li>Carole COTIN</li>
- <li>Driss DEMIRAY</li>
- <li>Gaël DE VILLEBLANCHE</li>
- <li>Mathieu DONZEL</li>
- <li>Jean-Louis ERCOLANI</li>
- <li>Claire FIGUERAS</li>
- <li>Laurent GIOVANNONI</li>
- <li>Henri QUENEAU</li>
- <li>Kader KANE</li>
- <li>Yves-Christian KPAKPO</li>
- <li>Sébastien NANABONDJA</li>
- <li>Fodé NDIAYE</li>
- <li>Cédric NDOUMBA</li>
- <li>Alex ORLUC</li>
- <li>Thomas PENARUIZ</li>
- <li>Alexandre STEFANOVIC</li>
- <li>Serge THIERRY-MIEG</li>
- <li>Cyril VAZQUEZ</li>
- <li>Arnaud VEBER</li>
- <li>Loic VINET</li>
+ <li>Florian AZIZIAN, Thierry BACHAUMONT, Damien BUREL, Bruno CARLIN, Carole COTIN, Prosper DE LAURE, Driss DEMIRAY, Gaël DE VILLEBLANCHE, Emmanuel DILLARD, Mathieu DONZEL, Jean-Louis ERCOLANI, Claire FIGUERAS, Laurent GIOVANNONI,
+ Henri QUENEAU, Kader KANE, Yves-Christian KPAKPO, Alexandre MORIN, Sébastien NANABONDJA, Fodé NDIAYE, Cédric NDOUMBA, Alex ORLUC, Alexis RAGOT, Alexandre STEFANOVIC, Serge THIERRY-MIEG,
+ Cyril VAZQUEZ, Arnaud VEBER, Loic VINET</li>
<br>
<li><em>{{lang.thanksToCommunity}}</em></li>
</ul>
diff --git a/package.json b/package.json
index 7aad729ae7e..32a5e875250 100755
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"@angular-devkit/build-angular": "^0.6.8",
"@angular/animations": "^6.1.7",
"@angular/cdk": "^6.4.7",
- "@angular/cli": "^6.1.5",
+ "@angular/cli": "^6.2.1",
"@angular/common": "^6.1.7",
"@angular/compiler": "^6.1.7",
"@angular/compiler-cli": "^6.1.7",
--
GitLab