Commit graph

16448 commits

Author SHA1 Message Date
ADmad
f7e66da6fc Fix derpness of fieldset and legend options being mashed inside $fields param array. 2012-11-15 11:22:04 +05:30
mark_story
a7f192c606 Merge branch 'master' into 2.3 2012-11-14 21:50:29 -05:00
mark_story
374631dc8c Fix skip condition. 2012-11-14 21:42:40 -05:00
mark_story
9011b42bb4 Add skip if response is invalid. 2012-11-14 21:35:58 -05:00
mark_story
58de6702bc Fix notice errors when creating fields named 0.
Fixes #3371
2012-11-14 21:27:12 -05:00
Mark Story
7206254166 Merge pull request #955 from dereuromark/master-tree-fixes
Asserting that tree behavior generates valid sql in recover

Fixes #3366
2012-11-14 18:03:05 -08:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
b7e75a6399 more whitespace coding standards 2012-11-14 12:36:55 +01:00
euromark
8f78b1e05b fix coding standards for whitespaces 2012-11-14 12:24:08 +01:00
euromark
b48f105b3f fix tabs to spaces 2012-11-14 09:55:33 +01:00
planardothum
a0f323eb4c Add frameworks compatible Breadcrumbs.
New options in HtmlHelper::getCrumbList() to make it compatible with Twitter Bootstrap, Zurb foundation or other CSS frameworks.
2012-11-13 20:19:29 -05:00
planardothum
f078715d8e Merge branch 'master' of https://github.com/planardothum/cakephp
Conflicts:
	lib/Cake/View/Helper/HtmlHelper.php
	lib/Cake/View/Helper/PaginatorHelper.php
2012-11-13 19:53:57 -05:00
planardothum
d1a591bd44 Merge branch '2.3' of https://github.com/cakephp/cakephp 2012-11-13 19:50:38 -05:00
Harold Putman
77886a9c5b Merge remote-tracking branch 'upstream/master' 2012-11-13 17:18:00 -05:00
euromark
354069d229 cascade false for recover 2012-11-13 21:12:46 +01:00
ADmad
ac087ec938 Fix rules set being updated with array instead of CakeValidationRule objects. Closes #3367 2012-11-13 22:13:15 +05:30
euromark
22f65f7cb5 asserting that tree behavior generates valid sql in recover 2012-11-13 11:18:17 +01:00
Mark Story
bfbd05576b Merge pull request #947 from cakephp/2.3-http-socket
2.3 HttpSocket enhancements
2012-11-12 19:13:31 -08:00
Reuben Helms
4d87abfcdc Add CakeTestCase::getMockForModel convenience method
This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
2012-11-13 13:07:18 +10:00
mark_story
9ef9b8b662 Remove off by a second errors. 2012-11-12 21:47:05 -05:00
Mark Story
eb3e5095cd Merge pull request #948 from sitedyno/blowfish-updates
Blowfish Clarifications.
2012-11-12 18:32:37 -08:00
Heath Nail
895fcac0cd Improve Blowfish Docblocks 2012-11-12 14:36:43 -05:00
mark_story
12e2e1363d Skip more tests when openssl is not enabled.
5.2 environments on travis-ci don't have openssl enabled.
2012-11-11 22:53:13 -05:00
mark_story
593cfc05d5 Skip tests if openssl is not enabled. 2012-11-11 22:28:23 -05:00
mark_story
e0586da808 Fix tests that occasionally fail on postgres. 2012-11-11 22:14:59 -05:00
mark_story
d95ef5d5e8 Fix failing tests. 2012-11-11 21:57:52 -05:00
mark_story
240c8718eb Implement SSL peer verification in HttpSocket
Use the stream API and enable SSL certificate validation. This
increases the security features of HttpSocket, and provides easy access
to the stream context options.  SSL related configuration should be
prefixed with 'ssl_'.

Refs #2270
2012-11-11 14:23:17 -05:00
mark_story
7a5dfdf4ba Add mozilla root CA bundle.
This will enable SSL peer verification in HttpSocket.
2012-11-11 14:18:07 -05:00
mark_story
9e725641ad Add context() to CakeSocket.
This will help enable peer verification for HttpSocket later on.
2012-11-10 22:58:36 -05:00
mark_story
3e3af1f998 Rename HttpResponse to HttpSocketResponse.
This fixes long standing issues with pecl/http

Fixes #2765
2012-11-10 22:36:38 -05:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
mark_story
644d47c843 Fix ordering on another query that was failing on travis-ci. 2012-11-10 14:24:30 -05:00
mark_story
6378aab439 Call a few fewer methods. 2012-11-09 22:59:55 -05:00
mark_story
8b7b139353 Fix failing tests using chr(226) instead of unicode codes. 2012-11-09 22:32:29 -05:00
Mark Story
7e00be8f76 Merge pull request #945 from aleho/2.3
Use bytcode sequence for unicode ellipsis

Fixes #3356
2012-11-09 09:01:32 -08:00
ADmad
7360abb0fe Added query logging to DboSource::insertMulti(). Closes #3354 2012-11-09 16:51:51 +05:30
Alexander Hofbauer
c7fda5674e Use bytcode sequence for unicode ellipsis
The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
2012-11-09 09:38:28 +01:00
mark_story
ec3e85e31d Update docs for the escape option in CakeNumber::currency()
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
2012-11-08 22:20:17 -05:00
mark_story
fe4f9f246a Update docs for the escape option in CakeNumber::currency()
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
2012-11-08 22:19:51 -05:00
mark_story
3de72baeb1 Remove int cast from authentication adapters.
Forcing an int cast makes using the contain option difficult as you are
also required to manually set the recursive option. Omitting the
cast allows recursive to be set to null.

Fixes #3347
2012-11-06 20:27:28 -05:00
Renan Gonçalves
929ed57844 Fixed TestShell options, removed space which caused the option to not be recognized. 2012-11-06 01:44:51 +01:00
mark_story
f53153b812 Fix whitespace. 2012-11-04 21:24:23 -05:00
Lawrence Barsanti
a60a730e7e XmlView: configure top level element name
Allow the top level element name to be configured by setting
XmlView.RootNodeName.
2012-11-04 21:21:35 -05:00
José Lorenzo Rodríguez
c7f2a64ede Merge pull request #940 from ceeram/phpcs-errors
fix remaining cs errors
2012-11-04 09:55:00 -08:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
Ceeram
138098f327 only run codesniff on php files 2012-11-04 13:25:50 +01:00
ADmad
fa5ccf46d0 Fix coding standard errors 2012-11-04 02:52:00 +05:30
ADmad
084636bf9d Add App::uses() 2012-11-03 21:55:46 +05:30
ADmad
1476ccbe7e Revert "Merge pull request #937 from bar/master-controlelr-test"
This reverts commit ba8f278075, reversing
changes made to 4c6c3b0554.
2012-11-03 21:54:00 +05:30