diff --git a/.gitignore b/.gitignore index 508b74f..42fd015 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,6 @@ _minted* # WinEdt *.bak *.sav +/sonar-scanner.sh +/.scannerwork/.sonar_lock +/.scannerwork/report-task.txt diff --git a/display/templates/apropos_fr.tpl b/display/templates/apropos_fr.tpl index d486629..9da109d 100644 --- a/display/templates/apropos_fr.tpl +++ b/display/templates/apropos_fr.tpl @@ -7,5 +7,6 @@ Le logiciel USACT permet de décrire les conflits d'usage dans un secteur géogr
Pour plus d'informations, consultez le wiki de l'application : https://gitlab.irstea.fr/eric.quinton/usact/wikis/home +
Pour les versions déployées depuis Github, consultez le wiki : https://github.com/Irstea/usact/wiki
-Réalisation : Éric Quinton pour IRSTEA Bordeaux - © 2015-2018 - Tous droits réservés \ No newline at end of file +Réalisation : Éric Quinton pour IRSTEA Bordeaux - © 2015-2019 - Tous droits réservés \ No newline at end of file diff --git a/doc/quoideneuf.php b/doc/quoideneuf.php new file mode 100755 index 0000000..8709a4c --- /dev/null +++ b/doc/quoideneuf.php @@ -0,0 +1,14 @@ + + + $value) { + if (substr($value, 1, 1) == "*" or substr($value, 0, 1) == "*") { + $doc .= "   "; + } + if ($APPLI_utf8 == true) utf8_encode($value); + $doc .= htmlentities($value) . "
"; +} +$smarty->assign("texteNews", $doc); +$smarty->assign("corps", "documentation/quoideneuf.tpl"); +?> diff --git a/param/actions.xml b/param/actions.xml index e96006f..37d27e8 100644 --- a/param/actions.xml +++ b/param/actions.xml @@ -27,7 +27,7 @@ - + diff --git a/install/readme.txt b/param/news.txt similarity index 100% rename from install/readme.txt rename to param/news.txt diff --git a/param/param.default.inc.php b/param/param.default.inc.php index 42e65b3..b04c61e 100644 --- a/param/param.default.inc.php +++ b/param/param.default.inc.php @@ -5,8 +5,8 @@ * * Parametres par defaut de l'application */ -$APPLI_version = "1.1.2"; -$APPLI_versiondate = "10/12/2018"; +$APPLI_version = "1.1.3"; +$APPLI_versiondate = "19/02/2019"; $language = "fr"; $DEFAULT_formatdate = "fr"; /* diff --git a/param/param.inc.php.dist b/param/param.inc.php.dist new file mode 100644 index 0000000..374cbb9 --- /dev/null +++ b/param/param.inc.php.dist @@ -0,0 +1,47 @@ +