mark_story
|
d66d37c92b
|
Merge branch 'master' into 2.3
|
2012-08-24 22:50:29 -04:00 |
|
Ber Clausen
|
b75a6b440a
|
Treat float numbers with trailing zeroes removed by PHP, accordingly.
Revert #2800 (28bd6880df ) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-08-24 22:22:12 -04:00 |
|
Ceeram
|
cb80338c7d
|
avoid duplication in return value when saving habtm
|
2012-08-24 00:50:46 +02:00 |
|
Mark Story
|
064fef1a15
|
Merge pull request #779 from dereuromark/2.3-ellipsis-html
use html ellipsis if possible
|
2012-08-23 13:20:38 -07:00 |
|
Mark Story
|
fe3d99cdfc
|
Merge pull request #775 from sitedyno/BlowfishAuthenticate
Add BlowfishAuthenticate adapter.
|
2012-08-23 13:16:34 -07:00 |
|
Heath Nail
|
d24bbcb255
|
Add BlowfishAuthenticate adapter.
|
2012-08-23 11:23:51 -04:00 |
|
Ceeram
|
c5ebbc991c
|
Revert "Merge pull request #784 from ceeram/habtmmerge"
This reverts commit fa5aa6278f , reversing
changes made to 88604ac757 .
|
2012-08-23 16:00:41 +02:00 |
|
ceeram
|
973670ca1c
|
Merge pull request #749 from ceeram/2.3-allow
Add allowed() to CakeRequest, to check if the request method matches the...
|
2012-08-22 16:44:11 -07:00 |
|
Ceeram
|
d730acba59
|
Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones.
Throws exception if not matched, using the required Allow response header.
|
2012-08-22 17:23:24 +02:00 |
|
Ceeram
|
e7dc23b920
|
Ensure callbacks are triggered when using Xml/Json view with view templates.
PaginatorHelper for instance needs this to correctly set options
|
2012-08-22 13:13:49 +02:00 |
|
Ceeram
|
fb0053753e
|
avoid duplication in returned results for habtm
|
2012-08-22 13:03:47 +02:00 |
|
mark_story
|
d5333a2ff1
|
Merge branch 'master' into 2.3
|
2012-08-20 16:20:27 -04:00 |
|
mark_story
|
e75fdd21ee
|
Add tests to show caseinsensitive nature of detectors.
Closes #3132
|
2012-08-20 11:43:10 -04:00 |
|
euromark
|
07d92ef678
|
correcting test
|
2012-08-17 14:02:20 +02:00 |
|
euromark
|
7969062614
|
legacy support with test cases
|
2012-08-17 13:57:47 +02:00 |
|
euromark
|
40398429ff
|
coding standards
|
2012-08-17 13:37:04 +02:00 |
|
euromark
|
f201684873
|
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
|
2012-08-17 13:31:01 +02:00 |
|
Mark Story
|
9e96c473f4
|
Merge pull request #752 from dereuromark/2.3-truncate-tail
String::tail()
|
2012-08-16 11:02:06 -07:00 |
|
Mark Story
|
08e4362d40
|
Merge pull request #772 from bar/master-fix-phpreader
The actual config file must always have .php extension.
|
2012-08-16 11:00:27 -07:00 |
|
mark_story
|
c83e941497
|
Merge branch 'master' into 2.3
|
2012-08-15 21:00:49 -04:00 |
|
mark_story
|
b0f2cfd1d1
|
Fix coding standards.
|
2012-08-15 20:19:08 -04:00 |
|
ADmad
|
7ac01154f7
|
Merge branch '2.2-configure'
|
2012-08-15 20:09:25 +05:30 |
|
ADmad
|
18c5a4aee5
|
Make file extension optional for Configure reader adapter's dump function.
|
2012-08-15 19:38:58 +05:30 |
|
mark_story
|
e183e91b17
|
Make CakeRequest work with content-type headers that include a charset.
Refs #3113
|
2012-08-14 12:42:05 -04:00 |
|
ber clausen
|
0dec093f48
|
The actual config file must always have .php extension.
|
2012-08-13 23:50:58 -03:00 |
|
euromark
|
e1fbfcef00
|
fix contain for find method
|
2012-08-13 08:10:51 +02:00 |
|
ADmad
|
65e63c51c8
|
More missing parent calls.
|
2012-08-12 02:28:12 +05:30 |
|
ADmad
|
802f00b6e3
|
Adding missing calls to parent.
|
2012-08-12 02:13:10 +05:30 |
|
ADmad
|
4a483b4897
|
If cache is disabled in app and js cache file is not written don't return script tag with file url.
Instead return script block with inline js content.
|
2012-08-12 01:08:05 +05:30 |
|
mark_story
|
11227f5490
|
Fix coding standards.
|
2012-08-10 21:50:37 -04:00 |
|
Mark Story
|
7dae12456a
|
Merge pull request #759 from dereuromark/2.3-cake-schema
2.3 cake schema
|
2012-08-10 18:11:50 -07: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 |
|
mark_story
|
6f7557898d
|
Fix whitespace and comment errors.
|
2012-08-09 20:51:29 -04:00 |
|
mark_story
|
4487673060
|
Merge branch 'master' into 2.3
|
2012-08-09 20:43:47 -04:00 |
|
Ceeram
|
d4986b5f24
|
add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response.
Tests added.
|
2012-08-09 14:52:05 +02:00 |
|
José Lorenzo Rodríguez
|
596f2c0d91
|
Merge pull request #734 from steinkel/feature/smtp-tls
Adding TLS support to SmtpTransport
|
2012-08-08 23:36:13 -07:00 |
|
mark_story
|
dca050fbd6
|
Fix errors with recursion in debug()
Fixes #3102
|
2012-08-08 22:30:27 -04:00 |
|
euromark
|
5190b9f2c9
|
asserting that under_scored names result in valid ClassNames
|
2012-08-08 16:35:59 +02:00 |
|
euromark
|
62dee78ca5
|
adding models for schema generate
|
2012-08-08 14:15:28 +02:00 |
|
José Lorenzo Rodríguez
|
1ff63758ad
|
Merge pull request #750 from tigrang/security-component-enhancement
Added `disabledActions` feature to SecurityComponent
|
2012-08-06 12:05:17 -07:00 |
|
mark_story
|
57c495f53a
|
Enabled Debugger::exportVar() to display private & protected properties.
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
|
2012-08-06 13:32:52 -04:00 |
|
ADmad
|
8931b74ba2
|
Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074
|
2012-08-05 02:36:29 +05:30 |
|
mark_story
|
b32273e713
|
Fix whitespace errors.
|
2012-08-04 15:57:04 -04:00 |
|
euromark
|
2a570e639c
|
ellipsis instead of ending/beginning for core wide consistency
|
2012-08-04 19:58:23 +02:00 |
|
mark_story
|
e59555a66f
|
Merge branch 'master' into 2.3
|
2012-08-03 22:45:56 -04:00 |
|
mark_story
|
788cf52572
|
Fix saving empty values for translated fields with multiple locales
|
2012-08-03 22:40:38 -04:00 |
|
Christopher Vrooman
|
bbd0b9dd8b
|
Tweaked DocBlocks
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
|
2012-08-03 22:40:28 -04:00 |
|
Christopher Vrooman
|
de1450763b
|
Added a failing test to testSavePartialFields
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
|
2012-08-03 21:19:44 -04:00 |
|
Tigran Gabrielyan
|
617d470427
|
Renamed disabledActions to unlockedActions
|
2012-08-03 11:01:19 -07:00 |
|