cakephp2-php8/cake/libs
mark_story 443f6d1c5b Merge branch '1.3' into merger
Conflicts:
	cake/console/shells/tasks/test.php
	cake/libs/cake_log.php
	cake/libs/controller/components/email.php
	cake/libs/set.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/time.php
	cake/libs/view/view.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/shells/tasks/test.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
..
cache Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
config Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
controller Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
error Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
http Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
log Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
model Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
route Merge branch '2.0' into 2.0-pagination 2010-12-24 14:43:11 -05:00
session Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
view Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
app.php Added support for using plugin syntax in App::objects(). Fixes #1366 2011-01-03 19:27:21 -08:00
cache.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_log.php Fixing issue where CakeLog would log suppressed errors even when error reporting was disabled. Fixes #1403 2010-12-26 13:02:43 -05:00
cake_request.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_response.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_session.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_socket.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
class_registry.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
configure.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
debugger.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
dispatcher.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
file.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
folder.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
http_response.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
http_socket.php Fixing calltime pass by reference deprecation warnings. 2010-12-26 20:11:17 -05:00
i18n.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
inflector.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
l10n.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
magic_db.php Fixing more @package tags, and removing duplicate tags in classes. 2010-12-24 14:33:41 -05:00
multibyte.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
object.php Missed a package tag. 2010-12-24 14:22:40 -05:00
object_collection.php Added ControllerTestCase class for testing controllers. Fixes #1244 2010-12-14 19:58:27 -08:00
router.php Merge branch '2.0' into 2.0-pagination 2010-12-24 14:43:11 -05:00
sanitize.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
security.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
set.php Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
string.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
validation.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
xml.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00