Mark Story
|
8b1e5e31c7
|
Merge pull request #2925 from ndm2/invocation-verification-fix
Fix verification of expected invocations
|
2014-03-04 22:54:54 -05:00 |
|
mark_story
|
5544fcc4c2
|
Merge branch 'master' into 2.5
Conflicts:
lib/Cake/VERSION.txt
|
2014-03-03 21:20:58 -05:00 |
|
Lucas Freitas
|
b522b1e724
|
Entire UL element was being outputted directly (escaped), added to the unset list and fixed
|
2014-03-03 05:28:59 -03:00 |
|
Lucas Freitas
|
d4b91166bc
|
Fixing stupidity and adding the PHPDoc param
|
2014-03-03 05:10:21 -03:00 |
|
Lucas Freitas
|
7096495943
|
Allow the passing parameter escape of the getCrumbList method and reflecting that into the outputted link too
|
2014-03-03 05:01:49 -03:00 |
|
José Lorenzo Rodríguez
|
1410910dfa
|
Merge pull request #2939 from bcrowe/hotfix-missing-semi-colon
Add missing semi-colon, fixes #2937
|
2014-03-03 08:31:57 +01:00 |
|
Bryan Crowe
|
003d1a6d47
|
Add missing semi-colon, fixes #2937
|
2014-03-03 01:03:56 -05:00 |
|
mark_story
|
549908738b
|
Include the last error if available when sending with mail() fails.
When sending email using mail() include the last error if available.
Fixes #2910
|
2014-03-02 21:07:25 -05:00 |
|
Mark Story
|
e89081a3ce
|
Merge pull request #2928 from h4ck3rm1k3/master
adding in simple doc for db_acl
|
2014-03-02 12:59:22 -05:00 |
|
ndm2
|
1015b38a27
|
Use convenience methods to create a (case-insensitive) negation matcher
|
2014-03-02 17:56:35 +01:00 |
|
James Michael DuPont
|
316def45cb
|
adding in simple doc for db_acl
|
2014-03-02 10:25:47 -06:00 |
|
Mark Story
|
c6355651cf
|
Merge pull request #2929 from Marlinc/patch-1
Added the Limburgish language
|
2014-03-02 09:41:48 -05:00 |
|
Marlin Cremers
|
5795111391
|
Moved Limburgish to correct the order
|
2014-03-02 14:30:26 +01:00 |
|
Marlin Cremers
|
7ab028e9d7
|
Added the Limburgish language
|
2014-03-02 10:40:39 +01:00 |
|
mark_story
|
a17345cb92
|
Update build.xml file so PEAR packages include Fixtures.
|
2014-03-01 21:32:36 -05:00 |
|
mark_story
|
45cabd40fe
|
Update version number to 2.4.6
|
2014-03-01 21:22:04 -05:00 |
|
ndm2
|
70a1b87db6
|
Fix wrong test model association class name
|
2014-03-01 23:01:33 +01:00 |
|
ndm2
|
01e1b5ca61
|
Fix failing tests caused by already existing classes
|
2014-03-01 20:24:32 +01:00 |
|
ndm2
|
008ad3237c
|
Fix verification of expected invocations #2919
|
2014-03-01 19:06:17 +01:00 |
|
ADmad
|
a707709e1d
|
Added test for FormHelper::radio().
Tests generating radio input for field with model other than one used
in create(). Refs #2911.
|
2014-02-28 02:34:16 +05:30 |
|
mark_story
|
706ddfccae
|
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
|
2014-02-26 21:09:06 -05:00 |
|
mark_story
|
822e2b80ae
|
Merge branch 'issue-2897' into 2.5
Merge pull request #2899 into 2.5 to fix issues with event dispatching.
|
2014-02-26 21:08:35 -05:00 |
|
mark_story
|
25f94f9b71
|
Add test to prove the fix made in pull/2899
Ensure that event listeners are not lost when merging the global and
local listeners.
Fixes #2897
Fixes #2899
|
2014-02-26 21:06:32 -05:00 |
|
ADmad
|
a0c399e374
|
Remove whitespace.
|
2014-02-26 10:40:53 +05:30 |
|
Saleh Souzanchi
|
9d4f3e92ab
|
fix issues #2897
|
2014-02-26 08:02:21 +03:30 |
|
mark_story
|
0f584c0e8b
|
Merge branch 'master' into 2.5
|
2014-02-24 21:19:17 -05:00 |
|
mark_story
|
0776b87214
|
Fix postLink() & postButton() with nested data.
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.
Closes #2894
|
2014-02-24 21:17:31 -05:00 |
|
Mark Story
|
e0e8f91d9e
|
Merge pull request #2866 from paddythenerd/master
Unsetting url both with & w/o this->base to allow proper handling when app n...
|
2014-02-24 20:27:25 -05:00 |
|
Mark Story
|
97ebfd6341
|
Merge pull request #2856 from cvandeplas/master
fixes issue #2855 where cafile is not set in HttpSocket
|
2014-02-21 22:29:35 -05:00 |
|
Patrick Barabe
|
08ba104543
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-20 08:52:36 -07:00 |
|
Mark Story
|
2289521e30
|
Merge pull request #2873 from sam-at-github/requesthandlercomponent-reuse-a-var
One liner. Dont call function parseAccept() twice in RequestHandlerCompo...
|
2014-02-20 10:03:46 -05:00 |
|
Sam
|
62cb733988
|
One liner. Dont call function parseAccept() twice in RequestHandlerComponent.
|
2014-02-21 00:54:10 +11:00 |
|
mark_story
|
a80cbc205a
|
Simplify conditionals.
Set default values to remove else cases.
|
2014-02-19 21:46:53 -05:00 |
|
Mark Story
|
a254d2dd6d
|
Merge pull request #2869 from jalbertocr/master
FormHelper - Check DateTime instances to avoid fatal errors
|
2014-02-19 20:42:49 -05:00 |
|
jalbertocr
|
8b2e1ab9e5
|
Don't do assignments inside conditionals.
|
2014-02-19 22:41:33 -03:00 |
|
jalbertocr
|
cdeb51167b
|
Fix types in docblocks.
|
2014-02-19 20:54:00 -03:00 |
|
jalbertocr
|
35f152b333
|
Make sure a datetime instance is valid to avoid fatal errors.
|
2014-02-19 20:50:30 -03:00 |
|
Patrick Barabe
|
a69aeb67c1
|
A better fix for issue #2711. Allows url to be unset from request array regardless of this->base context
|
2014-02-19 13:37:01 -07:00 |
|
Patrick Barabe
|
a9d7792678
|
Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot
|
2014-02-19 11:02:25 -07:00 |
|
Mark Story
|
4497bab131
|
Merge pull request #2864 from AD7six/2.4-better-float-validation
account for localized floats more robustly.
|
2014-02-19 12:08:30 -05:00 |
|
AD7six
|
4e0627232c
|
account for localized floats more robustly.
Normalize floats, strings too, so that they are validated as
dddddddddd.dd
ref #2853
|
2014-02-19 15:04:25 +00:00 |
|
mark_story
|
b8c94fa5d4
|
Merge branch 'master' into 2.5
|
2014-02-18 22:19:12 -05:00 |
|
mark_story
|
0a51458ffd
|
Fix Validation::decimal() not working with localized floats.
Use similar workarounds as DboSource::value() for accepting localized
floats.
Fixes #2853
|
2014-02-18 22:18:56 -05:00 |
|
Mark Story
|
3d00ca9643
|
Merge pull request #2861 from ujwaltrivedi/master
Get unlimited number of slabs when clearing cache keys in memcache.
|
2014-02-18 20:46:50 -05:00 |
|
Ujwal Trivedi
|
1045a5e0a5
|
Update MemcacheEngine.php
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
|
2014-02-18 18:40:17 -05:00 |
|
Christophe Vandeplas
|
f018e4ff4d
|
fixes issue #2855 where cafile is not set in HttpSocket
|
2014-02-18 09:39:56 +01:00 |
|
Mark Story
|
4353507ebb
|
Merge pull request #2852 from ujwaltrivedi/master
Update MemcacheEngine.php
|
2014-02-17 16:44:13 -05:00 |
|
Ujwal Trivedi
|
cb0580a91a
|
Update MemcacheEngine.php
removing variable assignment
|
2014-02-17 15:29:49 -05:00 |
|
mark_story
|
24fd23bbdd
|
Merge branch 'form-secure' into 2.5
Merge pull request #2582 into 2.5.
Fixes #2582
|
2014-02-17 11:03:59 -05:00 |
|
mark_story
|
3433f4a1f0
|
Clean up changes code standards and tests.
Refs #2582
|
2014-02-17 11:03:49 -05:00 |
|