Ceeram
d3f9cc10b5
fix failing test
2013-01-10 18:10:24 +01:00
mark_story
4c98e39c1f
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Controller/Component/SecurityComponent.php
2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c
Blackhole requests when the action is the blackhole callback.
...
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.
Fixes #3496
2012-12-29 11:43:06 -05:00
Majna
6d75d90c25
Code cleanup
...
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
2012-12-28 23:37:58 +01:00
ADmad
fd16b8a1e5
Throw exception if requested page number is out of range.
...
Closes #3459
2012-12-28 01:37:25 +05:30
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08:00
ADmad
fce07bd5b8
Fix failing test
2012-12-23 03:32:25 +05:30
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
ADmad
1de8ed18de
Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code.
2012-11-30 11:26:10 +05:30
mark_story
35d67bf4a8
Merge branch 'master' into 2.3
2012-11-28 21:00:30 -05:00
mark_story
966c69cb98
Fix missing plugin parameters in scaffolding.
...
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.
Fixes #3396
2012-11-27 21:59:06 -05:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Ceeram
aaf2d2ef71
fix remaining cs errors
2012-11-04 13:56:13 +01:00
mark_story
83d307e545
Try to set order on more things.
2012-10-24 22:38:15 -04:00
mark_story
9e0778951a
Add some fixed orders.
...
Hopefully this makes tests in postgres more reliable.
2012-10-24 21:27:01 -04:00
mark_story
57681ff115
Fix code style errors.
2012-10-09 13:20:53 -04:00
ADmad
1c0492eb8b
Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591
2012-10-04 18:40:57 +05:30
euromark
b7f1740d2b
correcting coding-standards
2012-09-28 13:49:51 +02:00
mark_story
ea784f68dc
Try skipping blowfish tests if hashes are wrong.
...
Another attempt at fixing failing tests on travisci.
2012-09-26 22:00:52 -04:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
mark_story
d3ba9703a5
Try to make some time related test failures go away.
2012-09-20 21:07:14 -04:00
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check())
2012-09-04 01:04:48 +02:00
Ceeram
f1ce3f9ae5
remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed
2012-08-27 11:42:57 +02:00
Heath Nail
d24bbcb255
Add BlowfishAuthenticate adapter.
2012-08-23 11:23:51 -04:00
mark_story
11227f5490
Fix coding standards.
2012-08-10 21:50:37 -04:00
Ceeram
ab7dd99e43
add missing docblock, remove unneeded code
2012-08-10 11:05:19 +02:00
Ceeram
7ea1a59035
adding test for viewClass mapping
2012-08-10 10:33:37 +02:00
Tigran Gabrielyan
617d470427
Renamed disabledActions to unlockedActions
2012-08-03 11:01:19 -07:00
Tigran Gabrielyan
df8ec17626
Added disabledActions feature to SecurityComponent
2012-08-02 18:27:52 -07:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
Spencer Ellinor
6c1b05a5d4
Modify test case to show the issue.
2012-07-25 15:06:56 -04:00
José Lorenzo Rodríguez
a7865b5d1d
Removing some new by reference calls
2012-07-19 14:24:12 -05:30
Christian Winther
bce82a2322
Better custom find for pagination
...
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
2012-07-19 15:57:51 +02:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
AD7six
2967a4db23
text/javascript is not the correct mime for js
2012-07-06 13:17:15 +02:00
Rachman Chavik
22373868bb
if blackHoleCallback is set, requests _must_ get blackholed
2012-07-03 19:27:02 +07:00
mark_story
3e28326d9c
Fix Controller::beforeRedirect() and array return.
...
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.
Fixes #2973
2012-06-24 12:03:31 -04:00
AD7six
d5cf2765dd
remove referencers to fixtures that don't exist
2012-06-18 16:40:37 +02:00
mark_story
8da42dfcfa
Merge branch '2.1' into 2.2
2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb
Fix page 0 issue.
...
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70
Restrict page number passed to view.
...
Limit the page number to the max page number when passing data to the
view. This prevents the helper from generating a huge number of links.
Fixes #2929
2012-06-02 20:26:09 -04:00
Ceeram
6c9b2a1fec
Fix user() return value for nested data
2012-05-31 15:13:24 +02:00
mark_story
1c0f97ea67
Fix some minor code style issues.
2012-05-27 14:20:19 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
mark_story
a3a2655fd5
Fix whitespace errors.
2012-05-11 21:38:21 -04:00
Frank de Graaf
2be9ac8888
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
2012-05-10 20:55:45 -04:30
Frank de Graaf
7bb56e7fc3
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
2012-05-04 16:58:51 +02:00
