Commit graph

6315 commits

Author SHA1 Message Date
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
7b44d5d7a3 Update version number to 2.6.0-beta 2014-10-04 23:01:03 -04: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
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
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
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
ptica
1959b97ba3 hardcode a relative path to core installed via composer
as book suggests
2014-09-08 11:57:01 +02:00
mark_story
734bb9223b Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
Angel S. Moreno
29570e1d99 Fixed overwriting of files when Folder::SKIP is set 2014-09-06 18:32:45 -04:00
Mark Story
2311c13f12 Merge pull request #4417 from jeremyharris/3331
Fix for #3331
2014-09-04 20:26:55 -04:00
Jeremy Harris
3a41433c94 Deprecated AuthComponent::mapActions 2014-09-04 08:35:40 -05:00
Mark Story
f82fd2d982 Merge pull request #4463 from ravage84/deprecated-annotaions
Update all @deprecated annotations
2014-09-04 08:48:45 -04:00
Markus Fischer
0c55adebe0 console: don't use colored output if there's no TTY
This prevents ANSI escape codes and style tags showing up in
cron-jobs, pipes or redirects.
2014-09-03 10:47:05 +02:00