Mark Story
9e744113f0
Merge pull request #3659 from dogmatic69/patch-3
...
simplify connect code for redis
2014-06-06 10:08:36 -04:00
Carl Sutton
4a4a35768b
simplify connect code for redis
2014-06-06 13:54:54 +01:00
mark_story
849ad9a4f5
Remove dead, untested and unreachable code in FormHelper.
...
Closes #3650
2014-06-06 08:17:49 -04:00
José Lorenzo Rodríguez
91224b0ec1
Merge pull request #3653 from markstory/2.6-html-css
...
Add once option to css().
2014-06-06 09:55:06 +02:00
José Lorenzo Rodríguez
932bf47481
Merge pull request #3604 from Haititi/2.6-save-atomic
...
2.6 add 'atomic' option to "save()" API - delivery
2014-06-05 13:55:52 +02:00
ADmad
74cd3db5e1
Merge pull request #3645 from cakephp/api-doc-comment
...
Api doc comment
2014-06-05 10:15:44 +05:30
akiyan
6d2402fbf6
No truncate when drop table.
2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f
Fix the test suite package doc block errors.
2014-06-05 00:24:01 -04:00
mark_story
7058921275
Fix doc comment errors in Acl classes.
2014-06-05 00:15:45 -04:00
mark_story
758599e6f4
Add once option to css().
...
The default value is false for backwards compatibility. In 3.0, the
default will be made consistent with script().
Refs #1973
Refs #3628
2014-06-04 22:15:56 -04:00
Mark Story
9c65337c9f
Merge pull request #3640 from cakephp/api-doc-comments
...
Fix API docblock CS errors.
2014-06-04 15:03:16 -04:00
ADmad
1d40f3e685
Fix API docblock CS errors.
2014-06-05 00:28:55 +05:30
Haithem BEN GHORBAL
31615ce415
add 'atomic' option to "save()" API
...
This commit adds a transaction context to 'save()' API in order to rollback
possible modifications done in some 'Model.beforeSave' listener callback.
This will allow cakephp 2.x to behave like 3.0 .
It uses try/catch to better handle transaction.
Previous save() API is renamed to protected _doSave() method.
A new save() method is created for transaction handling.
'atomic' option is disabled for internal 'save()' call.
2014-06-03 09:37:17 +02:00
mark_story
92eeef8ae0
Merge branch 'master' into 2.6
2014-06-02 22:57:25 -04:00
mark_story
55672b6df3
Merge branch 'router-stars' from Hikkijp
...
Refs #3582 , #3581
2014-06-02 22:38:27 -04:00
mark_story
4362f7bf8b
Add tests for CakeRoute::match() and trailing * routes.
...
Add tests for /pages/** routes, and fix coding standards errors.
Refs #3581
2014-06-02 22:37:37 -04:00
mark_story
9ba7abd89f
Merge branch 'FormAuthenticate_empty_fix' from KeinBaum
...
Closes #3624
2014-06-02 22:03:40 -04:00
mark_story
975e4c3af0
Allow username of 0 in basic authentication.
...
Refs #3624
2014-06-02 22:02:28 -04:00
mark_story
d1e4dfac47
Add tests for #3624
...
The username of '0' should be accepted by FormAuthenticate.
Refs #3624
2014-06-02 21:58:50 -04:00
KeinBaum
88b3629f4f
#3623 : Allow username "0" with FormAuthenticate
2014-06-02 19:11:02 +02:00
Mark Story
ad43461974
Merge pull request #3621 from cakephp/api-doc-comments
...
More API docblock CS fixes.
2014-06-02 11:47:41 -04:00
ADmad
e7debd8692
More API docblock CS fixes.
2014-06-02 18:27:11 +05:30
Mark Story
3108217d73
Merge pull request #3609 from php-engineer/master-docblock
...
Correct Docblock
2014-06-01 09:25:08 -04:00
Stefan Dickmann
91907b5c6c
correct docblock
...
invalid certificate domain
2014-06-01 13:23:47 +02:00
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