<feed xmlns='http://www.w3.org/2005/Atom'>
<title>prado/framework/Web/UI/WebControls/THtmlArea.php, branch prado-3.2</title>
<subtitle>Fork of Prado PHP framework</subtitle>
<id>https://emkael.info/cgit/prado/atom/framework/Web/UI/WebControls/THtmlArea.php?h=prado-3.2</id>
<link rel='self' href='https://emkael.info/cgit/prado/atom/framework/Web/UI/WebControls/THtmlArea.php?h=prado-3.2'/>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/'/>
<updated>2014-08-21T15:32:55Z</updated>
<entry>
<title>Fix #515</title>
<updated>2014-08-21T15:32:55Z</updated>
<author>
<name>Fabio Bas</name>
<email>ctrlaltca@gmail.com</email>
</author>
<published>2014-04-20T17:42:36Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=e3811f0ba597a2b3fe477000f7f54bf75680fbe1'/>
<id>urn:sha1:e3811f0ba597a2b3fe477000f7f54bf75680fbe1</id>
<content type='text'>
(cherry picked from commit f95623e43ce5829b91d1fde0e7978aca96e3e936)
</content>
</entry>
<entry>
<title>Removed all @version $Id comments: they were managed by svn and are useless with git</title>
<updated>2014-08-21T15:21:19Z</updated>
<author>
<name>Fabio Bas</name>
<email>ctrlaltca@gmail.com</email>
</author>
<published>2014-01-06T21:44:30Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=dcaa0390c1d1335f47f0dd4b8784dc550e3d9f93'/>
<id>urn:sha1:dcaa0390c1d1335f47f0dd4b8784dc550e3d9f93</id>
<content type='text'>
(cherry picked from commit 3e9969766153839abfb7de59e0c778a604bfbf55)

Conflicts:
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
</content>
</entry>
<entry>
<title>Happy 2014!</title>
<updated>2014-08-21T15:20:54Z</updated>
<author>
<name>Fabio Bas</name>
<email>ctrlaltca@gmail.com</email>
</author>
<published>2014-01-06T21:41:46Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4'/>
<id>urn:sha1:fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4</id>
<content type='text'>
(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php
</content>
</entry>
<entry>
<title>Update to 3.2.1</title>
<updated>2013-04-24T07:59:48Z</updated>
<author>
<name>Ciro Mattia Gonano</name>
<email>ciromattia@gmail.com</email>
</author>
<published>2013-04-24T07:59:46Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=daa4dde508865ef0f08e584987b0695d4847809a'/>
<id>urn:sha1:daa4dde508865ef0f08e584987b0695d4847809a</id>
<content type='text'>
</content>
</entry>
<entry>
<title>bumped year to 2013, integrated recent changes from branch/3.2</title>
<updated>2013-01-19T10:17:39Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2013-01-19T10:17:39Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=f2a2465a97591ad478ba6b99dc4bb55b09620452'/>
<id>urn:sha1:f2a2465a97591ad478ba6b99dc4bb55b09620452</id>
<content type='text'>
</content>
</entry>
<entry>
<title>happy new year</title>
<updated>2012-07-12T10:55:10Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2012-07-12T10:55:10Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=3e4e6e66aeb3f8fea4e1eb4237498ef9d2358f63'/>
<id>urn:sha1:3e4e6e66aeb3f8fea4e1eb4237498ef9d2358f63</id>
<content type='text'>
</content>
</entry>
<entry>
<title>committed additional patch for #235</title>
<updated>2012-06-01T18:01:40Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2012-06-01T18:01:40Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=182630cd8c5d3db97dd4e3654540300b6d822e2d'/>
<id>urn:sha1:182630cd8c5d3db97dd4e3654540300b6d822e2d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>fix a regression in THtmlArea introduced in r3148</title>
<updated>2012-06-01T08:07:52Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2012-06-01T08:07:52Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=579d16245fd64ded09792b33e9411ed9832bac27'/>
<id>urn:sha1:579d16245fd64ded09792b33e9411ed9832bac27</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Patch for #404</title>
<updated>2012-05-28T06:56:42Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2012-05-28T06:56:42Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=aec092c914fb4a78fbc46361839822928694aca4'/>
<id>urn:sha1:aec092c914fb4a78fbc46361839822928694aca4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>fix for #377</title>
<updated>2011-12-06T16:26:40Z</updated>
<author>
<name>ctrlaltca@gmail.com</name>
<email></email>
</author>
<published>2011-12-06T16:26:40Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=c35b6041631a11aa7ba822d03b3ad13794db17f9'/>
<id>urn:sha1:c35b6041631a11aa7ba822d03b3ad13794db17f9</id>
<content type='text'>
</content>
</entry>
</feed>
