ADmad
|
4ded269549
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
|
2013-07-07 12:22:12 +05:30 |
|
Marc Würth
|
d9882fcc08
|
Fixed three @param data types
|
2013-07-06 16:49:21 +02:00 |
|
euromark
|
e7f380d2b7
|
doublespace to single space
|
2013-07-05 14:36:40 +02:00 |
|
euromark
|
c989624f80
|
whitespace coding standards
|
2013-07-05 14:15:18 +02:00 |
|
mark_story
|
c597855fe4
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
|
2013-07-03 14:21:09 -04:00 |
|
euromark
|
f389435bae
|
coding standards and else block simplification
|
2013-07-03 19:27:17 +02:00 |
|
euromark
|
a90cb29c0f
|
simplify else cases
|
2013-07-03 01:14:41 +02:00 |
|
euromark
|
7cb19b97db
|
coding standards and simplification of else cases as well as some minor fixes
|
2013-07-03 00:52:48 +02:00 |
|
mark_story
|
cd3c54bb9d
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-06-10 22:12:10 -04:00 |
|
euromark
|
f6aedea271
|
coding standards elseif
|
2013-06-09 17:12:46 +02:00 |
|
ADmad
|
636cc8c103
|
Merge branch 'master' into 2.4
|
2013-06-09 18:08:32 +05:30 |
|
Aymeric Derbois
|
0cfdb87cdf
|
Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an array to XML object.
|
2013-06-09 00:52:06 +02:00 |
|
Mark Story
|
e26a05ce04
|
Merge pull request #1235 from ADmad/2.3-caketime
Fix datetime comparison in relative datetime functions.
|
2013-06-05 06:12:50 -07:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
Marc Würth
|
2bbd391972
|
Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
|
2013-05-29 20:19:14 +02:00 |
|
mark_story
|
cce9e84907
|
Merge branch 'master' into 2.4
|
2013-05-28 22:40:32 -04:00 |
|
Ceeram
|
49aded5399
|
fix coding standard error
|
2013-05-28 18:39:38 +02:00 |
|
mark_story
|
7334643b55
|
Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
Fixes #3855
|
2013-05-27 13:22:14 -04:00 |
|
mark_story
|
df872dde28
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-05-10 21:58:48 -04:00 |
|
mark_story
|
b533c1b3ba
|
Make named capture groups compatible with older PCRE versions.
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.
Fixes #3821
|
2013-05-09 12:18:26 -04:00 |
|
mark_story
|
cdede82b7e
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Core/Object.php
|
2013-05-07 22:22:48 -04:00 |
|
Mark Story
|
94ff1b20e2
|
Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem
Fix bug in Xml::_toArray Method
|
2013-05-07 19:03:18 -07:00 |
|
Derbois Aymeric
|
ca6612bc8b
|
Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an XML object to an array.
|
2013-05-08 00:56:17 +02:00 |
|
mark_story
|
06e7ba66c9
|
Update docs for Security::cipher()
This method is not cryptographically strong. Note that, and the
issues related to suhosin.
Related to #GH-1100
|
2013-05-06 23:03:20 -04:00 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
mark_story
|
2b0e10eebb
|
Exclude domain names starting with -
Related to 479aefc438
Refs #3414
|
2013-04-29 21:31:30 -04:00 |
|
Mark Story
|
619f66178b
|
Merge pull request #1233 from spiliot/patch-1
Money validation should accept one decimal place.
|
2013-04-28 18:06:49 -07:00 |
|
ADmad
|
19f8274a95
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-04-25 03:06:04 +05:30 |
|
euromark
|
dbc2a7a9e4
|
correct spelling mistake
|
2013-04-23 12:34:59 +02:00 |
|
Simon Males
|
880c70cc8c
|
No use of type key in ClassRegistry::init()
|
2013-04-22 13:55:28 +08:00 |
|
spiliot
|
2d7f6fc707
|
Added tests
|
2013-04-22 03:42:19 +03:00 |
|
ADmad
|
ae8386c48a
|
Fix datetime comparison in relative datetime functions.
Closes #2987,#3514
|
2013-04-20 13:10:06 +05:30 |
|
spiliot
|
50e3307f00
|
Money validation accepts one decimal place
|
2013-04-19 01:58:08 +03:00 |
|
mark_story
|
aee8b50507
|
Merge branch 'master' into 2.4
|
2013-04-15 21:48:26 -04:00 |
|
mark_story
|
8eb56960d8
|
Remove remaining reference operators.
These were left over from the days of 1.x and aren't needed anymore.
|
2013-04-15 21:23:48 -04:00 |
|
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 |
|
ADmad
|
ba56fb7064
|
Fixed issue where incorrect cached filesize was reported when appending to file.
|
2013-04-13 19:45:20 +05:30 |
|
mark_story
|
8bd1980dd4
|
DateTime::getTimestamp() is PHP5.3+
|
2013-04-11 13:39:05 -04:00 |
|
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
|
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
|
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 |
|
ADmad
|
d809b1480e
|
Fix CS errors
|
2013-04-01 02:16:52 +05:30 |
|
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 |
|
bcrowe
|
70d9ae9a03
|
Fix docblock typo of ObjectCollection class
|
2013-03-28 20:14:41 -04:00 |
|
ADmad
|
733116d15d
|
Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in ClassRegistry::init().
Closes #3724
|
2013-03-27 15:44:48 +05:30 |
|
mark_story
|
041c2d289f
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Shell.php
|
2013-03-26 20:31:54 -04:00 |
|