Ceeram
0196c6f686
code optimizing and simplify _crypt(), see PR #853
2012-11-01 14:15:52 +01:00
José Lorenzo Rodríguez
2ab3a463cc
Merge pull request #928 from shama/patch-cs
...
Code standards fixes
2012-10-29 08:46:12 -07:00
Kyle Robinson Young
f10c669813
Code standards fixes
2012-10-29 08:14:17 -07:00
mark_story
478461d301
Merge branch 'master' into 2.3
2012-10-28 21:42:48 -04:00
mark_story
d9a3ab844f
Fix another test that fails on postgres sometimes.
2012-10-28 21:16:50 -04:00
Jose Lorenzo Rodriguez
b75bb8ece7
Update version number to 2.3.0-beta
2012-10-28 23:17:25 +01:00
ADmad
1e50ead75b
Fix coding standard error
2012-10-29 02:19:24 +05:30
mark_story
94bd2cedcf
Fix more off by a second errors
2012-10-28 16:15:20 -04:00
mark_story
ab2ce29bd6
Fix a few more tests that sometimes fail on postgres.
2012-10-28 16:11:07 -04:00
mark_story
f8d602cd7b
Fix coding standard.
2012-10-28 15:59:34 -04:00
Jose Lorenzo Rodriguez
8bca041066
Revert "Fixing failing test case in RssHelper"
...
This reverts commit 7715689523
.
2012-10-28 20:48:31 +01:00
Jose Lorenzo Rodriguez
8538c0e8ea
Avoiding problems with relative paths in shell dispatcher
2012-10-28 12:57:44 +01:00
Jose Lorenzo Rodriguez
7715689523
Fixing failing test case in RssHelper
2012-10-28 11:52:30 +01:00
mark_story
c794e295a0
Merge branch 'master' into 2.3
2012-10-27 22:50:02 -04:00
mark_story
667dfd308f
DateTime::getTimestamp() only exists in PHP > 5.3.0
2012-10-27 22:49:43 -04:00
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
mark_story
e8f727fe68
Using fixed points in time.
...
This avoids lulz when the United Kingdom changes change to/from DST at
a different time than your local timezone.
2012-10-27 21:12:34 -04:00
Mark Story
31a5401f71
Merge pull request #923 from dereuromark/2.3-fixes
...
2.3 fixes
2012-10-27 16:50:42 -07:00
Mark Story
494928a6d7
Merge pull request #922 from bar/master-empty-array-test
...
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 17:27:00 -07:00
euromark
0f978195d6
coding standards regarding whitespaces
2012-10-27 00:46:12 +02:00
euromark
5324a8ca9c
cleanup
2012-10-27 00:26:54 +02:00
Ber Clausen
a7d9422c09
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 19:21:51 -03:00
Ceeram
870d77c89e
Make the test more accurate on type of result
2012-10-26 20:49:04 +02:00
Ceeram
f4f4aa4a2a
Squashed commit of the following:
...
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date: Fri Oct 26 14:40:24 2012 +0200
Merge branch '2.3' into currency
commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 23:53:03 2012 +0200
NumberHelper now also uses the default currency from CakeNumber, instead of default argument value
commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 18:01:35 2012 +0200
Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
2012-10-26 19:32:39 +02:00
Ceeram
39dcb80b45
Fix failing test, find('first') now returns empty array when no record was found
2012-10-26 16:32:15 +02:00
Mark Story
a0665feac4
Merge pull request #917 from bar/master-find
...
Make Model::find('first') always return an array.
2012-10-26 07:00:48 -07:00
Mark Story
ab11d507f2
Merge pull request #919 from rchavik/2.3
...
CakeSchema: adds empty line between tables
2012-10-26 07:00:31 -07:00
Mark Story
20483a22ff
Merge pull request #920 from ADmad/master-required-field
...
Improved "required" field detection. Closes #3305 .
2012-10-26 05:40:45 -07:00
ADmad
0ddd130833
Improved "required" field detection. Closes #3305 .
2012-10-26 12:58:24 +05:30
Rachman Chavik
e61483126c
CakeSchema: adds empty line between tables
2012-10-26 13:27:47 +07:00
mark_story
559130b87b
Try and make test less likely to fail.
2012-10-25 21:56:00 -04:00
mark_story
50a4b792be
Clean up code in FormHelper::dateTime()
...
Remove $$ variables and split a huge method into smaller pieces.
2012-10-25 21:28:01 -04:00
mark_story
c359e4b689
Fix issue with array based values and interval.
...
Fixes #3299
2012-10-25 20:46:54 -04:00
Mark Story
e6512c56fd
Merge pull request #915 from bar/master-cake-error
...
Avoid duplicating RequestHandler component when rendering Errors.
2012-10-25 17:24:00 -07:00
Mark Story
d051b69312
Merge pull request #914 from dereuromark/2.3-i18n-extract
...
Normalize paths in generate pot files to always use /
Fixes #3306
2012-10-25 17:12:55 -07:00
Renan Gonçalves
02cfacec41
Make app/Console/cake pwd insensitive on Mac OS X.
...
Follow up of [36e15a065b
].
2012-10-26 01:14:09 +02:00
Ber Clausen
c741f60367
Make Model::find('first') always return an array.
2012-10-25 17:57:37 -03:00
Ber Clausen
d269588e78
Avoid duplicating RequestHandler component.
2012-10-25 14:57:16 -03:00
euromark
cc436146be
making tests pass on windows again
2012-10-25 17:37:35 +02:00
euromark
f3bbe89ede
solves ticket 3306
2012-10-25 17:08:52 +02:00
mark_story
528671f468
Replace Set with Hash.
2012-10-25 10:07:39 -04:00
Mark Story
555bfc32ea
Merge pull request #909 from dereuromark/master-magic-input-bc
...
Master magic input bc
Fixes #3295
2012-10-25 07:05:31 -07:00
mark_story
83d307e545
Try to set order on more things.
2012-10-24 22:38:15 -04:00
mark_story
9e0778951a
Add some fixed orders.
...
Hopefully this makes tests in postgres more reliable.
2012-10-24 21:27:01 -04:00
mark_story
5786245832
Fix lint error.
2012-10-24 21:21:11 -04:00
mark_story
c4b9fa6c7a
Fix failing tests.
2012-10-24 21:00:56 -04:00
Mark Story
2841611c0f
Merge pull request #911 from dogmatic69/type-checks
...
Type checks
2012-10-24 17:26:30 -07:00
Ceeram
6fc019e74d
afterRender should not be triggered when callbacks is false
2012-10-25 01:16:16 +02:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
d2010308d4
Merge branch 'master' into 2.3
2012-10-23 20:20:52 -04:00