mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
mark_story
d904ab00fa
Merge branch '2.0' into 2.1
2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8
fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464
2012-01-27 00:16:22 +01:00
Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -04:30
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
1693478889
Adding test for #GH424
2012-01-19 21:50:51 -05:00
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
a7662eba57
fixing doc comment identation
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc
Implementing RequestHandler::checkNotModified() as a helper for HTTP caching
2012-01-19 01:08:44 -04:30
Mark Story
b76f8f8832
Merge pull request #260 from tPl0ch/2.1-authenticate
...
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
2012-01-12 18:53:19 -08:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc
Fix errors generated when option['order'] is undefined.
...
Fixes #2447
2012-01-08 21:55:51 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Mark Story
83b28c42cf
Fix failing tests and missing boundary markers.
...
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
mark_story
f1b566b88e
Fix failing tests.
...
Remove duplicated test.
2011-12-15 23:45:13 -05:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
Kyle Robinson Young
5388237099
Consistently setting setUp() and tearDown() on test cases
2011-12-04 13:27:51 -08:00
mark_story
9296f770d5
Adding SecurityComponent::$csrfLimit
...
This property allows you to control the number of tokens
that will be kept active. Its possible to make really large
CSRF collection sizes. Capping the number of tokens allows developers
to better control session sizes.
2011-12-03 20:13:17 -05:00
mark_story
e421b3bc8f
Adding SecurityComponent::generateToken()
...
This method allows end developers to add the csrf tokens
manually, if they aren't added automatically.
Tokens are cheap to generate, simplifying the logic
makes things a bit easier to understand.
2011-12-03 20:13:03 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
a56ad0ccac
Fixing failing tests.
2011-11-28 21:36:44 -05:00
Jose Lorenzo Rodriguez
f6534d2962
Fixing issue where changing the case for an action in the url would allow the action in the AuthComponent making it accessible to not-logged in users
2011-11-28 00:52:47 -04:30
mark_story
b0d0e06b97
Update RequestHandler tests for new View classes.
2011-11-27 23:51:49 -05:00
Ceeram
f57c287c43
fixing test to ensure tests dont fail on 1 second timestamp diff
2011-11-22 17:21:00 +01:00
Ceeram
7d6637f55b
ensure test doesnt fail by 1 second diff in timestamp
2011-11-22 10:57:36 +01:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
m
2957a33b23
assertEqual to assertEquals in core test files
...
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-19 09:25:03 -05:00
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Kyle Robinson Young
98f03dc6df
Replacing test case compatibility functions
2011-11-16 21:07:08 -05:00
Ceeram
e5c8a446d6
Add sorting on joined model virtual field, fixes #2250
2011-11-17 00:18:12 +01: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
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
mark_story
bfd95d0e04
Fixing remaining failing tests in PHPUnit 3.6
2011-11-04 22:54:09 -04:00
mark_story
d68053c4d4
Fix exception expectations.
...
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
2011-11-04 22:54:08 -04:00
mark_story
550076d75e
Fix issue in RequestHandlerComponent.
...
Fixes issues where response and request properties would
not be set as the initialize() callback would have not fired.
Fixes #2190
Fixes #2189
2011-10-31 22:41:43 -04:00
José Lorenzo Rodríguez
f51be0a82c
Merge pull request #278 from Danielpk/enhancement_auth_deny
...
Added enhancement to AuthComponent::deny().
2011-10-30 15:38:21 -07:00
Daniel Pakuschewski
7cde0b654c
Removed tests for deny('*') to prevent people get confused with it
2011-10-29 13:57:04 -02:00
Daniel Pakuschewski
09579198a9
Droped support to deny('*').
2011-10-29 13:54:35 -02:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
Daniel Luiz Pakuschewski
8738ef3dc2
Added tests to deny() and deny('*')
2011-10-26 22:07:57 -02:00
mark_story
e457c14dec
Fix issues with stateless authentication.
...
Cookies and sessions are no longer required for stateful authentication.
AuthComponent::user() also works correctly in these situations as well.
Fixes #2134
2011-10-23 12:54:51 -04:00
Graham Weldon
b165acd926
Fixed EmailComponent test
2011-10-23 00:28:47 +11:00
Thomas Ploch
521dff8468
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate to have a bit more fine grained control in custom Authenticate objects.
2011-10-19 17:54:08 +02:00