ADmad
6e66815d67
Merge pull request #3614 from cakephp/api-doc-comments-2
...
Api doc comments 2
2014-06-01 11:10:09 +05:30
mark_story
47ce5928e1
Fix api doc errors in Cache.
2014-05-31 22:02:55 -04:00
mark_story
86a071353d
Fix api doc comment errors in Error/
2014-05-31 21:57:17 -04:00
mark_story
fe2003888b
Fix api doc errors in basics.php
2014-05-31 21:53:54 -04:00
mark_story
15f63e9c81
Removing peer verification failure test.
...
Since we are not running a domain with an invalid certificate relying on
someone else to do that is quite unreliable.
2014-05-31 21:51:03 -04:00
Mark Story
e467457319
Merge pull request #3612 from cakephp/api-doc-comments
...
More API docblock fixes.
2014-05-31 19:12:20 -04:00
Mark Story
21285746cf
Merge pull request #3611 from MaziyarMK/patch-1
...
added HTML for styling tables
2014-05-31 19:08:58 -04:00
ADmad
3d9b2b80cb
More API docblock fixes.
2014-06-01 03:06:05 +05:30
MaziyarMK
596c1c27cb
added HTML for styling tables
...
added <thead> and <tbody> to table for easier styling of generated templates.
2014-05-31 20:50:29 +00:00
Mark Story
90c0556a4a
Merge pull request #3607 from ADmad/2.5-hash-sort
...
Set default sort direction to 'asc'.
2014-05-30 12:18:29 -04:00
ADmad
543066f34a
Set default sort direction to 'asc'.
2014-05-30 19:43:09 +05:30
Mark Story
136f026f77
Merge pull request #3548 from dogmatic69/patch-3
...
Allow getting params the same way data() works
2014-05-29 21:49:09 -04:00
Mark Story
4e8e266754
Merge pull request #3598 from cakephp/api-doc-comments
...
Fix api docblocks for View layer classes.
2014-05-29 21:47:41 -04:00
mark_story
7e8d378502
Merge branch 'master' into 2.6
2014-05-29 21:46:16 -04:00
ADmad
16df061d66
Fix api docblocks for View layer classes.
2014-05-30 01:23:12 +05:30
alan bount
c273ed8d2c
MySQL DbdSource alter field support 'after'
...
The ALTER FIELD for MySQL should support 'after' just like the ADD FIELD
2014-05-29 11:06:44 -04:00
Mark Story
a135378950
Merge pull request #3590 from Haititi/2.6-fix-habtm
...
2.6 fix save() with habtm returning error
2014-05-29 10:09:33 -04:00
David Yell
1e3730c988
Updated the default Cake routes to include a defaultRoute true flag to allow differentiation
...
Merge #3579 from davidyell/routing-markers onto 2.6
Fixes #3535
2014-05-29 00:55:51 -04:00
mark_story
390441d3b9
Accept older blowfish hashes.
...
Both `2a` and `2x` are valid types of blowfish hashes, that while being
older should be accepted.
Backport 00c94bd582b83f8b92228b750aea0e8816a4ea89 from 3.x to 2.5.x,
I see this as a bug fix as it fixes incompatibilities with hashes
created by hash_password().
Refs #3575
2014-05-28 22:53:21 -04:00
Haithem Ben Ghorbal
35c2a7ef31
restore previous (erroneous ?) behaviour
2014-05-29 02:36:13 +02:00
Haithem Ben Ghorbal
67af8b37db
clean code and remove unneeded checks
2014-05-28 23:53:47 +02:00
dogmatic69
59fe581912
adding doc block for tests related to CakeRequest::param()
2014-05-28 22:28:44 +01:00
José Lorenzo Rodríguez
bf9b8e1a52
Merge pull request #3586 from cakephp/api-doc-comments
...
Api doc comments
2014-05-28 20:56:29 +02:00
ADmad
7a4244d0a6
More docblock CS fixes.
2014-05-28 22:09:54 +05:30
Haithem BEN GHORBAL
d4a0883cb9
fix typo/coding style
2014-05-28 18:31:03 +02:00
Haithem BEN GHORBAL
a8e410ee20
fix save with habtm returning false
2014-05-28 18:17:16 +02:00
mark_story
f6c868d706
Fix remaining doc block errors in Console/
2014-05-27 23:34:53 -04:00
mark_story
8f5acb0932
Fix CS errors in skel/
2014-05-27 23:21:32 -04:00
mark_story
bb58bbe642
Fix API doc errors in Console/
2014-05-27 23:16:05 -04:00
mark_story
2546b79c62
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-05-27 20:55:16 -04:00
mark_story
0c8406c034
Merge branch 'master' into 2.6
2014-05-27 20:55:06 -04:00
mark_story
edcbf4e92f
Manually port f287bc76c0 to 2.6
...
Git won't let me merge the changes as I have 'unstaged changes'.
2014-05-27 20:54:36 -04:00
Mark Story
f287bc76c0
Force .bat files to have CRLF endings.
...
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.
Hopefully this fixes the issue.
Fixes #3585
2014-05-27 19:06:08 -04:00
Hikkijp
c622a9dfc2
Fixes bug #3581
...
Fixes bug #3581 and the issue noticed by markstory
2014-05-27 17:30:38 -03:00
Hikkijp
f7e98e7427
Revert "Fixes bug described in #3581 "
...
This reverts commit e6c6e0bf2c
2014-05-27 17:25:28 -03:00
Hikkijp
e6c6e0bf2c
Fixes bug described in #3581
...
Routes with '/**' are now correctly handled by the HtmlHelper->link()
2014-05-27 14:03:56 -03:00
Hikkijp
952c7192f4
Revert "Fixes bug described in #3581 "
...
This reverts commit 6c75e3697d
2014-05-27 14:00:20 -03:00
Hikkijp
6c75e3697d
Fixes bug described in #3581
...
Routes with '/**' are now correctly handled when called by
$this->Html->link() in a view.
2014-05-27 13:50:08 -03:00
Mark Story
e5de1df165
Merge pull request #3577 from tersmitten/consistent-use-of-err-for-errors
...
Consistent use of `Shell::err` for errors
2014-05-27 09:18:32 -04:00
Mischa ter Smitten
329fd3fe4c
Consistent use of Shell::err for errors
2014-05-27 12:29:09 +02:00
José Lorenzo Rodríguez
05d92ddc0a
Merge pull request #3560 from cakephp/2.6-memcached-options
...
2.6 memcached options
2014-05-26 21:47:45 +02:00
dogmatic69
bcdc530391
adding support to write values to param like can be done with data(), method returns $this as does ->data() when writing
2014-05-25 00:52:30 +01:00
dogmatic69
9dca564519
make the default return false so it matches previous use, improve tests for new method
2014-05-25 00:46:40 +01:00
Mark Story
9c9d45596f
Merge pull request #3478 from Schlaefer/#3303-lengthBetween
...
closes #3303 RFC: Rename Validator::between() into Validator::length()
2014-05-24 16:48:05 -04:00
mark_story
86c7d1ff5e
Add addtional options array for memcached.
...
Memcached supports a number of options that we should afford in our
memcached adapter.
Fixes #3477
2014-05-23 22:29:03 -04:00
mark_story
a0851702ff
Fail the build as soon as one build fails.
...
No need to run all the builds when one of them has already failed.
2014-05-23 14:05:09 -04:00
mark_story
ec3222ca64
Allow the PHPCS to fail.
2014-05-23 14:02:20 -04:00
mark_story
db86b0c050
Don't disable the entire select when disabled is array(1)
...
When the disabled attribute is just array(1), then the attribute should
be filtered out of select element attributes. This is kind of a hacky
workaround but changing the underlying attribute handling is going to be
pretty tricky and far more dangerous.
Fixes #3546
2014-05-23 13:26:11 -04:00
mark_story
587f2da09e
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-05-22 14:29:43 -04:00
mark_story
81875cfeb1
Optimize renew().
...
Don't call session_id() twice when we can use a local variable to store
the current session id.
Fixes #3531
2014-05-22 14:28:56 -04:00
