Prepare for 3.3.1 release

7 files changed, 17 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index e6fb420a..89cea5cd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,4 @@
-Version 3.3.1 XXX XX, 2016
+Version 3.3.1 April 19, 2016
 
 BUG: Issue #540 - Fix TActiveFileUpload on IE11 (ctrlaltca)
 BUG: Issue #574 - Fix TActiveCustomValidator validation after error (ctrlaltca)
@@ -15,7 +15,7 @@ BUG: TJuiDialog: avoid "cannot call methods on dialog prior to initialization" e
 BUG: Fix callback update of TActiveCheckBoxList when initially empty (LCSKJ)
 ENH: Issue #562 - Added TClientStyleSheet::PradoStyles (ctrlaltca)
 ENH: Issue #569 - Improved TJavascriptLogger / browser console logging of errors (ctrlaltca)
-ENH: Issue #587 - Misc foxed for PHP7 compatibility (emkael)
+ENH: Issue #587 - Misc fixes for PHP7 compatibility (emkael)
 ENH: Applied some misc optimizations to class serialization (ctrlaltca)
 ENH: Intercept fatal errors using register_shutdown_function (ctrlaltca)
 ENH: Activecontrols: avoid updating client side if the value didn't change (ctrlaltca)
diff --git a/composer.json b/composer.json
index 470c1ac0..5b429a16 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
 		"satooshi/php-coveralls": "dev-master"
 	},
 	"provide" : {
-		"pradosoft/prado" : "3.3.0"
+		"pradosoft/prado" : "3.3.1"
 	},
 	"suggest" : {
 		"ext-apc" : "*",
diff --git a/demos/site/protected/Pages/Home.page b/demos/site/protected/Pages/Home.page
index ea8e1e0f..7e7a7abf 100755
--- a/demos/site/protected/Pages/Home.page
+++ b/demos/site/protected/Pages/Home.page
@@ -37,7 +37,13 @@
   <div id="articles">
 
     <div class="article">
-      <h3>Prado 3.3.0 is released!</h3>
+      <h3>Prado 3.3.1 is released</h3>
+      <span class="date">April 19, 2016</span>
+      <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.1</span>.<br><br>Release 3.3.1 is a bugfix release for the recently released 3.3 "jQuery" PRADO branch. A few problems popped up on the new jQuery based controls, and they've been fixed. We also reworked a bit the way class autoloading works to make PRADO more friendly with 3rdparty libraries. Another area of improvement is error handling on fatal errors and a more developer friendly error reporting when using AJAX. More changes happened under the hood, please have a look at the full <a href="https://raw.githubusercontent.com/pradosoft/prado/master/HISTORY">changelog</a> for more informations.<br><br>As usual, if you find a problem, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it.<br><br>Have a good time coding!<br><br>The PRADO Group
+    </div>
+
+    <div class="article">
+      <h3>Prado 3.3.0 is released</h3>
       <span class="date">February 15, 2016</span>
       <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.0</span>.<br><br>Release 3.3.0 is the very first PRADO release to introduce jQuery is the javascript framework of choice. Our first directive is to modernize the framework while keeping old code working, so all the existing PRADO controls have already been ported, and prototype is still included to provide backward compatibility for custom controls. Anyway, updating custom controls is probably a good idea. Have a look at the <a href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Upgrading32">Upgrading from v3.2</a> page in the Quickstart tutorial for more informations.<br><br>For any issue, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it in the next version.<br><br>Happy coding!<br><br>The PRADO Group
     </div>
@@ -49,7 +55,7 @@
     </div>
     
     <div class="article">
-      <h3>Prado 3.2.4 is released!</h3>
+      <h3>Prado 3.2.4 is released</h3>
       <span class="date">August 26, 2014</span>
       <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.2.4</span>.<br><br>This release backports a number of significative bugfixes and changes from the master branch where the new, jQuery-based Prado is been developed.<br>This release officially introduces <a target="_blank" href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Wsat" class="bb-url">Wsat</a>, an useful tool coded by DarthDaniel that can help out generating Active Record classes.<br><br>This release should be an easy plug-in update from previous 3.2.x Prado versions, without any backwards-compatibility issue; anyway, if you find any problem feel free&nbsp; to report it, and we'll take care of sorting it out.<br><br>Finally, some words on the current development.<br>We have some new members helping out the development: welcome in Daniel and David! Many thanks goes to them and also to all the others that have reported issues and fixes on the project's <a target="_blank" href="https://github.com/pradosoft/prado" class="bb-url">github pages</a>.<br><br>Enjoy!<br><br>The PRADO Team</p>
     </div>
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index d9c49898..34f8bf0f 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -69,7 +69,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.3.0';
+		return '3.3.1';
 	}
 
 	/**
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 0a1c485d..3778903e 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -271,7 +271,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.3.0',
+	Version: '3.3.1',
 
 	/**
 	 * Registry for Prado components
diff --git a/framework/pradolite.php b/framework/pradolite.php
index 6823f16d..6cbcb390 100644
--- a/framework/pradolite.php
+++ b/framework/pradolite.php
@@ -25,7 +25,7 @@ class PradoBase
 	protected static $classExists = array();
 	public static function getVersion()
 	{
-		return '3.3.0';
+		return '3.3.1';
 	}
 	public static function initErrorHandlers()
 	{
diff --git a/index.html b/index.html
index a6dc9c7c..fa869d07 100644
--- a/index.html
+++ b/index.html
@@ -8,8 +8,8 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.3.0<br>
-Copyright&copy; 2004-2015 by <a href="https://github.com/pradosoft">The PRADO Group</a><br>
+<p>Version 3.3.1<br>
+Copyright&copy; 2004-2016 by <a href="https://github.com/pradosoft">The PRADO Group</a><br>
 All Rights Reserved.
 </p>
 
@@ -155,7 +155,7 @@ The PRADO framework and the included demos are free software. They are released
 the terms of the following BSD License.
 </p>
 <p>
-Copyright 2004-2015 by The PRADO Group (https://github.com/pradosoft)<br/>
+Copyright 2004-2016 by The PRADO Group (https://github.com/pradosoft)<br/>
 All rights reserved.
 </p>
 <p>