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 |
|
euromark
|
af455b4121
|
correct return types in doc blocks
|
2013-07-05 17:19:22 +02:00 |
|
euromark
|
ba02678693
|
doc block corrections
|
2013-07-05 16:17:23 +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
|
42777b7809
|
incorrect tab to space - whitespace coding standards
|
2013-06-09 21:01:01 +02:00 |
|
euromark
|
4518624187
|
more whitespace coding standard corrections
|
2013-06-09 17:39:48 +02:00 |
|
euromark
|
a6f065e7a2
|
coding standards whitespace and single quote
|
2013-06-09 17:20:08 +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
|
e527eab5aa
|
Add missing call to parent::setUp()
|
2013-06-08 09:47:46 -04:00 |
|
Mark Story
|
5cdd11cb38
|
Merge pull request #1336 from djbobke/caketimetest-locale
Fix locale for CakeTimeTest when configured different locale in app
|
2013-06-08 06:45:20 -07:00 |
|
Rik van der Heijden
|
0946a7799a
|
Fix locale for CakeTimeTest when configured different locale in app
|
2013-06-08 10:25:28 +02:00 |
|
euromark
|
394bf1054d
|
remove name attribute where not necessary, clean up doc blocks
|
2013-06-08 04:29:08 +02: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 |
|
mark_story
|
7334643b55
|
Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
Fixes #3855
|
2013-05-27 13:22:14 -04:00 |
|
ADmad
|
fb86859585
|
Merge branch 'master' into 2.4
|
2013-05-19 14:37:41 +05:30 |
|
euromark
|
97c2cb367d
|
CS fixes
|
2013-05-17 10:36:17 +02: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
|
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 |
|
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 |
|
spiliot
|
dbe90cae71
|
removed duplicate test case
```$this->assertFalse(Validation::money('text'));```
is now tested only once
|
2013-04-29 00:20:35 +03:00 |
|
spiliot
|
2d7f6fc707
|
Added tests
|
2013-04-22 03:42:19 +03: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 |
|
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 |
|
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
|
041c2d289f
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Shell.php
|
2013-03-26 20:31:54 -04:00 |
|
euromark
|
3a1ff36d5e
|
correct coding standards
|
2013-03-25 13:06:38 +01:00 |
|
mark_story
|
5d6a6fa203
|
Fix error when generating Xml.
Fix warnings/un-escaped entities with deeply nested elements.
Fixes #3718
|
2013-03-21 21:12:21 -04:00 |
|
mark_story
|
83de70efcf
|
Tighten Canadian postal code validation.
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.
Fixes #3708
|
2013-03-17 18:14:56 -04:00 |
|
mark_story
|
e97b3acebb
|
Merge branch 'master' into 2.4
|
2013-03-14 20:54:42 -04:00 |
|
mark_story
|
246c09ae40
|
Allow character classes in attribute patterns.
Fixes #3706
|
2013-03-14 12:55:03 -04:00 |
|
Yuya Takeyama
|
14c81fe052
|
Fix alphaNumeric validation
|
2013-03-14 20:10:17 +09:00 |
|
Ceeram
|
f6477d58df
|
change formatOutput option name to pretty
|
2013-03-13 15:44:59 +01:00 |
|
Ceeram
|
fc34d9fe7f
|
Add formatoutput option to Xml::fromArray
|
2013-03-13 13:07:36 +01:00 |
|
euromark
|
f633241775
|
fix spacing error
|
2013-03-10 18:26:58 +01:00 |
|
euromark
|
a9bbaed3d6
|
fix coding standards
|
2013-03-10 18:11:50 +01:00 |
|
euromark
|
eb874f87a3
|
Top 6 world currencies and make them utf8 per default
|
2013-03-06 23:35:18 +01:00 |
|
mark_story
|
00edc594bf
|
Fix failing test.
|
2013-02-28 21:31:09 -05:00 |
|
mark_story
|
d1c88ebf8a
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
|
2013-02-24 20:24:26 -05:00 |
|
Marc Würth
|
33fbace4c7
|
Added 'ym'- & 'y'-date validation
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
|
2013-02-15 14:35:20 +01:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01:00 |
|