<feed xmlns='http://www.w3.org/2005/Atom'>
<title>prado/framework/Security/TUserManager.php, branch 3.2.4</title>
<subtitle>Fork of Prado PHP framework
</subtitle>
<id>https://emkael.info/cgit/prado/atom?h=3.2.4</id>
<link rel='self' href='https://emkael.info/cgit/prado/atom?h=3.2.4'/>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/'/>
<updated>2014-08-21T15:21:19Z</updated>
<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>standardize the use of unix eol; use svn properties to enforce native eol</title>
<updated>2012-07-12T11:21:01Z</updated>
<author>
<name>ctrlaltca</name>
<email></email>
</author>
<published>2012-07-12T11:21:01Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=903ae8a581fac1e6917fc3e31d2ad8fb91df80c3'/>
<id>urn:sha1:903ae8a581fac1e6917fc3e31d2ad8fb91df80c3</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>updated year information on all framework sources where possible (Copyright &amp;copy; 2005-2008 PradoSoft =&gt; Copyright &amp;copy; 2005-2011 PradoSoft)</title>
<updated>2011-06-20T15:24:57Z</updated>
<author>
<name>ctrlaltca@gmail.com</name>
<email></email>
</author>
<published>2011-06-20T15:24:57Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=444579affdb1d09813b2be89a59c4f10c8f4ba9b'/>
<id>urn:sha1:444579affdb1d09813b2be89a59c4f10c8f4ba9b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge from 3.2 branch. </title>
<updated>2009-05-27T13:55:58Z</updated>
<author>
<name>Christophe.Boulain</name>
<email></email>
</author>
<published>2009-05-27T13:55:58Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=7d15c048340cbcbd06cb9664b479d45906d2b0d8'/>
<id>urn:sha1:7d15c048340cbcbd06cb9664b479d45906d2b0d8</id>
<content type='text'>
Beginning of Prado 3.2 development
</content>
</entry>
<entry>
<title>work on php style configuration</title>
<updated>2008-12-07T13:05:05Z</updated>
<author>
<name>carlgmathisen</name>
<email></email>
</author>
<published>2008-12-07T13:05:05Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=736e92efbc75908a2bf26fe333a03990e3bb8100'/>
<id>urn:sha1:736e92efbc75908a2bf26fe333a03990e3bb8100</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge from trunk</title>
<updated>2008-12-03T14:22:03Z</updated>
<author>
<name>christophe.boulain</name>
<email></email>
</author>
<published>2008-12-03T14:22:03Z</published>
<link rel='alternate' type='text/html' href='https://emkael.info/cgit/prado/commit/?id=6228873cf9d6471463d2413e7dfd7447f759baf2'/>
<id>urn:sha1:6228873cf9d6471463d2413e7dfd7447f759baf2</id>
<content type='text'>
</content>
</entry>
</feed>
