Tigran Gabrielyan
77f6d88a9e
Fixed bug in model validation translate
2012-04-26 21:24:22 -07:00
mark_story
46bce1a00f
Merge branch '2.1' into 2.2
2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb
Fix space indented code.
2012-04-26 22:27:34 -04:00
Mark Story
1876b2f579
Merge pull request #627 from dereuromark/2.2-utf8-test-cases
...
2.2 utf8 test cases
2012-04-26 18:14:58 -07:00
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0
Renamed method to check if the driver supports nested transaction.
2012-04-26 20:58:25 -04:00
euromark
ba8a3c5f07
added missing utf8_encode to pass tests on windows
2012-04-27 02:39:32 +02:00
Mark Story
f150ebb9cc
Merge pull request #623 from dereuromark/2.2-bake-theme-order
...
Correct order of bake themes so app and plugin precede core ones
Fixes #2825
2012-04-26 09:43:53 -07:00
Mark Story
474eb89c7d
Merge pull request #624 from tPl0ch/2.2-not-implemented
...
Added "NotImplementedException" to exceptions.php
2012-04-25 13:13:55 -07:00
Thomas Ploch
daa695b4d3
Added NotImplementedException with status code 501
2012-04-25 15:44:48 +02:00
ADmad
061483d03e
Added missing keyword
2012-04-25 11:03:26 +05:30
Juan Basso
10a4b87979
Fixed tests with nested transaction in DboSource.
2012-04-24 22:28:47 -04:00
Juan Basso
5bec15d3e1
Added file that was missing in previous commit.
2012-04-24 21:43:43 -04:00
Juan Basso
5f722cb3d4
Update nested transaction test to use InnoDB table in MySQL.
2012-04-24 21:42:32 -04:00
Juan Basso
f6288a491a
Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications.
2012-04-24 21:42:32 -04:00
mark_story
eefb2e81fa
Fix issue where prefixes mid action would be truncated.
...
If a prefix occured mid action name it would be removed,
corrupting the action name.
Fixes #2831
2012-04-24 20:48:23 -04:00
mark_story
ef1da3146e
Fix scaffold delete messages with uuids.
...
Fixes #2826
2012-04-24 20:11:58 -04:00
mark_story
4ffca8457e
Fix coding standards.
2012-04-24 20:09:39 -04:00
Juan Basso
12392b6285
Fixed variable name.
2012-04-24 20:03:43 -04:00
Juan Basso
4e480eaca5
Disabling nested transaction for fixtures.
2012-04-24 20:01:22 -04:00
Rachman Chavik
2f87992d15
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
2012-04-24 23:35:32 +07:00
Rachman Chavik
74830b9b93
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
2012-04-24 23:17:28 +07:00
Ceeram
0785ace172
fix error caused by non-existent fixture
2012-04-24 14:01:59 +02:00
Jose Lorenzo Rodriguez
6f909480e8
Merge remote-tracking branch 'origin/2.2' into 2.2
2012-04-24 00:14:13 -04:30
Juan Basso
b95f367bef
Disabled nested transactions for fixtures.
2012-04-24 00:34:28 -04:00
Jose Lorenzo Rodriguez
5674e9fd17
Another micro-optimization, sorry
2012-04-23 23:42:57 -04:30
Jose Lorenzo Rodriguez
e7a7a177cc
Merge remote-tracking branch 'origin/2.2' into 2.2
2012-04-23 23:34:45 -04:30
Jose Lorenzo Rodriguez
63c0c2c75f
Very random micro-optimizations
2012-04-23 23:29:32 -04:30
mark_story
7e38f9d79f
Fix more coding standards errors.
2012-04-23 22:27:27 -04:00
mark_story
7240286adc
Fix coding standards errors.
2012-04-23 22:01:45 -04:00
mark_story
b6de177ffa
Merge branch '2.1' into 2.2
2012-04-23 21:50:36 -04:00
mark_story
9e3fe633bb
Remove double encoding on addresses in EmailComponent.
...
CakeEmail should be handling all the encoding now, duplicating it is
silly.
Fixes #2797
2012-04-23 21:41:31 -04:00
mark_story
13468937cc
Fix singularization of databases.
...
Fixes #2822
2012-04-23 21:01:03 -04:00
euromark
acd06d6499
fixing test case
2012-04-24 02:46:20 +02:00
euromark
6353558622
bame themes now in correct order: app -> plugin -> default
2012-04-24 02:40:42 +02:00
Rachman Chavik
36275129d7
i18n: consider real path of APP to handle symlinks
...
When extracting model validation messages, Reflection::getFileName is used
to obtain the the model filename. The returned value is actual physical
path and may differ to what APP is. Adding the realpath(APP) to $paths
variable allows str_replace() to correctly generate the correct value for
$occurences.
2012-04-24 07:29:26 +07:00
Till Claassen
3f7e2f536f
CakeTestSuite::addTestDirectory() ignore non-php
...
CakeTestSuite::addTestDirectory() and addTestDirectoryRecursive()
now ignore any files that do not end in .php
This avoids any stray non-php files being parsed, especially
tilde-style backup files that end in .php~
Improves #2031
Signed-off-by: mark_story <mark@mark-story.com>
2012-04-23 12:15:29 -04:00
Mark Story
8a6417521f
Merge pull request #621 from shama/patch-bootstrap
...
Update available App::build settings in bootstrap
2012-04-23 09:13:23 -07:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Kyle Robinson Young
89d3221adc
Update available App::build settings in bootstrap
2012-04-22 21:16:00 -07:00
Juan Basso
7fe333ce4e
Merge branch '2.2-nested-transaction' into 2.2
2012-04-22 23:04:32 -04:00
Jose Lorenzo Rodriguez
ed0c5a4746
Merge branch '2.2-lazy-helpers' into 2.2
2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
53a4de7774
More coding standard fixes
2012-04-22 20:34:19 -04:30
Jose Lorenzo Rodriguez
02d222a349
Adhering to coding standards
2012-04-22 20:33:07 -04:30
Jose Lorenzo Rodriguez
042221bbf6
Merge branch '2.2-redis-engine' into 2.2
2012-04-22 19:14:24 -04:30
Jose Lorenzo Rodriguez
9f415d012c
Merge branch '2.2-cache-groups' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
4b2804bb42
Fixing broken test and coding standard
2012-04-22 17:39:45 -04:30
Jose Lorenzo Rodriguez
8465538800
Merge branch '2.2-middleware' into 2.2
2012-04-22 17:17:36 -04:30
Jose Lorenzo Rodriguez
15dcd6046b
Fixing typos
2012-04-22 17:07:43 -04:30
ADmad
b1e7164d1a
Implemented translation of validation rule arguments in validation error messages. Closes #2816
2012-04-22 23:25:07 +05:30
