Skip to content

Commit

Permalink
Merge pull request #790 from Joomla-Bible-Study/development
Browse files Browse the repository at this point in the history
v9.1.7
  • Loading branch information
bcordis committed Nov 15, 2018
2 parents 2a18730 + efe2ac2 commit ded3e20
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file modified build/packages/component/com_proclaim.zip
Binary file not shown.
Binary file modified build/packages/modules/mod_proclaim.zip
Binary file not shown.
Binary file modified build/packages/modules/mod_proclaim_podcast.zip
Binary file not shown.
Binary file modified build/packages/pkg_proclaim.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_backup.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_finder.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_podcast.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_search.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions build/pkg_proclaim_package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<authorEmail>info@joomlabiblestudy.org</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>
Expand Down
2 changes: 1 addition & 1 deletion com_biblestudy/admin/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions com_biblestudy/admin/helpers/html/biblestudy.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}

Expand Down
6 changes: 3 additions & 3 deletions com_biblestudy/biblestudy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<author>CWM Team</author>
<authorEmail>info@joomlabiblestudy.org</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>

Expand Down
4 changes: 2 additions & 2 deletions mod_biblestudy/mod_biblestudy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>
Expand Down
4 changes: 2 additions & 2 deletions mod_biblestudy_podcast/mod_biblestudy_podcast.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>
Expand Down
4 changes: 2 additions & 2 deletions plg_biblestudy_backup/jbsbackup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>

Expand Down
4 changes: 2 additions & 2 deletions plg_biblestudy_finder/biblestudy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>
Expand Down
4 changes: 2 additions & 2 deletions plg_biblestudy_podcast/jbspodcast.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>

Expand Down
4 changes: 2 additions & 2 deletions plg_biblestudy_search/biblestudysearch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>info@joomlabiblestudy.org</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>
Expand Down

0 comments on commit ded3e20

Please sign in to comment.