Skip to content

Commit

Permalink
Merge pull request #732 from Joomla-Bible-Study/development
Browse files Browse the repository at this point in the history 
v9.0.13
  • Loading branch information
@bcordis
bcordis authored Mar 4, 2017
2 parents 5dd45f0 + 415306c commit ae557d8
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 22 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
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.0.13</td>
<td align="center">9.0.14</td>
<td align="center">TBD</td>
<td align="center">3.4+</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.0.12</td>
<td align="center">March 2, 2017</td>
<td align="center">9.0.13</td>
<td align="center">March 4, 2017</td>
<td align="center">3.4+</td>
</tr>
</table>
Expand Down
Binary file modified build/packages/component/com_biblestudy.zip
View file
Binary file not shown.
Binary file modified build/packages/modules/mod_biblestudy.zip
View file
Binary file not shown.
Binary file modified build/packages/modules/mod_biblestudy_podcast.zip
View file
Binary file not shown.
Binary file modified build/packages/pkg_biblestudy.zip
View file
Binary file not shown.
Binary file modified build/packages/plugins/plg_biblestudy_backup.zip
View file
Binary file not shown.
Binary file modified build/packages/plugins/plg_biblestudy_finder.zip
View file
Binary file not shown.
Binary file modified build/packages/plugins/plg_biblestudy_podcast.zip
View file
Binary file not shown.
Binary file modified build/packages/plugins/plg_biblestudy_search.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/pkg_biblestudy_package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</creationDate>
<license>http://www.gnu.org/licenses/gpl.html</license>
<packager>Tom Fuller</packager>
<packagerurl>https://www.joomlabiblestudy.org</packagerurl>
Expand Down
2 changes: 1 addition & 1 deletion com_biblestudy/admin/api.php
View file
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.0.12');
define('BIBLESTUDY_VERSION', '9.0.13');
define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION);

// Default values
Expand Down
11 changes: 10 additions & 1 deletion com_biblestudy/admin/helpers/html/jwplayer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,15 @@ public static function render($media, $params, $popup = false, $player = null, $

$render .= " <div id='placeholder" . $media->id . "'></div>";

if ($params->get('media_popout_yes', true))
{
$popouttext = $params->get('media_popout_text', JText::_('JBS_CMN_POPOUT'));
}
else
{
$popouttext = '';
}

if ($popup)
{
$render .= "</div>";
Expand All @@ -193,7 +202,7 @@ public static function render($media, $params, $popup = false, $player = null, $
$render .= "<a href=\"#\" onclick=\"window.open('index.php?option=com_biblestudy&amp;player=" . $player->player
. "&amp;view=popup&amp;t=" . $t . "&amp;mediaid=" . $media->id . "&amp;tmpl=component', 'newwindow', 'width="
. $player->playerwidth . ",height=" .
$player->playerheight . "'); return false\">" . JText::_('Pop Out') . "</a>";
$player->playerheight . "'); return false\">" . $popouttext . "</a>";
}

$render .= "<script language=\"javascript\" type=\"text/javascript\">
Expand Down
2 changes: 1 addition & 1 deletion com_biblestudy/admin/install/sql/install.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CREATE TABLE `#__bsms_update` (

INSERT INTO `#__bsms_update` (`id`, `version`)
VALUES
(1, '9.0.12');
(1, '9.0.13');

-- --------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions com_biblestudy/biblestudy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>February 7, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</creationDate>
<license>http://www.gnu.org/licenses/gpl.html</license>
<description>JBS_INS_XML_DESCRIPTION</description>

Expand Down
9 changes: 9 additions & 0 deletions com_biblestudy/site/helpers/media.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ public function getFluidDownloadLink($media, $params, $template)
{
// Remove download form Youtube links.
$filename = $media->params->get('filename');
$link_type = 0;

if (substr_count($filename, 'youtube') || substr_count($filename, 'youtu.be'))
{
Expand Down Expand Up @@ -629,6 +630,14 @@ public function getPlayerCode($params, $player, $image, $media)

case 2: // Inline
JHtml::_('Jwplayer.framework', true, true);

if ($player->player == 7)
{
$player->playerheight = '40';
$player->boxplayerheight = '40';
$player->mp3 = true;
}

$playercode = JHtmlJwplayer::render($media, $params, false, $player, $template);
break;

Expand Down
4 changes: 2 additions & 2 deletions mod_biblestudy/mod_biblestudy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
<version>9.0.12</version>
<creationDate>March 2, 2017</creationDate>
<version>9.0.13</version>
<creationDate>March 4, 2017</creationDate>
<license>http://www.gnu.org/licenses/gpl.html</license>
<description>JBS_PLG_SEARCH_XML_DESCRIPTION</description>
<files>
Expand Down

0 comments on commit ae557d8

Please sign in to comment.