mark_story
247d836174
Remove useless reference operator.
2013-04-14 21:29:04 -04:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
José Lorenzo Rodríguez
672dd6178f
Merge pull request #1226 from ADmad/2.3-file-clearstatcache
...
Fixed issue where incorrect cached filesize was reported when appending ...
2013-04-13 07:27:32 -07:00
ADmad
ba56fb7064
Fixed issue where incorrect cached filesize was reported when appending to file.
2013-04-13 19:45:20 +05:30
Juan Basso
ce5563ff83
Supoprt query parameters on Router::parse. It will increase the symmetry of parse and reverse methods
2013-04-12 23:28:23 +00:00
mark_story
ed435870ae
Fix secure field lists when select elements have custom name attributes.
...
When a select element had a custom name attribute the secured field name
was incorrect.
Fixes #3753
2013-04-12 12:30:05 -04:00
mark_story
8bd1980dd4
DateTime::getTimestamp() is PHP5.3+
2013-04-11 13:39:05 -04:00
Mark Story
5e00fdfce5
Merge pull request #1225 from ADmad/2.3-input-number
...
"maxlength" is not a valid attribute for input element of type "number" ...
2013-04-11 08:52:13 -07:00
ADmad
548cccbbe2
"maxlength" is not a valid attribute for input element of type "number" in html5.
2013-04-11 21:06:52 +05:30
dogmatic69
7b0e5d9375
Moved stat cache clearing into a method for consitent usage.
...
Fixes issue where incorrect cached filesize was reported when appending to file.
Thanks dogmatic69 for the patch.
2013-04-11 11:16:10 +05:30
mark_story
b210849b95
Expand doc blocks for Model::query()
...
There were some undocumented options that had test cases.
Refs #3748
2013-04-10 21:43:25 -04:00
mark_story
5c83bc177d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
mark_story
c77c7a7347
Fix warning with FormHelper::inputs()
...
introspectModel() can return non-array data sometimes. Casting avoids
warnings when forms are generate for models with no or faulty schema()
methods.
Refs #3602
2013-04-09 21:46:51 -04:00
mark_story
0e646a2a4d
Fix incorrect timestamp values when using fromString()
...
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.
Fixes #3743
2013-04-09 21:30:20 -04:00
Mark Story
0e5b00fbc2
Merge pull request #1222 from ceeram/2.3-travisnode
...
Replace node.js with lighthttpd to avoid socket exceptions
2013-04-08 06:39:39 -07:00
Ceeram
da2f0668e0
Replace node.js with lighthttpd to avoid socket exceptions
2013-04-08 11:36:58 +02:00
mark_story
9cd54bd736
Update version number to 2.3.2
2013-04-07 15:00:11 -04:00
ADmad
819d9e2cbc
docblock tweaks for apigen
2013-04-08 00:26:59 +05:30
mark_story
853e19e70e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Model/Model.php
2013-04-07 14:35:23 -04:00
ADmad
20047c5060
Tweak docblock for api generator
2013-04-07 23:13:03 +05:30
ADmad
56df02f720
Improved docblocks
2013-04-07 18:53:32 +05:30
ADmad
e55877d171
Merge branch 'master' into 2.4
2013-04-06 00:57:46 +05:30
ADmad
431ab2aebd
Fix CS errors
2013-04-04 17:37:51 +05:30
José Lorenzo Rodríguez
b0574e7f67
Merge pull request #1216 from remidewitte/feature/schemaupdate2
...
schema update CREATEs non-existing tables instead of ALTER
2013-04-04 00:35:29 -07:00
mark_story
d8d8e9644d
Fix array('disabled') and array('disabled' => true) working differently.
...
The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.
Fixes #3734
2013-04-03 12:46:39 -04:00
Rémi Dewitte
c70a3868a9
schema update CREATEs non-existing tables instead of ALTER
2013-04-03 17:37:09 +02:00
José Lorenzo Rodríguez
1fa7d90018
Merge pull request #1215 from andreaskri/timelinehelper_comment_fix
...
Fixing comment for in TimeHelper __construct
2013-04-03 03:59:28 -07:00
Andreas Kristiansen
8bc7bc9bb1
Fixing comment for in TimeHelper __construct
2013-04-03 12:54:42 +02:00
Mark Story
bb776cfa72
Merge pull request #1213 from markstory/improve-request-is
...
Improve CakeRequest::is()
Fixes #3714
2013-04-02 10:20:13 -07:00
José Lorenzo Rodríguez
0b73c8b6ac
Merge pull request #1171 from remidewitte/feature/filelog-mask2
...
Add mask setting to FileLog
2013-04-01 23:44:02 -07:00
mark_story
2d6ee3cdb1
Remove pointless code.
...
Add a missing call to parent::setUp() and remove code that it takes
care of.
2013-04-01 22:30:27 -04:00
mark_story
3a06dc5e1c
Make JS,CSS,IMAGES conditionally defined.
...
This allows app's to redefine these constants as necessary.
This makes these constants consistent with their *_URL relatives.
Fixes #GH-1170
2013-04-01 21:59:41 -04:00
mark_story
ce04d6afa1
Add CakeRequest::isAll().
...
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.
Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f
Add support for is() with multiple types.
...
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.
Refs #3714
2013-04-01 21:52:15 -04:00
ADmad
d809b1480e
Fix CS errors
2013-04-01 02:16:52 +05:30
mark_story
d681a191db
Merge branch 'caketime-improvements' into 2.4
...
Add CakeTime::isPast() and CakeTime::isFuture().
Closes #GH-1190
2013-03-30 22:25:12 -04:00
mark_story
d28c2f8e72
Fix code & tests for isPast() and isFuture()
...
The methods and tests now follow coding standards and work.
2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d
Adds two new time testing methods: 'isFuture' and 'isPast'
...
TestCases included
2013-03-30 22:24:08 -04:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
ADmad
7b90542230
Fix CS error
2013-03-31 00:23:03 +05:30
mark_story
dea4fa4d73
Fallback to the default renderer if the config key is missing.
2013-03-30 13:40:58 -04:00
mark_story
ceb46b5d2c
Try to fix random test failures on postgres.
...
Sorting in postgres is undefined and no based on the primary key when
sorting is not supplied.
2013-03-30 13:38:47 -04:00
Mark Story
84c0de7e2d
Merge pull request #1203 from cincodenada/patch_httpsocket
...
Add a bit of backwards compatibility for specifying auth in the config.
Restore compatibility with older versions when providing auth data in the
request data.
2013-03-29 18:19:46 -07:00
Mark Story
c7a378716b
Merge pull request #1207 from renansaddam/supportFullBaseOnScriptAndCss
...
Fix missing support for fullBase in script() & css()
HtmlHelper::script(), HtmlHelper::css() did not have support for fullBase
added when it was added to image(). Fix that omission.
2013-03-29 18:04:47 -07:00
Joel Bradshaw
ece6ac3663
Backwards compat for auth in the config array of HttpSocket::request()
...
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
Renan Gonçalves
96c9174ee2
Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
...
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
2013-03-29 15:24:08 +01:00
euromark
3a728762af
spelling correction.
2013-03-29 11:16:20 +01:00
Mark
c6ba61d539
Merge pull request #1204 from bcrowe/master
...
Fix docblock typo of ObjectCollection class
2013-03-28 17:22:38 -07:00
bcrowe
70d9ae9a03
Fix docblock typo of ObjectCollection class
2013-03-28 20:14:41 -04:00
Mark
42ea6895b2
Merge pull request #1107 from TeckniX/patch-1
...
Added autoParagraph functionality to 2.4 Branch
2013-03-28 03:30:15 -07:00