summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-25 19:48:58 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-25 19:48:58 +0100
commit10ccdbf5179ff6aa3cb7a170cd8c0b908492569f (patch)
tree08301487cffc0fc3cf50383fff3c214cb626afc5
parentc73fd6154d3b6413b3a2532ce4da0e03473ad05e (diff)
Updated version to 3.2.3
-rw-r--r--UPGRADE5
-rwxr-xr-xdemos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page4
-rwxr-xr-xdemos/quickstart/protected/pages/GettingStarted/NewFeatures.page2
-rw-r--r--framework/PradoBase.php2
-rw-r--r--framework/Web/Javascripts/source/prado/prado.js2
-rw-r--r--index.html2
6 files changed, 11 insertions, 6 deletions
diff --git a/UPGRADE b/UPGRADE
index 73a093bb..51f0304d 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
- Upgrading Instructions for PRADO Framework v3.2.2
+ Upgrading Instructions for PRADO Framework v3.2.3
=================================================
!!!IMPORTANT!!!
@@ -9,6 +9,9 @@ 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.1
---------------------
- TEmailAddressValidator's CheckMXRecord property now defaults to false.
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 9e37b675..5702970a 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.2'">
+<com:TConditional Condition="Prado::getVersion()==='3.2.3'">
<prop:TrueTemplate>
- <com:TLabel Text="You are using PRADO 3.2.2" />
+ <com:TLabel Text="You are using PRADO 3.2.3" />
</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 897b45f0..95bcc57f 100755
--- a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
+++ b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
@@ -9,6 +9,8 @@ This page summarizes the main new features that are introduced in each PRADO rel
<h2 id="8001">Version 3.2.3</h2>
<ul>
<li>Added <a href="?page=Controls.HtmlArea4">THtmlArea4 control</a> based on TinyMCE4</li>
+<li>Added support for Behaviors, Class Behaviors, fx global events, and dy one to one events</li>
+<li>Added the ability to set a priority (order) to event handlers</li>
</ul>
<h2 id="8001">Version 3.2.2</h2>
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 84826f15..6e884cec 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -71,7 +71,7 @@ class PradoBase
*/
public static function getVersion()
{
- return '3.2.2';
+ return '3.2.3';
}
/**
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index b827b125..05f11dcd 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.2',
+ Version: '3.2.3',
/**
* Registry for Prado components
diff --git a/index.html b/index.html
index fadd51ca..37a2a60d 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
<body>
<h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.2.2<br>
+<p>Version 3.2.3<br>
Copyright&copy; 2004-2013 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
All Rights Reserved.
</p>