Ceeram
e5c8a446d6
Add sorting on joined model virtual field, fixes #2250
2011-11-17 00:18:12 +01:00
Ceeram
3cb5188b2d
Fix failing test, moving timestamp define before the save to ensure it cannot be off by a second
2011-11-16 13:16:36 +01:00
Ceeram
025133db32
Fix tests which might fail due to unexpected order on finds
2011-11-16 13:15:14 +01:00
Ceeram
ece8b57809
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-16 13:11:14 +01:00
ADmad
8450b8bbc4
Fixing TMP cleanup code in FolderTest
2011-11-16 14:03:18 +05:30
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Daniel Pakuschewski
841c0c2295
Dropped support for wildcard in AuthComponent::allow()
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2011-11-15 23:01:04 -05:00
Ceeram
2bb4ed01be
Removing _Token from request data.
...
It is not used outside the component and could possibly affect Model::save().
Fixes #2256
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-15 22:51:04 -05:00
mark_story
6e4493cc14
Fix ambiguous content types in RequestHandler.
...
Treat xhtml + html as content types that should trigger no
response/extension setting. They are different but similar in
that they both generally use the same HTML templates.
Fixes #2257
2011-11-15 22:48:54 -05:00
José Lorenzo Rodríguez
55d4fd3be3
Merge pull request #318 from shama/folder-test
...
Add test cases to include $exceptions with Folder::chmod()
2011-11-15 09:57:48 -08:00
Ceeram
9fd04307ff
adding sort on testresults, to avoid incorrect order returned by MySQL
2011-11-15 17:18:27 +01:00
Kyle Robinson Young
1ebaaf4dd1
Update to assertEquals on Folder tests
2011-11-15 08:18:05 -08:00
Ceeram
bc5b6f7cb2
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-15 16:47:38 +01:00
Ceeram
37a932b6a7
adding testcase for saving habtm associations with no primary model data set
2011-11-15 16:47:25 +01:00
Renan Gonçalves aka renan.saddam
1db915faec
Merge pull request #314 from challet/HttpSocket_handle_redirect
...
move 'redirect' to request, and allow to use int values as ttl
2011-11-15 03:09:15 -08:00
Renan Gonçalves aka renan.saddam
9d82cd9417
Merge pull request #317 from shama/2.0
...
Add @link to File and Folder utilities
2011-11-15 02:59:45 -08:00
Ceeram
d302dabb24
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 10:12:26 +01:00
Kyle Robinson Young
d725869507
Add test cases to include $exceptions with Folder::chmod()
2011-11-14 23:58:58 -08:00
Kyle Robinson Young
3248e34819
Add @link to File and Folder utilities
2011-11-14 22:40:02 -08:00
Graham Weldon
eefdc43214
Fix plugins not being loaded before looking for pluign paths
2011-11-15 17:30:49 +11:00
ADmad
a821723347
Merge pull request #316 from shama/2.0
...
Added missing @link to docs for helpers
2011-11-13 23:10:08 -08:00
Kyle Robinson Young
4e8239a2a5
Add missing @link to docs if available to helpers
2011-11-13 22:08:20 -08:00
mark_story
87f5b6cf26
Fix more strict errors.
...
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
Jose Lorenzo Rodriguez
de5a4ead25
Releasing 2.0.3
2011-11-13 20:32:23 -04:30
Jose Lorenzo Rodriguez
7658af354c
Removing var_dump from test cases
2011-11-13 19:54:07 -04:30
mark_story
3f506b287b
Rename file.
...
Fix build error caused by legacy workaround fixes.
2011-11-13 16:48:52 -05:00
mark_story
ccefe02de9
Fix issue with duplicate class inclusions.
...
When trying to load a class that shared a prefix with an existing
class on case insensitive file systems duplicate class errors could
occur. This would happen primarily with models and missing model classes.
Fixes #2223
2011-11-13 16:15:32 -05:00
ADmad
233a63366f
Syncing files between app directory and bake skeleton
2011-11-14 02:32:59 +05:30
ADmad
87f12de1ab
Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper.
2011-11-14 02:11:18 +05:30
Mark Story
f4a04788f3
Merge pull request #315 from shama/2.0
...
Add @link to App docblocks and missing _packageFormat docblock
2011-11-13 11:12:59 -08:00
Kyle Robinson Young
dba4d21492
Add @link to App docblocks and missing _packageFormat docblock
2011-11-13 10:18:42 -08:00
Clément Hallet
ecb88791c8
move 'redirect' to request, and allow to use int values as ttl
2011-11-13 17:45:33 +01:00
mark_story
9347ca2dc8
Fix requestAction post simulation.
...
POST data should not trigger notice errors.
Also fix issue where POST data could not be simulated with a
string URL.
Fixes #2248
2011-11-13 09:44:48 -05:00
mark_story
a7fcb0a61c
Fix more strict errors.
2011-11-12 21:42:20 -05:00
mark_story
17ffcde505
Update test.
...
Add fixtures so app tables aren't touched.
Replace construction with method calls.
2011-11-12 21:42:20 -05:00
mark_story
2c7854cc2f
Replace complicated $$foo with simple variable.
2011-11-12 21:42:20 -05:00
mark_story
42f9f8e2c3
Fixing strict errors.
...
While this is a minor API change, its required to
make CakePHP pass E_STRICT in testing.
2011-11-12 21:42:20 -05:00
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
Ceeram
0c0bb60486
avoid MissingPluginExceptions
2011-11-13 03:29:54 +01:00
Ceeram
479f305e6d
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-12 20:31:32 +01:00
ADmad
38d7433359
Fixing tests broken by previous commit.
2011-11-13 00:44:56 +05:30
ADmad
1c19eada58
Fixing DispatcherTest broken by previous commit.
2011-11-12 22:51:05 +05:30
Ceeram
d8194a5818
Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0
2011-11-12 18:09:58 +01:00
ADmad
f2a58117ca
Moving AppModel, AppController, PagesController out of core to app
2011-11-12 22:30:42 +05:30
mark_story
92688e2a49
Fix keying in SessionHelper::flash()
...
It shouldb e looking for the plugin in the params key. This
makes SessionHelper compatible with SessionComponent.
2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591
Fix session flash with plugins.
...
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
2011-11-12 11:03:17 -05:00
mark_story
50b253565a
Adding more verbose info to connection errors.
...
The start page now shows the connection exception message.
Fixes #875
2011-11-11 23:04:54 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
mark_story
5934a7a324
Fix html coverage reporting.
...
HTML coverage reports now work with PHPUnit 3.6
Fixes #2235
2011-11-11 22:13:20 -05:00
