cakephp2-php8/cake/libs
predominant 52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
..
cache Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
controller Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
log Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
model Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
view Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
cache.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
cake_log.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
cake_session.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
cake_socket.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
class_registry.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
configure.php Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
debugger.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
error.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
file.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
folder.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
http_socket.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
i18n.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
inflector.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
l10n.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
magic_db.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
multibyte.php Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
object.php Change access modifier on _stop() to protected. 2010-04-09 13:24:23 +10:00
overloadable.php Moved PHP5 Overloadable class to Overloadable. 2010-04-05 16:40:40 +10:00
router.php Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
sanitize.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
security.php Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
set.php Merge remote branch 'origin/1.2' into 1.3 2010-03-27 16:28:00 -04:00
string.php Adding and correcting doc blocks. 2010-03-28 12:53:57 -04:00
validation.php Change private methods to specify access, and add proected on methods that missed mass updates. 2010-04-09 13:33:25 +10:00
xml.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00