From c88330d13ecccb4264abc86c9800baddc230faad Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Mon, 9 Apr 2018 15:05:58 +0200
Subject: [PATCH] version 7.12.10

---
 FEATURES/68179                 | 11 -----------
 VERSIONS                       | 12 ++++++++++++
 VERSIONS_HOTLINE/72999         |  2 --
 VERSIONS_WIP/68179             |  2 --
 VERSIONS_WIP/68184             |  2 --
 VERSIONS_WIP/73311             |  1 -
 library/Class/Feature/List.php | 12 ++++++++++++
 library/startup.php            |  2 +-
 8 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 FEATURES/68179
 delete mode 100644 VERSIONS_HOTLINE/72999
 delete mode 100644 VERSIONS_WIP/68179
 delete mode 100644 VERSIONS_WIP/68184
 delete mode 100644 VERSIONS_WIP/73311

diff --git a/FEATURES/68179 b/FEATURES/68179
deleted file mode 100644
index 4207600734b..00000000000
--- a/FEATURES/68179
+++ /dev/null
@@ -1,11 +0,0 @@
-        '68179' =>
-            ['Label' => $this->_('Connecteur StoryPlay*r'),
-             'Desc' => $this->_('%s est une ressource numérique proposant des centaines d\'albums jeunesse à lire ou à écouter.',
-	     '<a href="https://www.storyplayr.com/">StoryPlay*R</a>'),
-             'Image' => 'https://www.storyplayr.com/images/v2/logo.png',
-             'Video' => '',
-             'Category' => $this->_('Bibliothèque numérique'),
-             'Right' => function($feature_description, $user) {return true;},
-             'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=StoryPlayR',
-             'Test' => '',
-             'Date' => '2018-03-23'],
\ No newline at end of file
diff --git a/VERSIONS b/VERSIONS
index 8eacdade724..719ca016d32 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,15 @@
+09/04/2018 - v7.12.10
+
+ - ticket #68179 : Ressources numériques : Ajout du connecteur StoryPlay*r
+ 
+ - ticket #68184 : Ressources numériques : LeKiosk : prise en charge du moissonage en HTTP.
+ 
+ - ticket #73311 : Ajout d'indicateurs dans le rapport système
+ 
+ - ticket #72999 : Boite bibliothèque : correction des liens de pagination.
+ 
+
+
 29/03/2018 - v7.12.9
 
  - ticket #73332 : Boite agenda : correction des liens du calendrier et des filtres.
diff --git a/VERSIONS_HOTLINE/72999 b/VERSIONS_HOTLINE/72999
deleted file mode 100644
index 49789cbf486..00000000000
--- a/VERSIONS_HOTLINE/72999
+++ /dev/null
@@ -1,2 +0,0 @@
- - ticket #72999 : Boite bibliothèque : correction des liens de pagination.
- 
\ No newline at end of file
diff --git a/VERSIONS_WIP/68179 b/VERSIONS_WIP/68179
deleted file mode 100644
index 25050885ee3..00000000000
--- a/VERSIONS_WIP/68179
+++ /dev/null
@@ -1,2 +0,0 @@
- - ticket #68179 : Ressources numériques : Ajout du connecteur StoryPlay*r
- 
\ No newline at end of file
diff --git a/VERSIONS_WIP/68184 b/VERSIONS_WIP/68184
deleted file mode 100644
index 70f9666624e..00000000000
--- a/VERSIONS_WIP/68184
+++ /dev/null
@@ -1,2 +0,0 @@
- - ticket #68184 : Ressource numérique : LeKiosk : prise en charge du moissonage en HTTP.
- 
\ No newline at end of file
diff --git a/VERSIONS_WIP/73311 b/VERSIONS_WIP/73311
deleted file mode 100644
index c6d40a11bb3..00000000000
--- a/VERSIONS_WIP/73311
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #73311 : Ajout d'indicateurs dans le rapport système
\ No newline at end of file
diff --git a/library/Class/Feature/List.php b/library/Class/Feature/List.php
index ef9531f8b80..8629c524c83 100644
--- a/library/Class/Feature/List.php
+++ b/library/Class/Feature/List.php
@@ -193,6 +193,18 @@ class Class_Feature_List {
              'Test' => '',
              'Date' => '2017-12-25'],
 
+            '68179' =>
+            ['Label' => $this->_('Connecteur StoryPlay*r'),
+             'Desc' => $this->_('%s est une ressource numérique proposant des centaines d\'albums jeunesse à lire ou à écouter.',
+	     '<a href="https://www.storyplayr.com/">StoryPlay*R</a>'),
+             'Image' => 'https://www.storyplayr.com/images/v2/logo.png',
+             'Video' => 'https://www.youtube.com/watch?v=tmcT39fZDos',
+             'Category' => $this->_('Bibliothèque numérique'),
+             'Right' => function($feature_description, $user) {return true;},
+             'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=StoryPlayR',
+             'Test' => '',
+             'Date' => '2018-03-23'],
+
     ];
   }
 }
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index e3064083324..18b95709b86 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -82,7 +82,7 @@ class Bokeh_Engine {
 
   function setupConstants() {
     defineConstant('BOKEH_MAJOR_VERSION','7.12');
-    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.9');
+    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.10');
 
     defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
-- 
GitLab