ADmad
6177203a18
Merge pull request #264 from majna/2.0-smtp-test
...
Fixed failing smtp tests when testing on host other then hardcoded 'localhost'.
2011-10-19 11:57:06 -07:00
Majna
f361509f10
Fixed failing smtp tests when testing on host other then hardcoded 'localhost'.
2011-10-19 20:34:02 +02:00
Renan Gonçalves
fe9762d053
Making the test assert what it is intended to assert.
2011-10-19 16:48:03 +02:00
Renan Gonçalves
d1be66f2e1
Fixing failing test introduced in fb4a003522.
2011-10-19 15:57:46 +02:00
Renan Gonçalves
646b8f1aa0
Fixed issue when using multiple extensions in Router::parseExtensions() could result in undefined index notice by RequestHandlerComponent.
2011-10-19 15:36:00 +02:00
José Lorenzo Rodríguez
fb4a003522
Merge pull request #257 from rchavik/etc
...
Fixing typos and removing 'empty' files from non-empty dirs
2011-10-18 22:52:47 -07:00
Rachman Chavik
a60d71d19b
removing 'empty' files from nonempty directories
2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
95737d7adf
Fix issue writing to file cache
...
Reading/writing to the same file cache key multiple times
in a row during a single request would result in failed reads.
Fixes #2114
2011-10-18 21:21:05 -04:00
mark_story
d7155d374b
Making apc feature test rely on apc_dec.
...
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.
Fixes #2105
2011-10-18 20:48:58 -04:00
José Lorenzo Rodríguez
beac58188c
Merge pull request #256 from majna/2.0-extract-test
...
Fixing failing i18n ExtractTask tests on Windows.
2011-10-18 16:16:52 -07:00
Majna
0a9033ba1e
Fixing failing i18n ExtractTask tests on Windows.
2011-10-19 00:41:19 +02:00
ADmad
fc5a465189
Cleaning up code left over from 1.3. If no black-hole callback is specified Security::blackHole() now throws an exception. Closes #1532
2011-10-19 02:32:38 +05:30
mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
ADmad
01992dd8b7
Merge pull request #254 from jpirkey/jpirkey-20111018-fix-controller-phpdoc
...
Fixed controller phpdoc-type of Controller::$Components property
2011-10-18 05:57:21 -07:00
Jason Pirkey
eb5b4fa301
Fixing a phpdoc-type for Controller->Components property
2011-10-18 01:10:10 -04:00
mark_story
55064b6573
Applying fix from 'euromark' to fix protocol relative links
...
Fixes #2107
2011-10-17 21:03:25 -04:00
mark_story
1d8199b86d
Update the PHPUnit install instructions.
...
Fixes #2106
2011-10-17 09:36:47 -04:00
Ceeram
56b4e1e388
moved test_element.xml to correct directory, accidentally re-added during 1.3 merge
2011-10-17 11:30:18 +02:00
ADmad
1432e78431
Merge pull request #250 from majna/2.0-php-reader
...
Refactoring PhpReader::read() to check for .php file first
2011-10-16 23:17:38 -07:00
Jose Lorenzo Rodriguez
abdddd1271
Releasing 2.0.0
2011-10-16 18:33:00 -04:30
mark_story
3e17fee237
Fix error created in merge with 1.3
2011-10-16 18:58:59 -04:00
mark_story
1731b62644
Fix recursive errors caused by unwritable cache directories.
...
Fixes #2104
2011-10-16 18:51:02 -04:00
Jose Lorenzo Rodriguez
7c5352a6c2
Merge branch 'master' into 2.0
...
Conflicts:
cake/libs/controller/components/request_handler.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
cake/tests/cases/libs/view/view.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/cake
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/VERSION.txt
2011-10-16 17:56:22 -04:30
Jose Lorenzo Rodriguez
f8aa9e0851
Revert "Moved "vendors" to "Vendor" and "plugins" to "Plugin". Thanks to @kunit and @ichikaway for the heads up."
...
This reverts commit f81c85d86d
2011-10-16 17:47:55 -04:30
Majna
f0d10b4d69
Refactoring PhpReader::read() to check for .php file first. Fixed error when there's a directory with the same name.
2011-10-16 22:21:01 +02:00
Jose Lorenzo Rodriguez
e47b970811
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4
Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
...
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
mark_story
6ecbcccf25
Updating links to the book.
2011-10-16 09:36:51 -04:00
Renan Gonçalves
e37703efdd
Fixed typo from last commit.
2011-10-16 13:42:50 +02:00
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
229bf8e984
Keeping BC on short syntax for Acl and Tree behavior.
2011-10-16 12:06:41 +02:00
mark_story
924fb6f304
Updating version numbers to 1.3.13
2011-10-15 16:02:01 -04:00
mark_story
ad7db4cc54
Fix failing test.
2011-10-15 15:28:08 -04:00
mark_story
08247a921f
Fixing failing test.
2011-10-15 15:28:08 -04:00
Renan Gonçalves
3a04bb4733
Dropping short syntax support for Behavior configuration.
...
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
Renan Gonçalves
d2a664c2df
Fixing @package at in Cake/Console/Templates/skel files.
2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653
Fixing @package at in Cake/Console/Templates files.
2011-10-15 20:26:48 +02:00
Renan Gonçalves
282d322523
Fixing @package tag in Cake/View files.
2011-10-15 20:17:44 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Jose Lorenzo Rodriguez
3ed712e745
Merge branch 'burzum-docs' into 2.0
2011-10-15 12:46:33 -04:30
Florian Krämer
b6d7766e78
Updating the @link's in the doc blocks for the views
2011-10-15 12:46:22 -04:30
Jose Lorenzo Rodriguez
f23d62d411
Fixing more @link annotations
2011-10-15 12:42:23 -04:30
Jose Lorenzo Rodriguez
f9f0eedca1
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-15 12:35:01 -04:30
Jose Lorenzo Rodriguez
d1a530f53b
Fixing all @link annotations in model class
2011-10-15 12:34:31 -04:30
Renan Gonçalves
d9815dbd65
Fixing file_get_contents() call on the last commit.
2011-10-15 18:55:42 +02:00
Renan Gonçalves
704a9f454d
Moving binary data to external file, it was causing failures on other tests.
2011-10-15 18:51:48 +02:00
Jose Lorenzo Rodriguez
d406889b14
changing @link in containable behavior
2011-10-15 11:47:10 -04:30
Jose Lorenzo Rodriguez
91d0a081fb
Fixing more links in doc blocks
2011-10-15 11:38:49 -04:30
Jose Lorenzo Rodriguez
670917070e
Changing a bunch of links in doc blocks
2011-10-15 10:43:26 -04:30
