James Tancock
|
3cee029aa7
|
Removed usage of __() for InternalError
|
2015-02-12 15:09:18 +00:00 |
|
James Tancock
|
1cb670bdfa
|
Add deprecated doctag for current methods
|
2015-02-10 08:15:01 +00:00 |
|
James Tancock
|
e173c29d33
|
Fix for phpcs
|
2015-02-04 15:31:50 +00:00 |
|
James Tancock
|
2ff6bdccec
|
Back port of Flash component & helper
|
2015-02-04 12:18:31 +00:00 |
|
Mark Story
|
35e0dc2bbd
|
Merge pull request #5760 from cakephp/master
Merge master into 2.7
|
2015-01-27 20:48:15 -05:00 |
|
Mark Scherer
|
4fa5dd62c5
|
Remove conditional status setting.
|
2015-01-26 23:47:20 +01:00 |
|
Mark Scherer
|
70276b7a7a
|
Doc block adjustment.
|
2015-01-26 10:35:02 +01:00 |
|
Mark Scherer
|
e753fbadca
|
Fix ControllerTestCase redirect
|
2015-01-26 10:31:04 +01:00 |
|
mark_story
|
3078a1eb52
|
Merge branch 'master' into 2.7
Conflicts:
lib/Cake/VERSION.txt
|
2015-01-16 22:22:26 -05:00 |
|
mark_story
|
396d501d1e
|
Fix / being handled incorrect by referer()
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'
Fixes #4812
|
2015-01-15 21:26:34 -05:00 |
|
mark_story
|
ac9a212d44
|
Merge branch 'master' into 2.7
Conflicts:
lib/Cake/Utility/String.php
|
2015-01-11 15:25:18 -05:00 |
|
antograssiot
|
c2f298a8b7
|
Replace our custom code fence with markdown standard fence
|
2015-01-09 13:47:25 +01:00 |
|
euromark
|
52ecccb1a2
|
App::uses and usage replacements for String => CakeText.
|
2015-01-05 01:00:57 +01:00 |
|
Mark Story
|
7bbc3dfd90
|
Merge pull request #5470 from cakephp/2.7-session
Backport Session consume() to 2.x
|
2014-12-26 12:22:20 -05:00 |
|
euromark
|
545ff20e1d
|
Add component and helper wrapper methods.
|
2014-12-23 03:50:35 +01:00 |
|
Mark Story
|
1651e7742c
|
Merge pull request #5088 from sebastienbarre/ticket-5041
Ticket #5041: have Auth::login() send Auth.afterIdentify event
|
2014-12-18 00:12:22 -05:00 |
|
mark_story
|
4d6611b328
|
Merge branch 'master' into 2.6
Conflicts:
lib/Cake/VERSION.txt
|
2014-12-17 21:38:32 -05:00 |
|
euromark
|
e1c128bb99
|
Consolidate with conditions sniff.
|
2014-12-09 03:17:35 +01:00 |
|
mark_story
|
ad2d6edda9
|
Merge branch 'master' into 2.6
|
2014-12-06 21:28:59 -05:00 |
|
Guy Warner
|
fb61d9393b
|
Add @trigger doc blocks of methods triggering CakeEvent
|
2014-11-30 14:45:40 -07:00 |
|
Sebastien Barre
|
7da48669c8
|
Have BaseAuthenticate implement CakeEventListener instead
|
2014-11-22 13:31:38 -05:00 |
|
Sebastien Barre
|
50e5b5e8fe
|
Move App::uses() again
|
2014-11-22 13:31:38 -05:00 |
|
Sebastien Barre
|
43413f029e
|
Ticket 5041: have Auth::login() send Auth.afterIdentify event
|
2014-11-22 13:31:38 -05:00 |
|
euromark
|
41c646c5a1
|
Simplification of return types. No need to return more mixed than necessary.
|
2014-11-08 20:07:47 +01:00 |
|
euromark
|
345a18f15f
|
Merge branch 'master' into 2.6
|
2014-11-05 23:29:06 +01:00 |
|
euromark
|
768f2c809c
|
Correct doc block return types.
|
2014-11-05 13:03:27 +01:00 |
|
Sebastien Barre
|
2995d9319c
|
Prepend model alias for safety
|
2014-11-01 09:36:59 -04:00 |
|
Sebastien Barre
|
417c137d11
|
Fix DigestAuthenticate test
|
2014-10-31 21:42:18 -04:00 |
|
Sebastien Barre
|
2f62ee2cde
|
ticket #5017 add userFields setting to BaseAuthenticate
|
2014-10-31 15:00:19 -04:00 |
|
mark_story
|
b98d2a3365
|
Merge branch 'master' into 2.6
|
2014-10-24 22:05:46 -04:00 |
|
mark_story
|
cdc67116c5
|
Handle query string arguments in digest auth data.
Handle &, ? in digest auth data uri.
Refs #4908
|
2014-10-17 23:12:41 -04:00 |
|
mark_story
|
87fcc9f0b9
|
Merge branch 'master' into 2.6
Conflicts:
lib/Cake/VERSION.txt
|
2014-10-13 21:11:38 -04:00 |
|
Bryan Crowe
|
e16bef1868
|
Fix missing 'r' from your
|
2014-10-08 15:06:30 -04:00 |
|
mark_story
|
cf45d3fab8
|
Merge branch 'master' into 2.6
|
2014-09-22 20:46:28 -04:00 |
|
Mischa ter Smitten
|
a69e9bc63b
|
Cs fixes
|
2014-09-18 10:50:35 +02:00 |
|
mark_story
|
0d11cf7a33
|
Merge branch 'master' into 2.6
|
2014-09-14 23:26:33 -04:00 |
|
Joseph Sutton
|
faaba42aa7
|
Fixed type-casting for AuthComponent::login()
|
2014-09-14 11:15:08 -05:00 |
|
Joseph Sutton
|
87a58eeaea
|
AuthComponent::login() returning deprecated method
Changed $this->loggedIn() to $this->user(), as per the PHPDOC for loggedIn() at line 817
|
2014-09-14 00:28:30 -05:00 |
|
ADmad
|
3fb252ad2f
|
Merge branch 'master' into 2.6
|
2014-09-13 00:37:16 +05:30 |
|
euromark
|
04ef39217f
|
Take care of more int casts.
|
2014-09-10 16:29:23 +02:00 |
|
euromark
|
e77f96d8b7
|
Use (int) cast instead of intval() function for performance reasons and to unify it.
|
2014-09-10 15:52:57 +02:00 |
|
mark_story
|
734bb9223b
|
Merge branch 'master' into 2.6
Conflicts:
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
|
2014-09-06 23:04:20 -04:00 |
|
Jeremy Harris
|
3a41433c94
|
Deprecated AuthComponent::mapActions
|
2014-09-04 08:35:40 -05:00 |
|
Marc Würth
|
67ba9cb406
|
Update all @deprecated annotations
to adhere to the @deprecated <version> <description> format, where version and description are mandatory.
|
2014-09-02 17:03:22 +02:00 |
|
Jeremy Harris
|
66b2173566
|
Made AuthComponent::mapActions() act as a getter refs #3331
|
2014-08-29 08:23:41 -05:00 |
|
euromark
|
5f5218f3b2
|
Fix cookie reading.
|
2014-08-06 22:53:54 +02:00 |
|
Steve Tauber
|
0af698c591
|
Updating RequestHandlerComponent to accept body of HTTP Delete requests
|
2014-07-29 16:08:33 +02:00 |
|
David Steinsland
|
b61972871a
|
Fixed sending of headers when ajaxLogin is set
|
2014-07-22 13:21:42 +02:00 |
|
mark_story
|
b3dfad614a
|
Correct pattern matching.
Instead of 10 digits, it should limit at 10 groups.
Refs 1988e89e73
|
2014-07-06 09:42:20 -04:00 |
|
Schlaefer
|
9fa7afa354
|
fixes #3887 CSRF reusable token expires
|
2014-07-06 10:39:00 +02:00 |
|