Norio Suzuki
33c21b304e
fixed: change test property CakeEmail::charset to CakeEmail::headerCharset
2011-10-19 18:19:17 +09: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
Graham Weldon
86a081463c
Added content transfer encoding detection based on charset.
2011-10-19 16:02:31 +11:00
Graham Weldon
e3898585be
Added test for content transfer encoding for iso-2022-jp. Thanks @suzuki
2011-10-19 15:49:30 +11:00
Graham Weldon
cef441c16b
Added test for ISO-2022-JP to demonstration fail for charset. Thanks @suzuki
2011-10-19 15:32:20 +11:00
Graham Weldon
bd291456e8
Changed CakeEmail transport to 8bit
2011-10-19 15:20:55 +11:00
Graham Weldon
cdc21e46cb
Changed expectation for CakeEmail to 8bit for transport.
2011-10-19 15:20:09 +11: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
AD7six
485c15d55d
went missing in the merge
...
from 92d028630c
2011-10-18 17:49:52 +02:00
AD7six
a538c5d220
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
2011-10-18 17:46:00 +02:00
0x20h
abb9a86310
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1
2011-10-18 15:25:23 +02:00
AD7six
13f5ec1ca8
Merge branch '2.1' into 2.1-simpler-test
2011-10-18 15:21:38 +02:00
mark_story
92d028630c
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/VERSION.txt
2011-10-18 08:57:44 -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
AD7six
d309df9efe
update version file to be representative
2011-10-18 12:32:07 +02:00
AD7six
25ce1cc823
remove inherited logic
2011-10-18 12:28:52 +02:00
AD7six
2e547cad19
revert to original code
2011-10-18 12:24:59 +02:00
AD7six
11a11bf583
add a backwards compatibility shell for the previous syntax
2011-10-18 12:18:50 +02:00
AD7six
868f8d21ad
don't duplicate the arguments description
2011-10-18 12:18:01 +02:00
AD7six
cccb6e9867
the category will say app
...
because it's under app
2011-10-18 12:00:46 +02:00
AD7six
1dae2735af
more not a a test tests
2011-10-18 11:58:34 +02:00
AD7six
230d67976d
add a test for mapping not-test files to nothing
2011-10-18 11:57:14 +02:00
AD7six
27fa6a8cdd
add test checking that tests map to .. tests.
2011-10-18 11:54:58 +02:00
AD7six
71ce18de8b
use constants for APP and CAKE
2011-10-18 11:48:12 +02:00
AD7six
baf1ce93f2
add a plugin parsing test
2011-10-18 11:40:53 +02:00
AD7six
4addd9faae
a random test
2011-10-18 11:37:47 +02:00
AD7six
f82ae66790
add a couple of tests for detecting the right app file
2011-10-18 11:36:30 +02:00
AD7six
6ab5f1f2a2
make it possible to test for files that don't exist
2011-10-18 11:02:08 +02:00
AD7six
d492c86ddc
update main descrition
2011-10-18 10:28:05 +02:00
AD7six
511207494e
remove incorrect description text
2011-10-18 10:24:09 +02:00
AD7six
6ccb1f2fb0
update test case
2011-10-18 10:21:53 +02:00
AD7six
b4228dcaee
Merge branch '2.1' into 2.1-simpler-tests
2011-10-18 10:03:32 +02: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
