Merge pull request #790 from Joomla-Bible-Study/development

v9.1.7
Joomla-Bible-Study · Nov 15, 2018 · ded3e20 · ded3e20
2 parents 2a18730 + efe2ac2
commit ded3e20
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -14,15 +14,15 @@ Status
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
         <td align="center">Development</td>
-        <td align="center">9.1.7</td>
+        <td align="center">9.1.8</td>
         <td align="center">TBD</td>
         <td align="center">3.8+</td>
     </tr>
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
         <td align="center">Master</td>
-        <td align="center">9.1.6</td>
-        <td align="center">Oct 14, 2018</td>
+        <td align="center">9.1.7</td>
+        <td align="center">Nov 14, 2018</td>
         <td align="center">3.8+</td>
     </tr>
 </table>

diff --git a/build/packages/component/com_proclaim.zip b/build/packages/component/com_proclaim.zip
diff --git a/build/packages/modules/mod_proclaim.zip b/build/packages/modules/mod_proclaim.zip
diff --git a/build/packages/modules/mod_proclaim_podcast.zip b/build/packages/modules/mod_proclaim_podcast.zip
diff --git a/build/packages/pkg_proclaim.zip b/build/packages/pkg_proclaim.zip
diff --git a/build/packages/plugins/plg_proclaim_backup.zip b/build/packages/plugins/plg_proclaim_backup.zip
diff --git a/build/packages/plugins/plg_proclaim_finder.zip b/build/packages/plugins/plg_proclaim_finder.zip
diff --git a/build/packages/plugins/plg_proclaim_podcast.zip b/build/packages/plugins/plg_proclaim_podcast.zip
diff --git a/build/packages/plugins/plg_proclaim_search.zip b/build/packages/plugins/plg_proclaim_search.zip
diff --git a/build/pkg_proclaim_package.xml b/build/pkg_proclaim_package.xml
@@ -8,8 +8,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<packager>CWM Team</packager>
 	<packagerurl>https://www.christianwebministries.org</packagerurl>

diff --git a/com_biblestudy/admin/api.php b/com_biblestudy/admin/api.php
@@ -19,7 +19,7 @@
 define('JBSM_PROFILER', 0);
 
 // Version information
-define('BIBLESTUDY_VERSION', '9.1.6');
+define('BIBLESTUDY_VERSION', '9.1.7');
 define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION);
 
 // Default values

diff --git a/com_biblestudy/admin/helpers/html/biblestudy.php b/com_biblestudy/admin/helpers/html/biblestudy.php
@@ -105,10 +105,11 @@ public static function loadCss($params, $url = null, $extra = null)
 
 		if ($extra == 'font-awesome')
 		{
-			JHtml::script('https://use.fontawesome.com/releases/v5.3.1/js/all.js',
+			JHtml::script('https://use.fontawesome.com/releases/v5.5.0/js/all.js',
 				[],
-				['integrity' => 'sha384-kW+oWsYx3YpxvjtZjFXqazFpA7UP/MbiY4jvs+RWZo2+N94PFZ36T6TFkc9O3qoB', 'crossorigin' => 'anonymous', 'defer' => 'defer']
+				['integrity' => 'sha384-GqVMZRt5Gn7tB9D9q7ONtcp4gtHIUEW/yG7h98J7IpE3kpi+srfFyyB/04OV6pG0', 'crossorigin' => 'anonymous', 'defer' => 'defer']
 			);
+			JHtml::script('https://use.fontawesome.com/releases/v5.5.0/js/v4-shims.js');
 		}
 	}
 

diff --git a/com_biblestudy/biblestudy.xml b/com_biblestudy/biblestudy.xml
@@ -5,9 +5,9 @@
 	<author>CWM Team</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
-	<copyright>(C) 2007 - 2017 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_INS_XML_DESCRIPTION</description>
 

diff --git a/mod_biblestudy/mod_biblestudy.xml b/mod_biblestudy/mod_biblestudy.xml
@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_DESCRIPTION</description>
 	<files>

diff --git a/mod_biblestudy_podcast/mod_biblestudy_podcast.xml b/mod_biblestudy_podcast/mod_biblestudy_podcast.xml
@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_PODCAST_XML_DESCRIPTION</description>
 	<files>

diff --git a/plg_biblestudy_backup/jbsbackup.xml b/plg_biblestudy_backup/jbsbackup.xml
@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_BACKUP_XML_DESCRIPTION</description>
 

diff --git a/plg_biblestudy_finder/biblestudy.xml b/plg_biblestudy_finder/biblestudy.xml
@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_FINDER_XML_DESCRIPTION</description>
 	<files>

diff --git a/plg_biblestudy_podcast/jbspodcast.xml b/plg_biblestudy_podcast/jbspodcast.xml
@@ -5,8 +5,8 @@
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://www.christianwebministries.org</authorUrl>
     <copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-    <version>9.1.6</version>
-    <creationDate>Oct 14, 2018</creationDate>
+    <version>9.1.7</version>
+    <creationDate>Nov 14, 2018</creationDate>
     <license>http://www.gnu.org/licenses/gpl.html</license>
     <description>JBS_PLG_PODCAST_XML_DESCRIPTION</description>
 

diff --git a/plg_biblestudy_search/biblestudysearch.xml b/plg_biblestudy_search/biblestudysearch.xml
@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.christianwebministries.org</authorUrl>
 	<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
-	<version>9.1.6</version>
-	<creationDate>Oct 14, 2018</creationDate>
+	<version>9.1.7</version>
+	<creationDate>Nov 14, 2018</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_SEARCH_XML_DESCRIPTION</description>
 	<files>