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 |
|
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 |
|
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 |
|
Ceeram
|
cd209ce099
|
Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
|
2012-06-19 23:20:08 +02:00 |
|
Ceeram
|
03e2263b69
|
Merge branch '2.1' into 2.2
|
2012-06-19 18:35:36 +02:00 |
|
mark_story
|
89b2eddf0b
|
Try regexp as not all locales are available.
|
2012-06-18 23:45:44 -04:00 |
|
mark_story
|
6a1e9e80b2
|
Try LC_ALL instead.
|
2012-06-18 23:31:10 -04:00 |
|
mark_story
|
77fc8a9d33
|
Switch to de_DE
nl_NL doesn't seem to exist on the ci server.
|
2012-06-18 23:25:42 -04:00 |
|
mark_story
|
001e89bf3f
|
Fix formatting with locales using , as decimal separator
Fixes #2958
|
2012-06-18 23:13:09 -04:00 |
|
Ceeram
|
74a0bd98c2
|
throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype
|
2012-06-14 19:01:41 +02:00 |
|
mark_story
|
76dd49145a
|
Merge branch '2.1' into 2.2
|
2012-06-10 20:34:20 -04:00 |
|
mark_story
|
b2e82871f1
|
Attempt to fix failing build.
|
2012-06-10 20:08:17 -04:00 |
|
mark_story
|
7ae660c779
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
|
2012-06-10 20:05:25 -04:00 |
|
mark_story
|
0a182b918f
|
Fix $depth being decremented by 2.
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
|
2012-06-10 20:00:34 -04:00 |
|
mark_story
|
454fae9bd0
|
Fix Validation::ip() not respecting type.
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.
Fixes #2944
|
2012-06-10 19:37:44 -04:00 |
|
Jose Lorenzo Rodriguez
|
0d013f8da5
|
Fixing CakeTime, the actual params for format() is $date and $format,
and not the other way around :)
|
2012-06-09 08:28:39 -04:30 |
|
Jose Lorenzo Rodriguez
|
51635c2ca6
|
Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
|
2012-06-06 11:06:06 -04:30 |
|
Rachman Chavik
|
8966f1b324
|
create CakeRequest in View instead of in CakeEmail
|
2012-06-04 22:21:41 +07:00 |
|
Mark Story
|
085ad0bb42
|
Merge pull request #672 from sitedyno/cookie-encryption-#471
Add stronger encryption, and make it available in cookiecomponent.
Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
|
2012-05-31 17:44:49 -07:00 |
|
mark_story
|
01b3135a63
|
You should be able to regex match null/''
Fixes #2926
|
2012-05-30 21:28:18 -04:00 |
|
mark_story
|
9a8ceaeba6
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
|
2012-05-30 21:20:56 -04:00 |
|
mark_story
|
fb0cc50700
|
Allow Set::extract() to match null.
Fixes #2926
|
2012-05-30 21:19:46 -04:00 |
|
Heath Nail
|
304d001dfb
|
Implement rijndael optional cookie encryption.
|
2012-05-30 03:49:25 -04:00 |
|
Florian Krämer
|
e3a6e9e169
|
Adding uploadError() and mimeType() to the Validation class
|
2012-05-28 00:32:30 +02:00 |
|
Mark Story
|
4485f597b7
|
Merge pull request #662 from jellehenkens/2.2-validation-natural-number
Adding validation rule for natural numbers
|
2012-05-27 11:01:31 -07:00 |
|
mark_story
|
4b8c469004
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/VERSION.txt
|
2012-05-26 21:11:36 -04:00 |
|
José Lorenzo Rodríguez
|
33eb46cd87
|
Merge pull request #666 from boast/patch-1
Fixed XmlArticle and XmlUser Models associations.
|
2012-05-22 21:41:04 -07:00 |
|
David Thalmann
|
81fedbba9c
|
Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel test and does no longer try to use the 'default' datasource.
|
2012-05-23 07:19:06 +03:00 |
|
mark_story
|
5270721ade
|
Remove bonus intval()
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.
Fixes #2897
|
2012-05-22 22:33:46 -04:00 |
|
Jelle Henkens
|
7d080ea2d1
|
Adding an assert to check for zero prefixed numbers
|
2012-05-22 16:32:16 +01:00 |
|
Jelle Henkens
|
7546be6394
|
Adding a validation rule for checking natural numbers
|
2012-05-21 13:39:31 +01:00 |
|
ADmad
|
cfd9d8a815
|
Added CakeTime::listIdentifiers()
|
2012-05-21 03:05:42 +05:30 |
|