Merge branch 'dev'

monstra-cms · Dec 24, 2013 · 81ff228 · 81ff228
2 parents 6531d3e + cd0d829
commit 81ff228
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ Monstra is a modern and lightweight Content Management System.
 
 ## System Requirements
 Operation system: Unix, Linux, Windows, Mac OS   
-Middleware: PHP 5.2.3 or higher with PHP's SimpleXML module and Multibyte String module   
-Webserver: Apache with Mod Rewrite or Ngnix with Rewrite Module   
+Middleware: PHP 5.2.3 or higher with PHP's [SimpleXML module](http://php.net/simplexml) and [Multibyte String module](http://php.net/mbstring)   
+Webserver: Apache with [Mod Rewrite](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) or Ngnix with [Rewrite Module](http://wiki.nginx.org/HttpRewriteModule)   
 
 ## Steps to Install
 1. [Download the latest version.](http://monstra.org/download)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+Monstra 2.3.1, 2013-12-25
+------------------------
+- Localization: Major Fixes
+- Gelato: Image.php Major Fixes
+- Sitemap: Errors #175 - fixes
+- New favicon added #182 - by bernte
+- Layouts: General Fixes - by bernte
+- Installer: SERVER_PORT issue - fixed by KANekT
+- Gelato: Number Class - updated bytes format (JEDEC & IEC 60027) by mbarzda
+- Email Layout: footer fixes
+
 Monstra 2.3.0, 2013-12-19
 ------------------------
 - Update Twitter Bootstrap to 2.3.2

diff --git a/engine/Monstra.php b/engine/Monstra.php
@@ -39,7 +39,7 @@ class Monstra
     /**
      * The version of Monstra
      */
-    const VERSION = '2.3.0';
+    const VERSION = '2.3.1';
 
     /**
      * Monstra environment

diff --git a/favicon.ico b/favicon.ico
diff --git a/libraries/Gelato/Number/Number.php b/libraries/Gelato/Number/Number.php
@@ -28,7 +28,7 @@ protected function __construct()
     }
 
     /**
-     * Convert bytes in 'kb','mb','gb','tb','pb'
+     * Convert bytes in 'KB','MB','GB','TiB','PiB'
      *
      *  <code>
      *      echo Number::byteFormat(10000);
@@ -42,7 +42,7 @@ public static function byteFormat($size)
         // Redefine vars
         $size = (int) $size;
 
-        $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+        $unit = array('B', 'KB', 'MB', 'GB', 'TiB', 'PiB');
 
         return @round($size/pow(1024, ($i=floor(log($size, 1024)))), 2).' '.$unit[($i < 0 ? 0 : $i)];
     }

diff --git a/plugins/box/users/views/emails/layout_email.view.php b/plugins/box/users/views/emails/layout_email.view.php
@@ -192,7 +192,9 @@
                         <table width="100%" cellpadding="10" cellspacing="0" border="0">
                             <tr>
                                 <td valign="top" style="font-size:11px; border-top:1px dashed #ccc; text-align:right;">
-                                    <p style="margin-top:0; margin-bottom:0;">© 2012 - 2014 <a href="http://monstra.org" style="color:#333; text-decoration:none;">MONSTRA.ORG</p>
+                                    <p style="margin-top:0; margin-bottom:0;">
+
+                                    </p>
                                 </td>
                             </tr>
                         </table>