This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 628f5736 mise a jour du readme adds 24c9d344 Renomme le composant 'Privacy' en 'LegalNotices' adds 4fcb9e80 Spécifie les mentions légales adds 3527c562 Supprime le tag concernant les mentions légales. adds 5d307666 Restaure la section Politique de confidentialité adds a9464b30 Corrige une mauvaise configuration adds 08842863 Corrige l'url des mentions légales adds 015f52f0 Ajoute une page de mentions légales par défaut et déplace toutes les données à customiser dans un répertoire spécifique adds 9dbd4c8f rebase sur develop new c1e83d29 Merge branch 'feature/41_mentions_legales' into 'develop' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c1e83d29949e86a7821bf76b09bec3e6e2f4426d Merge: 628f5736 9dbd4c8f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 23 17:07:36 2017 +0200 Merge branch 'feature/41_mentions_legales' into 'develop' #41 - Intègre les mentions légales à Pollen Closes #41 See merge request chorem/pollen!7 Summary of changes: .../web/{home/en.html => customData/home-en.html} | 4 ++-- .../web/{home/fr.html => customData/home-fr.html} | 4 ++-- .../src/main/web/customData/legalNotices-en.html | 14 +++++++++++++ .../src/main/web/customData/legalNotices-fr.html | 13 ++++++++++++ .../src/main/web/{home => customData}/lutin.png | Bin .../src/main/web/{home => customData}/style.css | 0 pollen-ui-riot-js/src/main/web/i18n/en.json | 2 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 ++ .../tag/{Home.tag.html => ContentLoader.tag.html} | 17 +++++++++------ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 23 ++++++++++++++------- .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/Privacy.tag.html | 4 ++-- pollen-ui-riot-js/webpack.config.js | 2 +- 13 files changed, 66 insertions(+), 20 deletions(-) rename pollen-ui-riot-js/src/main/web/{home/en.html => customData/home-en.html} (91%) rename pollen-ui-riot-js/src/main/web/{home/fr.html => customData/home-fr.html} (90%) create mode 100644 pollen-ui-riot-js/src/main/web/customData/legalNotices-en.html create mode 100644 pollen-ui-riot-js/src/main/web/customData/legalNotices-fr.html rename pollen-ui-riot-js/src/main/web/{home => customData}/lutin.png (100%) rename pollen-ui-riot-js/src/main/web/{home => customData}/style.css (100%) rename pollen-ui-riot-js/src/main/web/tag/{Home.tag.html => ContentLoader.tag.html} (80%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.