From 57987c93c15da02d6e39ab238f0abc40fe11dc4a Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sat, 23 Aug 2014 13:44:48 +0200
Subject: Updated version number and  changes log

---
 HISTORY                                            | 28 ++++++++++++++++++++++
 UPGRADE                                            |  4 ++--
 buildscripts/texbuilder/quickstart/quickstart.tex  |  2 +-
 composer.json                                      | 12 +++++++++-
 .../pages/Controls/Samples/TConditional/Home.page  |  4 ++--
 .../pages/GettingStarted/NewFeatures.page          |  7 ++++++
 framework/PradoBase.php                            |  2 +-
 framework/Web/Javascripts/source/prado/prado.js    |  2 +-
 index.html                                         |  2 +-
 9 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/HISTORY b/HISTORY
index ef7b7d60..d6eec406 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,31 @@
+Version 3.2.4 Aug XX, 2014
+
+BUG: Issue #492 - Prado generates json_error when encoding an exception with non UTF-8 data (david0)
+ENH: Issue #494 - Adding toArray() and toJSON() to TActiveRecord (dmarko484)
+BUG: Issue #498 - Typo in TActiveFileUpload (Jens-mB)
+BUG: Issue #499 - Avoid scrolling when calling TControl::focus() (david0)
+BUG: Issue #502 - TSlider behaves strangely in TTabView (ctrlaltca)
+BUG: Issue #504 - Default Button cannot be referenced by <subControlId>.<controlId> (ctrlaltca)
+BUG: Issue #506 - Unused lines of code in TLiteralColumn::initializeCell (cross)
+BUG: Issue #511 - TActivePager's ButtonCssClass property is not rendered in buttons (ctrlaltca)
+BUG: Issue #515 - THtmlArea should override Readonly property (ctrlaltca)
+BUG: Issue #516 - Check Validators in TActiveEditCommandColumn (ctrlaltca)
+BUG: Issue #517 - TXmlDocument adjustment (gnit)
+BUG: Issue #518 - Runtime Notice in Gettext::factory() (ctrlaltca)
+BUG: Issue #519 - For MySQL in case PDO::CASE_LOWER creating table info does not work (ganiuszka)
+BUG: Issue #246 - Refix: User date() instead of gmdate() in TLogRoute (drigolin)
+BUG: Issue #520 - Unknown runtime error with Internet Explorer 8 (david0)
+BUG: Issue #524 - JSON error (5): Malformed UTF-8 characters when encoding callback response (david0)
+BUG: Issue #526 - TJsonRpcProtocol::callMethod, requested method is called twice (jojoinside)
+BUG: Issue #527 - TJsonRpcProtocol::callMethod, semicolon must be removed (jojoinside)
+ENH: Ported tests to Selenium2
+ENH: avoid duplicate creation of T*CheckBoxList, T*RadioButtonList js items (ctraltca)
+BUG: Avoid an exception loop on callback error when headers have already been sent (ctrlaltca)
+BUG: Avoid rendering <script> blocks in callbacks (ctrlaltca)
+BUG: Avoid dependency loop between TRadioButton and TRadioButtonList (ctrlaltca)
+ENH: Dropped Markdown for Parsedown (ctrlaltca)
+ENH: Web site administration tool (WSAT) (Daniel Sampedro) 
+
 Version 3.2.3 Nov 26, 2013
 
 BUG: Issue #467 - TSafeHtml error on php 5.5 (ctrlaltca)
diff --git a/UPGRADE b/UPGRADE
index 51f0304d..2c4aae4a 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
 
-         Upgrading Instructions for PRADO Framework v3.2.3
+         Upgrading Instructions for PRADO Framework v3.2.4
          =================================================
 
 !!!IMPORTANT!!!
@@ -9,7 +9,7 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions
 for both A and B.
 
-Upgrading from v3.2.2
+Upgrading from v3.2.3
 ---------------------
 
 Upgrading from v3.2.1
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 29c76afc..396f7bb3 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,7 +52,7 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.2.4 Quickstart Tutorial
     \thanks{Copyright 2004-2014. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
diff --git a/composer.json b/composer.json
index 26c41985..baabd17a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,16 @@
 			"email": "rojaro@gmail.com",
 			"role" : "Developer"
 		},
+		{
+			"name": "Daniel Sampedro Bello",
+			"email": "darthdaniel85@gmail.com",
+			"role" : "Developer"
+		},
+		{
+			"name": "David Otto",
+			"email": "ottodavid@gmx.net",
+			"role" : "Developer"
+		},
 		{
 			"name": "Ciro Mattia Gonano",
 			"email": "ciromattia@gmail.com",
@@ -47,7 +57,7 @@
 		"satooshi/php-coveralls": "dev-master"
 	},
 	"provide" : {
-		"pradosoft/prado" : "3.2.3"
+		"pradosoft/prado" : "3.2.4"
 	},
 	"suggest" : {
 		"ext-apc" : "*",
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 5702970a..a7383e8d 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
@@ -1,9 +1,9 @@
 <com:TContent ID="body">
 <h1>TConditional Samples</h1>
 
-<com:TConditional Condition="Prado::getVersion()==='3.2.3'">
+<com:TConditional Condition="Prado::getVersion()==='3.2.4'">
 <prop:TrueTemplate>
-  <com:TLabel Text="You are using PRADO 3.2.3" />
+  <com:TLabel Text="You are using PRADO 3.2.4" />
 </prop:TrueTemplate>
 <prop:FalseTemplate>
   <com:TLabel Text="You are using PRADO <%= Prado::getVersion() %>" />
diff --git a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
index 95bcc57f..1d314d8a 100755
--- a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
+++ b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
@@ -6,6 +6,13 @@
 This page summarizes the main new features that are introduced in each PRADO release.
 </p>
 
+<h2 id="8001">Version 3.2.4</h2>
+<ul>
+<li>Added Adding toArray() and toJSON() to TActiveRecord</li>
+<li>Dropped Markdown for Parsedown, supporting GitHub Flavored Markdownp's extension</li>
+<li>Web site administration tool (WSAT)</li>
+</ul>
+
 <h2 id="8001">Version 3.2.3</h2>
 <ul>
 <li>Added <a href="?page=Controls.HtmlArea4">THtmlArea4 control</a> based on TinyMCE4</li>
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index a7dca216..407411b7 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -69,7 +69,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.2.3';
+		return '3.2.4';
 	}
 
 	/**
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 05f11dcd..1b3bd7c8 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -8,7 +8,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.2.3',
+	Version: '3.2.4',
 	
 	/**
 	 * Registry for Prado components
diff --git a/index.html b/index.html
index 4fb55fcf..e35a5d63 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.2.3<br>
+<p>Version 3.2.4<br>
 Copyright&copy; 2004-2014 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
 All Rights Reserved.
 </p>
-- 
cgit v1.2.3