From ad870b21201bbba51a7cbc5235f9d69f76add42c Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 24 Dec 2013 23:58:57 +0200 Subject: [PATCH 1/5] new favicon added #182 --- favicon.ico | Bin 1150 -> 1150 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.ico b/favicon.ico index de0db7e7cd00bc0bb820172416f0fd9660d3f01b..68dec5c0ce8ced898757070b27379352762a9793 100644 GIT binary patch literal 1150 zcmbu8JxfAi7=|A+6awi`&>S=v4n@!}XlvC)`~@L6xmEPF_A43{q9qzFTKox3YK;k^ zvlegn^?Kfe$f1TFxz2gs`?>G)tyxCDC^Bug?PS$#%glC#Bq?)UJ2TC8_U8C?`sPUT zqc|38G4yE6eygm8x59}x@f1Uk#tctdZA!crp8{_h%<$k{EY^48OQhu%H9UC3F;>)H ziX@xOW?ivZbk%CrLysm;052J`2Vx-nESJlQ67 zg+jqYPcg$2{MwU!2y2erYPGy~G#a^Pv+1Fym@S>3?1f0~zf!5V$zx#T&-5~&@a7zykx?+{Gabnhw-(c z?YS6;?zDF z*fG;=re+@J`Rbg$b54_m_w=6cJd@ z2(QLj1C}^FIYqV0jpwIlgJDgK++Q&~I0Q#dJ}S#9;BuD3?W#h(yG~-k@nBkcI2=Y_ zcc1K|K3y)&E#l|<$K><=_Kw=hnzS0LS4)!*U!PynBbiL1v!m0d^*8&mwXrFawbi4y zs|VDEu0tlSAlHH8qhq8}DN_<7r}~7ht`Qgun6SOwJ(EuLA*brchDUAh9sc-``glB! z`Pn&{tm#8e)$`vJ=NB1RVP1hT`}XG6z*+12V2|!WEj{#Su8~MY_Qql{Ob4fAvZkJ# z+Usd(#OTn72|L_BFlOm9^_85eUte3t<;A55;w9 z-QR}Y?H!q{)w!&B4)u6_c|}b{wXMgh(Vsal8jb35x$^uE^z{GfF&UV!oqyHn{_Y;D gODphsyl@tmqO`CC{Lae@%XoZvR9j^&1n{5y1#O9xNdN!< From 6f55f9238b56b18f41571b0aedc01e1550d7259e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 25 Dec 2013 00:04:14 +0200 Subject: [PATCH 2/5] Readme Updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e598a969..072f6cde 100644 --- 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) From b29abf8da1d6d1a106cb9ea72c8373dc946e58db Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 25 Dec 2013 00:08:56 +0200 Subject: [PATCH 3/5] Gelato: Number Class - updated bytes format (JEDEC & IEC 60027) by mbarzda --- libraries/Gelato/Number/Number.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/Gelato/Number/Number.php b/libraries/Gelato/Number/Number.php index 9b6df1f3..9f193eee 100644 --- 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' * * * 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)]; } From 03e5fc320cd61bb487cd9f7cd5d327a576ef41b4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 25 Dec 2013 00:24:00 +0200 Subject: [PATCH 4/5] Email Layout: footer fixes --- plugins/box/users/views/emails/layout_email.view.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/box/users/views/emails/layout_email.view.php b/plugins/box/users/views/emails/layout_email.view.php index 37bcf60f..60773506 100644 --- a/plugins/box/users/views/emails/layout_email.view.php +++ b/plugins/box/users/views/emails/layout_email.view.php @@ -192,7 +192,9 @@
-

© 2012 - 2014 MONSTRA.ORG

+

+ +

From cd0d8296a5ce8f77c1b1240dd4a362b5b64bab86 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 25 Dec 2013 00:32:27 +0200 Subject: [PATCH 5/5] Monstra 2.3.1 --- changelog.txt | 11 +++++++++++ engine/Monstra.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index f75d2f48..923d3741 100755 --- 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 index 3d4f51ff..ef45454b 100644 --- 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