[openelec-Commits] r1551 - in branches/5.2.0-develop_onglet_piece: . data/pgsql obj

[gmal...@adullact.net]

Author: gmalvolti
Date: 2019-01-21 10:25:40 +0100 (Mon, 21 Jan 2019)
New Revision: 1551

Added:
branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.init_data.sql
branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql
Modified:
branches/5.2.0-develop_onglet_piece/
branches/5.2.0-develop_onglet_piece/HISTORY.txt
branches/5.2.0-develop_onglet_piece/VERSION.txt
branches/5.2.0-develop_onglet_piece/data/pgsql/install.sql
branches/5.2.0-develop_onglet_piece/obj/openelec.class.php
Log:
Rebase de la branche de developpement onglet piece avec la branche d'int?\195?\169gration.


Index: branches/5.2.0-develop_onglet_piece
===================================================================
--- branches/5.2.0-develop_onglet_piece 2019-01-21 09:18:59 UTC (rev 1550)
+++ branches/5.2.0-develop_onglet_piece 2019-01-21 09:25:40 UTC (rev 1551)

Property changes on: branches/5.2.0-develop_onglet_piece
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/branches/5.1.0-sync-liste-electorale:1492-1527
+/branches/5.2.0-develop:1549-1550
/branches/8821_test_prucuration_quand_nom_minucule:1254-1259
/branches/migrate-tests-to-robot-framework:1186-1248
\ No newline at end of property
Modified: branches/5.2.0-develop_onglet_piece/HISTORY.txt
===================================================================
--- branches/5.2.0-develop_onglet_piece/HISTORY.txt 2019-01-21 09:18:59 UTC (rev 1550)
+++ branches/5.2.0-develop_onglet_piece/HISTORY.txt 2019-01-21 09:25:40 UTC (rev 1551)
@@ -1,6 +1,12 @@
openElec Historique des versions
================================

+5.2.0 (unreleased)
+------------------
+
+* Aucun changement.
+
+
5.1.1 (unreleased)
------------------


Modified: branches/5.2.0-develop_onglet_piece/VERSION.txt
===================================================================
--- branches/5.2.0-develop_onglet_piece/VERSION.txt 2019-01-21 09:18:59 UTC (rev 1550)
+++ branches/5.2.0-develop_onglet_piece/VERSION.txt 2019-01-21 09:25:40 UTC (rev 1551)
@@ -1 +1 @@
-5.1.1.dev0
+5.2.0.dev0

Modified: branches/5.2.0-develop_onglet_piece/data/pgsql/install.sql
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/install.sql 2019-01-21 09:18:59 UTC (rev 1550)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/install.sql 2019-01-21 09:25:40 UTC (rev 1551)
@@ -38,6 +38,8 @@
-- Mise à jour depuis la dernière version (en cours de développement)
\i v5.1.1.dev0.sql
\i v5.1.1.dev0.init_data.sql
+\i v5.2.0.dev0.sql
+\i v5.2.0.dev0.init_data.sql

-- Fin du bloc transactionnel
COMMIT;

Copied: branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.init_data.sql (from rev 1550, branches/5.2.0-develop/data/pgsql/v5.2.0.dev0.init_data.sql)
===================================================================
Copied: branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql (from rev 1550, branches/5.2.0-develop/data/pgsql/v5.2.0.dev0.sql)
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql (rev 0)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql 2019-01-21 09:25:40 UTC (rev 1551)
@@ -0,0 +1,8 @@
+--
+-- Fichier de passage de version SQL : v5.1.x > v5.2.0
+--
+-- @package openelec
+-- @version SVN : $Id$
+--
+
+

Modified: branches/5.2.0-develop_onglet_piece/obj/openelec.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/obj/openelec.class.php 2019-01-21 09:18:59 UTC (rev 1550)
+++ branches/5.2.0-develop_onglet_piece/obj/openelec.class.php 2019-01-21 09:25:40 UTC (rev 1551)
@@ -754,7 +754,7 @@
$footer[] = array(
"title" => __("Documentation"),
"description" => __("Acceder a l'espace documentation de l'application"),
- "href" => "http://docs.openmairie.org/?project=openelec&version=5.1&format=html&path=manuel_utilisateur",
+ "href" => "http://docs.openmairie.org/?project=openelec&version=5.2&format=html&path=manuel_utilisateur",
"target" => "_blank",
"class" => "footer-documentation",
);