ADmad
ecf030796b
Fix docblock
2014-10-11 19:37:22 +05:30
Mark Story
63ffb2215b
Merge pull request #4853 from ceeram/2.6-atomic-translate
...
TranslateBehavior now uses original atomic option value, if set
2014-10-10 17:48:31 -04:00
Ceeram
43e998422e
Fix PHPCS errors
2014-10-10 16:52:01 +02:00
Ceeram
12ebf8b427
add test for atmoic save of TranslateBehavior
2014-10-10 16:44:01 +02:00
Ceeram
1dfd3405a4
TranslateBehavior now uses original atomic option value, if set
2014-10-10 14:17:16 +02:00
mark_story
39011cd9d8
Fix Model::isUnique() not working as a validator.
...
While it *did* work for single fields, isUnique could not be used to
validate the uniqueness across multiple fields as documented. Because
validation methods pass arguments in an order the validator did not
expect the validation method would not work correctly.
Fixes #4571
2014-10-09 22:49:17 -04:00
mark_story
0ff9545e5a
Add test for find() and array conditions.
...
Add a test for conditions using an array with only one element.
Closes #4848
2014-10-09 19:58:18 -04:00
ADmad
94e718372a
Make CakeSession::read() return null for all failure cases.
2014-10-09 19:27:27 +05:30
Bryan Crowe
e16bef1868
Fix missing 'r' from your
2014-10-08 15:06:30 -04:00
suzuki86
e4c0dee6ee
Fix small typo
2014-10-08 23:37:38 +09:00
mark_story
7b44d5d7a3
Update version number to 2.6.0-beta
2014-10-04 23:01:03 -04:00
mark_story
ce98a1ff57
Update version number to 2.5.5
2014-10-04 22:59:03 -04:00
Ceeram
fcffe3961f
Revert "add test to prove requesthandler works correct with Angular wonky accept headers"
...
This reverts commit 8507ef83f1
2014-10-02 22:12:35 +02:00
Ceeram
8507ef83f1
add test to prove requesthandler works correct with Angular wonky accept headers
2014-10-02 16:07:10 +02:00
Mark Story
d99d9bc37f
Merge pull request #4780 from Schlaefer/timeAgoInWords-futureString
...
adds option for future string to CakeTime::timeAgoInWords & code cleanup
2014-10-01 20:34:41 -04:00
mark_story
2ee0827161
Fix PHPCS errors.
2014-10-01 20:34:33 -04:00
Hunter Perrin
be8c591dd8
Fixed coding standard violations.
2014-10-01 12:40:22 -07:00
Hunter Perrin
050e368bd0
Improvements to Hash::expand and Hash::merge.
...
Because of the recursion in these functions, processing very large
arrays would take a very long time. I rewrote the functions to
eliminate any unnecessary recursion and function calls. Large arrays
are now processed much faster.
2014-10-01 12:08:43 -07:00
Schlaefer
fd2dd58360
code formatting, fixes PHPCS errors
2014-10-01 11:25:24 +02:00
Schlaefer
388e412a82
fixes failing test cases from last CakeTime::timeAgoInWords changes
...
at b96eb1fb46
2014-10-01 11:09:00 +02:00
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
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
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
Mischa ter Smitten
a69e9bc63b
Cs fixes
2014-09-18 10:50:35 +02:00
euromark
4d1a65ede2
Add intl email test.
2014-09-16 10:14:00 +02: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
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
euromark
c65cb6f62b
wording
2014-09-13 13:39:11 +02:00
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
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
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
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
