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
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
Jose Lorenzo Rodriguez
f8772dc524
Also changing shell script in skel directory
2011-10-15 10:18:36 -04:30
mark_story
bda8df1b50
Fix issues with bash quoting and directories with spaces.
2011-10-15 09:56:04 -04:00
Graham Weldon
f81c85d86d
Moved "vendors" to "Vendor" and "plugins" to "Plugin". Thanks to @kunit and @ichikaway for the heads up.
2011-10-15 23:07:15 +11:00
Jose Lorenzo Rodriguez
36fa2e87b4
Adding symlink support to the cake console executable
2011-10-14 22:15:26 -04:30
Jose Lorenzo Rodriguez
568308d6bc
Merge branch 'tPl0ch-1.3-clibash' into 1.3
2011-10-14 22:07:01 -04:30
Jose Lorenzo Rodriguez
856b34f9f5
Correctly interpreting symlinks
2011-10-14 22:06:36 -04:30
Thomas Ploch
3b8ca96428
1.3: Added resolution of symbolic links in cake CLI bash script.
...
Removing newlines from end of file.
2011-10-14 22:06:18 -04:30
Jose Lorenzo Rodriguez
ab88f3e3f3
Merge branch 'master' of https://github.com/bfanger/cakephp into bfanger-master
2011-10-14 21:22:24 -04:30
mark_story
6d9b709c7a
Fix method signatures of database drivers.
...
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.
Fixes #2100
2011-10-14 21:25:14 -04:00
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
Gonçalo Marrafa
4adc042882
Fix association lazy-loading when used with ContainableBehavior
2011-10-14 17:53:37 -04:30
Yosuke Basuke Suzuki
0b6c93cf82
Refactoring App::build() so it looks more readable
2011-10-14 17:11:45 -04:30
Thomas Ploch
0a70963a74
Removed creation of unneeded file handle object in FileEngine::write(). Added configuration option 'mask' to FileEngine::. Now able to provide a permission mask to create cache files with specific permissions.
...
Set '0664' as default value for the 'mask' setting in FileEngine::. Adjusted corresponding test cases.
Added new warning if the file could not be opened for writing.
2011-10-14 16:47:18 -04:30
José Lorenzo Rodríguez
36c931592b
Merge pull request #247 from sitedyno/2.0-app-skel
...
Syncing the skel and app directories
2011-10-14 13:34:47 -07:00
Heath Nail
9e9b1f0382
Windows newlines for .bat files.
2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf
Incresing sync between app and skel directories.
2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b
Incresing sync between app and skel directories.
2011-10-14 15:06:36 -04:00
Ceeram
981f40758c
Fixing incorrect theme paths for plugins, tests updated. Fixes #2099
2011-10-13 15:22:10 +02:00
mark_story
4090b3e8c6
Fix content-type detection to accomodate jQuery.
...
Add tests for jQuery content type strings.
Refactor tests, add in missing assertions and missing parent calls.
The new behavior is more lenient and allows for a single requested
content type to switch the view type.
Fixes #2088
2011-10-12 23:21:07 -04:00
mark_story
7f3c5662ba
Fix issue where plugin prefixes would be included in generated view.
...
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
2011-10-12 21:09:19 -04:00
mark_story
3c611eef90
Replacing direct construction with method calls.
2011-10-12 21:00:47 -04:00
mark_story
f65d763551
Removing ?> from AppModel and AppController plugin templates.
2011-10-12 20:42:23 -04:00
