Commit graph

11704 commits

Author SHA1 Message Date
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
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
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
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