Commit graph

18636 commits

Author SHA1 Message Date
Mark Story
84eb151dd1 Merge pull request #4850 from ADmad/issue-4849
Make CakeSession::read() return null for all failure cases.
2014-10-09 13:08:25 -04:00
ADmad
94e718372a Make CakeSession::read() return null for all failure cases. 2014-10-09 19:27:27 +05:30
Marc Würth
051c005b43 Added HTTP to URL 2014-10-09 14:25:40 +02:00
Marc Würth
e515a02e16 Added code consistency badge from phpcs 2014-10-09 14:13:34 +02:00
Bryan Crowe
d16a63894e Merge pull request #4843 from bcrowe/fix-typos
Fix missing 'r' from your
2014-10-08 15:20:57 -04:00
Bryan Crowe
e16bef1868 Fix missing 'r' from your 2014-10-08 15:06:30 -04:00
Bryan Crowe
2fc2109742 Merge pull request #4842 from suzuki86/fix-typo
Fix small typo
2014-10-08 11:06:33 -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
Mark Story
0a961dd70d Merge pull request #4801 from ceeram/2-accept-revert
Revert "add test to prove requesthandler works correct with Angular wonk...
2014-10-02 19:28:58 -04:00
Ceeram
fcffe3961f Revert "add test to prove requesthandler works correct with Angular wonky accept headers"
This reverts commit 8507ef83f1.

Incorrect header was used for this test, Cake cannot safely determine correct header.
To get CakePHP to respond with json, you can modify the angular common headers.
2014-10-02 22:12:35 +02:00
José Lorenzo Rodríguez
e2177361b5 Merge pull request #4798 from ceeram/2-angular
add test to prove requesthandler works correct with Angular wonky accept...
2014-10-02 16:26:19 +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
Mark Story
5582edf6e7 Merge pull request #4787 from hperrin/master_hash_improvements
Improvements to Hash::expand and Hash::merge. (master)
2014-10-01 16:20:01 -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
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