Schlaefer
b96eb1fb46
cleans up CakeTime::timeAgoInWords and adds option for custom futures string
2014-10-01 10:35:41 +02:00
mark_story
af43bc1706
Merge branch 'master' into 2.6
2014-09-25 22:39:51 -04:00
José Lorenzo Rodríguez
eac4e3d6ee
Merge pull request #4711 from cakephp/master-email
...
Fix bug in CakeEmail::reset()
2014-09-24 16:29:09 +02:00
euromark
9c8ab826bf
Correct a few more misleading assert orders.
2014-09-24 14:34:24 +02:00
euromark
fce16189d5
Fix tests
2014-09-24 14:25:18 +02:00
euromark
af7916b1a7
Fix bug in CakeEmail::reset()
2014-09-24 14:02:18 +02:00
mark_story
1877cab341
Fix UUID primary key columns not being reflected properly.
...
When UUID columns are converted into varchar(36) they should also be
default = null, null = false.
Fixes #4695
2014-09-23 22:16:18 -04:00
Mark Story
d7c4d3b521
Merge pull request #4704 from HavokInspiration/hash-remove-fix
...
Fix Hash::remove() removing data even if the path is not matched
2014-09-23 17:21:54 -04:00
Yves
b70cb132fd
Fix Hash::remove() removing data even if the path is not matched
2014-09-23 22:00:49 +02:00
mark_story
249dc5650b
Merge branch 'relative-sprintf' into 2.6
...
Refs #4550
2014-09-22 20:56:33 -04:00
mstra001
d6abfcaf90
Update tests for strfime() in timeAgoInWords()
...
Add test asserts for testTimeAgoInWordsWithFormat with strftime format
2014-09-22 20:50:37 -04:00
mstra001
244acc724d
Add strftime() support to CakeTime::timeAgoInWords()
...
When an absolute date is generated CakeTime will automatically use
strftime() if the format string contains %. This allows for simpler
localization.
Refs #4550
2014-09-22 20:49:20 -04:00
mark_story
cf45d3fab8
Merge branch 'master' into 2.6
2014-09-22 20:46:28 -04:00
antograssiot
d715c6f2de
force LF EOL in working directory
2014-09-22 15:42:06 +02:00
Mark Story
12cf82ba19
Merge pull request #4645 from tersmitten/cs-fixes
...
Cs fixes
2014-09-18 11:05:11 -04:00
Mischa ter Smitten
5838c85f96
Re(added) closing tag
2014-09-18 13:43:50 +02:00
Mischa ter Smitten
a441a71f77
Improved doc block
2014-09-18 11:55:31 +02:00
Mischa ter Smitten
a69e9bc63b
Cs fixes
2014-09-18 10:50:35 +02:00
Mark Story
d0b78e78ca
Merge pull request #4624 from cakephp/master-email
...
Add intl email test.
Closes #4623
2014-09-16 08:04:55 -04:00
euromark
4d1a65ede2
Add intl email test.
2014-09-16 10:14:00 +02:00
Mark Story
d34ff71e50
Merge pull request #4614 from wisoot/patch-1
...
Fix dispatch filters that have regular string as a key
2014-09-15 08:18:20 -04:00
wisoot
eb14a64d0b
Check whether the filter key is a valid class name before assuming that value is class settings
2014-09-15 15:29:30 +10:00
mark_story
0d11cf7a33
Merge branch 'master' into 2.6
2014-09-14 23:26:33 -04:00
Mark Story
1e29070d55
Merge pull request #4604 from sutt0n/patch-1
...
AuthComponent::login() returning deprecated method
2014-09-14 12:45:44 -04:00
Joseph Sutton
faaba42aa7
Fixed type-casting for AuthComponent::login()
2014-09-14 11:15:08 -05:00
Joseph Sutton
87a58eeaea
AuthComponent::login() returning deprecated method
...
Changed $this->loggedIn() to $this->user(), as per the PHPDOC for loggedIn() at line 817
2014-09-14 00:28:30 -05:00
mark_story
9e4446fe5f
Trim whitespace from columns before checking for operators.
...
Fixes #4599
2014-09-13 21:50:35 -04:00
Mark Story
f0c6a9a706
Merge pull request #3476 from dereuromark/2.6-maxlength
...
2.6 maxlength
2014-09-13 09:54:47 -04:00
euromark
c65cb6f62b
wording
2014-09-13 13:39:11 +02:00
ADmad
2698df9758
Merge pull request #4594 from cakephp/2.5-fix-jks-build
...
fix failling test on Jenkins after ee1e270
2014-09-13 12:56:05 +05:30
antograssiot
0215ada9dd
fix failling test on Jenkins after ee1e270
...
This test is failling build on 2.5, 2.6 and 3.0 since #4477
2014-09-13 08:19:40 +02:00
euromark
03d92494f1
Fix maxlength for manual type set and add textarea maxlength support.
2014-09-13 04:03:33 +02:00
ADmad
3fb252ad2f
Merge branch 'master' into 2.6
2014-09-13 00:37:16 +05:30
José Lorenzo Rodríguez
fb4b79d292
Merge pull request #4575 from HavokInspiration/hash-insert-get-defect
...
Fix Hash::get() not returning values with special paths
2014-09-10 23:22:23 +02:00
Yves
90ad813b40
Fix Hash not returning correct value with special paths
...
When doing a Hash::insert() with a part of the path starting with a '0', Hash::get() returned null even if the same path was used.
2014-09-10 22:47:25 +02:00
José Lorenzo Rodríguez
3a561986f1
Merge pull request #4572 from cakephp/master-fix-intval
...
PHP flaw around intval with custom base.
2014-09-10 18:36:32 +02:00
euromark
a6df3300b9
Wording.
2014-09-10 17:57:26 +02:00
euromark
eedefb9dec
Clarify octal input instead.
2014-09-10 17:56:02 +02:00
euromark
3e25282d4c
Fix PHP flaw around intval with custom base.
2014-09-10 17:40:01 +02:00
Mark Story
282bc0ca92
Merge pull request #4570 from cakephp/master-casting
...
Use (int) instead of intval() for performance reasons and to unify it.
2014-09-10 11:25:50 -04:00
euromark
e3dc51bb68
Manually correct remaining casts.
2014-09-10 16:40:22 +02:00
euromark
04ef39217f
Take care of more int casts.
2014-09-10 16:29:23 +02:00
euromark
e77f96d8b7
Use (int) cast instead of intval() function for performance reasons and to unify it.
2014-09-10 15:52:57 +02:00
mark_story
58bf005c09
Merge branch 'folder_overwrite_fix'
...
Merge pull request #4521 into master.
2014-09-09 21:33:29 -04:00
mark_story
86bc7f1861
Add tests for #4521 and reformat code.
...
Add a regression test for #4521 as the original author didn't have one.
Reformat a long line since I was nearby already.
Closes #4521
2014-09-09 21:33:17 -04:00
Mark Story
39d16ee28a
Merge pull request #4561 from ravage84/2.0-remove-old-annotations
...
2.0 remove old annotations
2014-09-09 17:39:58 -04:00
Marc Würth
6cac5d0af3
Removed use of @lastmodified annotation
2014-09-09 23:04:29 +02:00
Marc Würth
9812147779
Removed use of @modifiedby annotation
2014-09-09 23:03:43 +02:00
Marc Würth
80788c3c00
Removed use of @version annotation
2014-09-09 23:03:11 +02:00
Mark Story
a7ea5fea78
Merge pull request #4540 from ptica/master
...
hardcode a relative path to core installed via composer
2014-09-09 08:36:14 -04:00
