Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Aug 9, 2014
2 parents d304a58 + 62b7160 commit ca5d9d4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions changelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
- -> Removed
! -> Note

Version 1.4.1
# Bug when user timezone was different to the default Joomla timezone

Version 1.4.0
^ Name field now is a placeholder and is required
^ Use improved method of getting the POST array introduced in Joomla 3.2
Expand Down
2 changes: 1 addition & 1 deletion mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.sys.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Released under GNU/GPL 3.0 License</p>"
MOD_SHOUTBOX_INSTALL="This shoutbox module allows users to post on your site with a simple yet elegant design. Parameters allow you to choose whether guests are allowed to post, the number of posts shown at any time and the design of the shoutbox itself. Posts can be easily deleted by any administrator, whilst a spam filter censors swearing on the shoutbox. There is a .php file in the module which you can easily add any extra swear words to if you feel this is needed. The module is entirely language file based, and thus can be adapted for multi-lingual sites easily."
MOD_SHOUTBOX_UPDATE="This version has been updated to %s"
MOD_SHOUTBOX_UPDATE_CHANGELOG="<h1 style='text-decoration: underline'>Changelog</h1><ul><li>Name input field now uses a HTML5 placeholder and is required</li><li>Minor code improvements</li></ul>"
MOD_SHOUTBOX_UPDATE_CHANGELOG="<h1 style='text-decoration: underline'>Changelog</h1><ul><li>Fixed bug when user timezone was different to the default Joomla timezone</li></ul>"
MOD_SHOUTBOX_INCORRECT_SEQUENCE="Incorrect version sequence. Cannot upgrade %s to %s"
SHOUT_126_UPDATE_NOTIFICATION="Changes have been made with who is allowed to post in the module. Be sure to check the shoutbox parameters to make sure everything continues to work as expected!"
2 changes: 1 addition & 1 deletion mod_shoutbox/mod_shoutbox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>http://www.joomjunk.co.uk</authorUrl>
<version>1.4.0</version>
<version>1.4.1</version>
<description>JJSHOUTBOX_DESCRIPTION</description>

<install>
Expand Down
2 changes: 1 addition & 1 deletion mod_shoutbox/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
echo $profile_link;
}
?> - <?php
echo JFactory::getDate($shouts[$i]->when)->format($show_date . 'H:i');
echo JHtml::date($shouts[$i]->when, $show_date . 'H:i', true);

if ($user->authorise('core.delete'))
{
Expand Down

0 comments on commit ca5d9d4

Please sign in to comment.