Andy Dawson
|
f34388c53a
|
Merge pull request #1471 from cakephp/feature/2.4-pretty-print
pretty print json and xml responses in debug mode
|
2013-08-03 01:35:56 -07:00 |
|
AD7six
|
1643e10c74
|
pretty print json and xml responses in debug mode
|
2013-08-02 15:17:24 +00:00 |
|
Christian Winther
|
cbb4f7db90
|
allow serialize in json and xml alias
|
2013-07-06 16:57:46 +00:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
mark_story
|
e97b3acebb
|
Merge branch 'master' into 2.4
|
2013-03-14 20:54:42 -04:00 |
|
Ceeram
|
18095ed42d
|
fix failing test with webrunner
|
2013-03-14 12:44:11 +01:00 |
|
ADmad
|
13029cc2bc
|
Merge branch 'master' into 2.4
|
2013-02-09 02:20:16 +05:30 |
|
Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
ADmad
|
afb62959ef
|
Added JSONP support for JsonView
|
2013-02-04 23:20:49 +05:30 |
|
Ceeram
|
e7dc23b920
|
Ensure callbacks are triggered when using Xml/Json view with view templates.
PaginatorHelper for instance needs this to correctly set options
|
2012-08-22 13:13:49 +02:00 |
|
Jose Lorenzo Rodriguez
|
bf0f5ab118
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-04-29 20:05:39 -04:30 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
euromark
|
bc2cd00123
|
cake 2.2 test case fixes (assert corrections, correct class names)
|
2012-04-21 15:02:35 +02:00 |
|
mark_story
|
f5804cb4ca
|
Fix most coding standards in Test/Case/View
|
2012-03-15 22:50:05 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
6e1b1df2b2
|
Change serialize to _serialize
Its possible that a developer would use 'serialize' as a legitimate
view variable. Prefix with an _ to minimize that.
|
2011-11-27 23:51:49 -05:00 |
|
mark_story
|
50ec08f9bd
|
Adding support for array serialize values.
Using an array for 'serialize' gives a set of view vars
to convert into the view output.
|
2011-11-27 23:51:49 -05:00 |
|
mark_story
|
5e9b1583e5
|
Making JsonView work more like the XmlView.
|
2011-11-27 23:51:48 -05:00 |
|
mark_story
|
c64e41eb45
|
Fix casing of vars in tests.
|
2011-11-27 23:51:48 -05:00 |
|
Juan Basso
|
873489053c
|
Not loading helpers and others stuffs not necessary to Json view. Tests added.
|
2011-11-27 23:51:47 -05:00 |
|