mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-07 13:46:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Awilum
2013-12-25 00:32:50 +02:00
parent 6531d3ee87 cd0d8296a5
commit 81ff2288b9
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -3,8 +3,8 @@ Monstra is a modern and lightweight Content Management System.
## System Requirements ## System Requirements
Operation system: Unix, Linux, Windows, Mac OS Operation system: Unix, Linux, Windows, Mac OS
Middleware: PHP 5.2.3 or higher with PHP's SimpleXML module and Multibyte String 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 or Ngnix with Rewrite Module 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 ## Steps to Install
1. [Download the latest version.](http://monstra.org/download) 1. [Download the latest version.](http://monstra.org/download)

11
changelog.txt
View File

@@ -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 Monstra 2.3.0, 2013-12-19
------------------------ ------------------------
- Update Twitter Bootstrap to 2.3.2 - Update Twitter Bootstrap to 2.3.2

2
engine/Monstra.php
View File

@@ -39,7 +39,7 @@ class Monstra
/** /**
* The version of Monstra * The version of Monstra
*/ */
const VERSION = '2.3.0'; const VERSION = '2.3.1';
/** /**
* Monstra environment * Monstra environment

BIN
favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

4
libraries/Gelato/Number/Number.php
View File

@@ -28,7 +28,7 @@ class Number
} }
/** /**
* Convert bytes in 'kb','mb','gb','tb','pb' * Convert bytes in 'KB','MB','GB','TiB','PiB'
* *
* <code> * <code>
* echo Number::byteFormat(10000); * echo Number::byteFormat(10000);
@@ -42,7 +42,7 @@ class Number
// Redefine vars // Redefine vars
$size = (int) $size; $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)]; return @round($size/pow(1024, ($i=floor(log($size, 1024)))), 2).' '.$unit[($i < 0 ? 0 : $i)];
} }

4
plugins/box/users/views/emails/layout_email.view.php
View File

@@ -192,7 +192,9 @@
<table width="100%" cellpadding="10" cellspacing="0" border="0"> <table width="100%" cellpadding="10" cellspacing="0" border="0">
<tr> <tr>
<td valign="top" style="font-size:11px; border-top:1px dashed #ccc; text-align:right;"> <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> </td>
</tr> </tr>
</table> </table>