Commit graph

10237 commits

Author SHA1 Message Date
mark_story
f33329ae43 Merge branch 'acl-behavior' into 2.0
Conflicts:
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
2011-03-19 10:14:10 -04:00
mark_story
4118477c0a Merge branch '1.3' into merger
Conflicts:
	cake/console/templates/default/views/index.ctp
	cake/libs/cache.php
	cake/libs/cake_log.php
	cake/libs/cake_socket.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2011-03-19 09:08:28 -04:00
mark_story
9c860d2ce8 Changing how CakeLog registers itself as the error handler, this fixes issues with e-accelerator on some platforms. Fixes #1597, fixes #1087 2011-03-19 08:54:07 -04:00
mark_story
6d2b31d4d1 Fixing issues with plugin models used in habtm 'with' keys. Fixes #1548 2011-03-19 08:45:10 -04:00
Jamie Mill
cf0e9c0a31 Fixing undefined var and docblock error in CakeCliReporter->paintException(). 2011-03-17 19:15:08 +00:00
AD7six
e492bce64f Merge branch '2.0-translations' of github.com:AD7six/cakephp into 2.0-class-loading 2011-03-16 17:08:15 +01:00
AD7six
64e71de52a Merge branch '2.0-class-loading' of github.com:cakephp/cakephp into 2.0-class-loading 2011-03-16 17:07:22 +01:00
AD7six
69ce628f07 fix file permissions
except for app/console/cake and lib/cake/Console/cake no files should
be executable
2011-03-16 16:06:44 +01:00
AD7six
39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
AD7six
4f29f58a5e correct path to tmp and core.php file when running outside your app dir.
also wrapped HttpException class declaraion in an if !class_exists test
- the class exists in the pecl http extension.
2011-03-16 12:13:47 +01:00
mark_story
e15a373995 Merge remote branch 'rchavik/misc' into 1.3 2011-03-16 06:39:41 -04:00
Rachman Chavik
60db93a914 removing extra space in default bake template 2011-03-16 13:50:56 +07:00
Jose Lorenzo Rodriguez
8ce605ab88 Fix for regression introduced in last commit 2011-03-16 00:28:08 -04:00
Jose Lorenzo Rodriguez
3f7928fccc Changing paths againg form datasources sub packages,
Updating database.php.default file
Fixing view generation task
2011-03-16 00:14:37 -04:00
Jose Lorenzo Rodriguez
32e42aaf6f Updating more skel files 2011-03-15 23:56:28 -04:00
Jose Lorenzo Rodriguez
8213160bb1 Udating template home.ctp and providing a default skel dir in tamplate task 2011-03-15 23:48:51 -04:00
Jose Lorenzo Rodriguez
a1f5fe706a Udatint TestTask test 2011-03-15 22:59:18 -04:00
Jose Lorenzo Rodriguez
9293361562 Updating ControllerTask to crete files with new naming conventions 2011-03-15 22:23:51 -04:00
Jose Lorenzo Rodriguez
b0a7a109e9 Updating ModelTask to crete files following the new namings 2011-03-15 22:14:10 -04:00
mark_story
9ae8dcafdc Updating documentation to include new option. 2011-03-15 22:05:14 -04:00
hiromi2424
38e85ebd6e Supported default ion for FormHelper::checkbox(). Test added fixes #805
Signed-off-by: mark_story <mark@mark-story.com>
2011-03-15 22:03:04 -04:00
Jose Lorenzo Rodriguez
bd2bd4ba22 Udating skel directory, doc blocs and the location of the Console package 2011-03-15 21:53:42 -04:00
mark_story
357588c60e Updating and reorganizing tests. Removing totally redundant tests. 2011-03-15 21:39:37 -04:00
mark_story
4537499ea9 Updating doc block. 2011-03-15 21:39:15 -04:00
mark_story
c6b7482308 Making sure forms always have a generated id attribute. Updating tests. 2011-03-15 21:19:15 -04:00
Jose Lorenzo Rodriguez
2e2f5ea2a5 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-15 21:13:45 -04:00
Jose Lorenzo Rodriguez
b6b03cb379 Adding files missing from previous commit 2011-03-15 21:13:33 -04:00
ADmad
4e046c8cd0 Fixing a test case for Model::saveAll() 2011-03-16 00:56:31 +05:30
mark_story
6fd5ff34a0 Fixing incorrect test case. Thanks to hiromi2424 for pointing out the mistake. 2011-03-14 21:13:24 -04:00
mark_story
b9ec7da21d Applying patch from 'NaMB' to add disabled support to FormHelper::radio(). Test cases added as well. Fixes #1459 2011-03-13 19:35:37 -04:00
Jose Lorenzo Rodriguez
0cd51de827 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-12 23:49:02 -04:30
AD7six
45fd959907 we still want the vendors folder - creating empty file to ensure the
folder exists
2011-03-12 20:11:33 +01:00
AD7six
5861ca03d2 move readme and license to libs dimove readme and license to libs dirr 2011-03-12 20:10:58 +01:00
AD7six
904b2719b5 we don't have shells here any more 2011-03-12 20:10:32 +01:00
AD7six
a204ac7005 translation changes for tests.
excludes basics and i18n
2011-03-12 20:08:25 +01:00
AD7six
28eae99ecb translation changes in the view folder 2011-03-12 20:02:56 +01:00
AD7six
e2dfafddb2 translation changes for the Utility dir 2011-03-12 20:02:37 +01:00
AD7six
26038b13e1 translation changes in the TestSuite dir 2011-03-12 20:02:18 +01:00
AD7six
e7f39b456f translation changes in the Routing dir 2011-03-12 20:01:53 +01:00
AD7six
29b874e739 translation changes in the Network dir 2011-03-12 20:01:38 +01:00
AD7six
38180e8951 translation changes in the model dir 2011-03-12 20:01:12 +01:00
AD7six
f7e2bb1021 translation changes in the log dir 2011-03-12 20:00:55 +01:00
AD7six
afc5cd4277 changes in the error dir 2011-03-12 20:00:27 +01:00
AD7six
d264d0feb5 changes in the core dir 2011-03-12 20:00:15 +01:00
AD7six
cb7f0f087e translation changes in the controller ditranslation changes in the
controller dirr
2011-03-12 19:59:40 +01:00
AD7six
8f0c923cf6 translations for the console dir 2011-03-12 19:59:06 +01:00
AD7six
5ae97871da translations changes in the Configure folder 2011-03-12 19:50:52 +01:00
AD7six
d7f275d705 translation changes in the cache folder
modified:   lib/Cake/Network/Http/HttpResponse.php
2011-03-12 19:48:57 +01:00
AD7six
dd40e7dbfa use the 'cake' domain for any references in the app folder 2011-03-12 19:48:02 +01:00
mark_story
30a9543a65 Syncing skel folder with app folder. 2011-03-12 12:19:06 -05:00