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
|
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 |
|
mark_story
|
f963e378b5
|
Fix coding standards errors.
|
2012-07-26 21:22:50 -04:00 |
|
mark_story
|
70c714d600
|
Fix incorrect context being used for excerpt.
Fixes #3064
|
2012-07-24 23:37:37 -04:00 |
|
mark_story
|
162d3bcb29
|
Fix whitespace errors.
|
2012-07-23 22:44:05 -04:00 |
|
mark_story
|
2359fb7e2e
|
Simplify number formatting.
|
2012-07-22 21:28:49 -04:00 |
|
Heath Nail
|
434d3a7137
|
Add bcrypt support to Security::hash()
|
2012-07-22 21:15:00 -04:00 |
|
mark_story
|
468302b526
|
Merge branch 'master' into 2.3
|
2012-07-21 20:59:56 -04:00 |
|
U-Zyn Chua
|
e7c4064a69
|
Fix URL validation to allow underscores in subdomain.
|
2012-07-19 20:51:33 +08:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
mark_story
|
fb92bde0fe
|
Loosen exception types.
|
2012-07-14 16:18:21 -04:00 |
|
mark_story
|
22d4cb3794
|
Allow warnings for Xml entities.
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
|
2012-07-14 16:08:54 -04:00 |
|
mark_story
|
6c905411ba
|
Fix XML decoding attack via external entities.
|
2012-07-14 11:53:37 -04:00 |
|
mark_story
|
369bbcc964
|
Fix failing tests.
* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
|
2012-07-07 01:08:39 -04:00 |
|
Ceeram
|
6ec0afcf5d
|
Add CakeNumber::fromReadableSize() and Validation::filesize()
|
2012-06-26 12:17:25 +02:00 |
|
mark_story
|
ad5345887a
|
Refactor tests.
Use generators to reduce some duplication.
|
2012-06-24 21:57:00 -04:00 |
|
mark_story
|
3f78216e96
|
Revert changes in behavior made to timeAgoInWords()
Changes made in [0729aca706 ] changed
the generated text to not match the behavior in 2.1.
|
2012-06-24 20:54:47 -04:00 |
|
ADmad
|
b2ccdd46e5
|
Fixed test failing when server's timezone is not UTC
|
2012-06-24 23:11:52 +05:30 |
|
Jelle Henkens
|
db7d5426ec
|
CakeTime no longer sets the timezone out of its scope on the date object
|
2012-06-24 11:10:55 +01:00 |
|
Jose Lorenzo Rodriguez
|
03d31b57f7
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-06-19 19:28:20 -04:30 |
|