ADmad
|
1763f46340
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/bootstrap.php
|
2012-10-23 16:53:01 +05:30 |
|
Jose Lorenzo Rodriguez
|
1c0c8604c8
|
Pushed before fxing error in test case, I suck. Refs #3291
|
2012-10-22 23:09:31 +02:00 |
|
Jose Lorenzo Rodriguez
|
9dc3b243ac
|
Correct inflection rules for cookies, fixes fixes #3291
|
2012-10-22 23:07:42 +02:00 |
|
mark_story
|
0b0b361e48
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
|
2012-10-20 20:48:11 -04:00 |
|
mark_story
|
307759516b
|
Try to make tests less fragile.
|
2012-10-15 22:54:03 -04:00 |
|
euromark
|
7bf08fdcc7
|
default value null makes more sense. add test cases for false.
|
2012-10-12 16:03:05 +02:00 |
|
ADmad
|
ce9ad1f2ed
|
Fix failing tests
|
2012-10-01 20:22:41 +05:30 |
|
euromark
|
7383298410
|
making messages() and errors() reset themselves by default
|
2012-10-01 14:20:53 +02:00 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
mark_story
|
eed59a95ad
|
Fix whitespace.
|
2012-09-27 21:42:15 -04:00 |
|
mark_story
|
99edef0abc
|
Re-order assertions.
Group the true/false assertions.
|
2012-09-27 21:39:14 -04:00 |
|
mark_story
|
76d21c6d56
|
Try to fix another test failure caused by blowfish.
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
|
2012-09-26 22:25:05 -04:00 |
|
Jose Lorenzo Rodriguez
|
047ffd1530
|
Removing variable from dump test as it does not exist anymore
|
2012-09-25 17:01:06 +02:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
Jose Lorenzo Rodriguez
|
b0822d2246
|
Introducing failing test case to prove issue in CakeTime
|
2012-09-25 15:23:19 +02:00 |
|
mark_story
|
d3ba9703a5
|
Try to make some time related test failures go away.
|
2012-09-20 21:07:14 -04:00 |
|
euromark
|
0be1943bcd
|
adding basic test
|
2012-09-20 01:56:52 +02:00 |
|
euromark
|
3fa6b96ad0
|
adding CakeNumber::formatDelta() and fixing issue with near-zero values and format()
|
2012-09-20 01:41:41 +02:00 |
|
Ceeram
|
ff676b5ea4
|
allow for lowercase as well, also strip the unit part off before pow()
|
2012-09-18 17:15:33 +02:00 |
|
Mark Story
|
07c5102de5
|
Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
|
2012-09-17 17:55:23 -07:00 |
|
Ceeram
|
9530e68ae6
|
add default return value as parameter to use when size can not be determined
|
2012-09-17 13:21:50 +02:00 |
|
Mark Story
|
cdfead0feb
|
Merge pull request #849 from dogmatic69/rijndael-fatal-error
skipping the rijndael test if mcrypt_encrypt() is not available
|
2012-09-15 18:00:07 -07:00 |
|
dogmatic69
|
26934236b1
|
skipping the rijndael test if mcrypt_encrypt() is not available
|
2012-09-15 11:43:39 +01:00 |
|
dogmatic69
|
4899b5b91b
|
changing is_writeable() to is_writable()
|
2012-09-15 11:17:35 +01:00 |
|
mark_story
|
ccd33782da
|
Fix whitespace errors.
|
2012-09-14 22:37:39 -04:00 |
|
euromark
|
2d9d400ecb
|
correct spelling
|
2012-09-10 23:08:14 +02:00 |
|
euromark
|
f7acab7cae
|
doc block update
|
2012-09-10 19:20:15 +02:00 |
|
euromark
|
37068539bd
|
allow Folder to merge recursivly and add scheme option
|
2012-09-10 10:23:52 +02:00 |
|
mark_story
|
e8c1140fc8
|
Fix notice error.
|
2012-09-09 21:08:21 -04:00 |
|
mark_story
|
6664acba79
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-09-05 20:15:36 -04:00 |
|
Kyle Robinson Young
|
a214fcd992
|
Remove never reached code in Debugger::trimPath and test more results
|
2012-09-05 15:57:53 -07:00 |
|
mark_story
|
571c8bc08c
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
|
2012-09-01 13:51:40 +01:00 |
|
mark_story
|
474e42cc08
|
Switch File::info() tests to use a different file.
text/php files are not detected reliably across platforms. Use a plain
text file instead. This should fix builds on travis.ci
|
2012-09-01 12:40:05 +01:00 |
|
mark_story
|
d3105332dc
|
Fix coding standards errors.
|
2012-09-01 12:14:15 +01:00 |
|
mark_story
|
728300786b
|
Merge branch 'master' into 2.3
|
2012-08-30 19:43:11 +01:00 |
|
Ber Clausen
|
63548267e9
|
Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
|
2012-08-27 23:25:17 -03:00 |
|
mark_story
|
934838f77c
|
Fix whitespace.
|
2012-08-26 22:17:36 -04:00 |
|
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 |
|
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
|
4487673060
|
Merge branch 'master' into 2.3
|
2012-08-09 20:43:47 -04:00 |
|
mark_story
|
dca050fbd6
|
Fix errors with recursion in debug()
Fixes #3102
|
2012-08-08 22:30:27 -04: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 |
|
euromark
|
2a570e639c
|
ellipsis instead of ending/beginning for core wide consistency
|
2012-08-04 19:58:23 +02:00 |
|
euromark
|
917d912a43
|
String::tail()
|
2012-08-02 13:21:31 +02:00 |
|
mark_story
|
d94cdc67fe
|
Merge branch 'master' into 2.3
|
2012-07-27 22:38:24 -04:00 |
|