mark_story
|
c597855fe4
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
|
2013-07-03 14:21:09 -04:00 |
|
euromark
|
f389435bae
|
coding standards and else block simplification
|
2013-07-03 19:27:17 +02:00 |
|
ADmad
|
75e7797a26
|
Allow escaping only attributes of a link and not it's title
|
2013-06-29 20:51:52 +05:30 |
|
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 |
|
ADmad
|
36c592e72e
|
Merge branch 'master' into 2.4
|
2013-05-26 11:23:53 +05:30 |
|
Gilles Wittenberg
|
6d996d52ce
|
Allow setting different type on scriptStart + scriptEnd
|
2013-05-21 20:14:44 +02:00 |
|
Gilles Wittenberg
|
f19615a3be
|
Allow setting different type on scriptBlock
|
2013-05-21 20:14:44 +02:00 |
|
Michael Tuttle
|
0d082b599a
|
changed HtmlHelper::tag() just return $text when empty($name)
|
2013-05-20 17:36:51 -06:00 |
|
Michael Tuttle
|
12462b2e51
|
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
|
2013-05-19 22:00:27 -06:00 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
euromark
|
09d9efe235
|
spelling corrections (a url to an URL, unify URL)
|
2013-04-29 11:05:17 +02:00 |
|
mark_story
|
3fc627c5f8
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
|
2013-03-30 22:12:27 -04:00 |
|
Renan Gonçalves
|
96c9174ee2
|
Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.
Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
|
2013-03-29 15:24:08 +01:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +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
|
0b46b042b9
|
Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
Closes #3593
|
2013-02-05 23:22:24 +05:30 |
|
mark_story
|
4af6039107
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
|
2013-01-26 21:16:26 -05:00 |
|
ADmad
|
db8127626a
|
Update helper usage to 2.x style in code examples
|
2013-01-19 13:15:33 +05:30 |
|
Ceeram
|
3f4d24bfc0
|
remove unused local variables and a few improvements
|
2012-12-23 13:53:13 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
mark_story
|
6f5ff4d7dd
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
|
2012-12-13 20:20:42 -05:00 |
|
mark_story
|
8a77a31620
|
Set translations to use the cake domain.
Core classes should be using either the cake, or cake_dev domain.
Fixes #3443
|
2012-12-09 13:25:00 -05:00 |
|
ADmad
|
72d6ca636f
|
Docblock fixes
|
2012-11-29 04:36:29 +05:30 |
|
mark_story
|
c504fcfdf0
|
I'm a tool, fix test and remove debug().
|
2012-11-17 14:57:03 -05:00 |
|
mark_story
|
a3ddff4aa7
|
Fix failing test & simplify code.
|
2012-11-17 14:51:57 -05:00 |
|
planardothum
|
bed9ba22cc
|
Fix spaces around operators.
|
2012-11-15 20:15:49 -05: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 |
|
euromark
|
0f978195d6
|
coding standards regarding whitespaces
|
2012-10-27 00:46:12 +02:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
euromark
|
b47e3a7d92
|
move charset/App.encoding into CakeResponse
|
2012-09-27 20:28:19 +02:00 |
|
dogmatic69
|
b1f26b59a3
|
converting if ($foo != null) to if ($foo)
|
2012-09-21 23:30:43 +01:00 |
|
dogmatic69
|
a38a616cba
|
changing join() to implode() for consistency
|
2012-09-15 11:06:02 +01:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
dogmatic69
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
ADmad
|
28951865c6
|
Hidden divs created by FormHelper can now be customized.
|
2012-09-04 23:56:30 +05:30 |
|
euromark
|
b32edfe378
|
fix double-encoding of external urls
|
2012-06-12 16:30:37 +02:00 |
|
Thiago Colares
|
6262a074f6
|
Breaking tableHeaders description in two lines
|
2012-05-30 09:34:10 -03:00 |
|
Thiago Colares
|
c65d4318cf
|
Enhancement in HtmlHelper > tableHeaders. Each tablename also can be a key that points to an array with a set of attributes to its specific tag
|
2012-05-29 23:28:57 -03:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
mark_story
|
8eb913433f
|
Move _attributeFormat and _minimizedAttributeFormat down.
Both properties are referenced by Helper. The properties
should be declared there as well.
Fixes #2771
|
2012-04-13 07:48:09 -04:00 |
|
mark_story
|
c54ac257f1
|
Fix getCrumbs() with no crumbs and first link.
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.
Fixes #2689
|
2012-03-17 23:23:42 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
acccdcde1f
|
Fix coding standard issues in View/
|
2012-03-03 17:10:12 -05:00 |
|
Jose Lorenzo Rodriguez
|
c84e25e5b4
|
Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it
|
2012-03-01 14:56:56 -04:30 |
|
euromark
|
e94d307ee1
|
code conventions
|
2012-02-25 19:46:05 -05:00 |
|
Tigran Gabrielyan
|
95ba5f45a5
|
Keeping code dry in HtmlHelper::getCrumbs/getCrumbList
|
2012-02-21 11:38:13 -08:00 |
|
Tigran Gabrielyan
|
af2fd03590
|
Added startText feature to HtmlHelper::getCrumbList()
|
2012-02-16 19:17:43 -08:00 |
|
mark_story
|
afecb713ab
|
Make button type nullable.
Fixes #GH365
|
2012-02-13 21:00:57 -05:00 |
|
ADmad
|
e2b273e891
|
Renaming option type to tag to avoid potential conflict in future with html attribute.
|
2012-02-10 19:44:55 +05:30 |
|
ADmad
|
be694d8d6b
|
Allowed specifying media path using 'src' attribute
|
2012-02-10 13:06:55 +05:30 |
|
Tigran Gabrielyan
|
7fe6a4d5ea
|
Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests
|
2012-02-07 20:20:50 -08:00 |
|
ADmad
|
c0690a3eff
|
Added reponse object as property of View class View::$response. Refactored HtmlHelper::media() a bit.
|
2012-02-06 20:45:00 +05:30 |
|
ADmad
|
c57275636c
|
Replacing HtmlHelper::video() with HtmlHelper::media() which can generate either audio or video element
|
2012-02-06 18:57:16 +05:30 |
|
ADmad
|
2f7f00daa2
|
"preload" is not a minimized attribute
|
2012-02-06 12:37:13 +05:30 |
|
ADmad
|
22220074f2
|
Added HtmlHelper::video() for html5 video element generation. Extracted asset url generation code to new function Helper::assetUrl().
|
2012-02-06 01:30:38 +05:30 |
|
ADmad
|
12bf1348f5
|
Merge branch '2.0' into 2.1
|
2012-02-05 17:55:46 +05:30 |
|
ADmad
|
b5c7ca2ee9
|
Added self closing tag format.
|
2012-02-05 17:43:23 +05:30 |
|
mark_story
|
94778ef673
|
Add block option to HtmlHelper::scriptBlock()
|
2012-01-31 22:20:21 -05:00 |
|
Ceeram
|
7eda0affe3
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/View/ThemeView.php
|
2012-01-26 21:40:18 +01:00 |
|
mark_story
|
5b9d69fcc8
|
Update image() docs.
|
2012-01-25 21:14:01 -05:00 |
|
Kyle Robinson Young
|
f69edb5c80
|
Remove incorrect parameter in HtmlHelper::script docblock example
Fixes #76
|
2012-01-23 16:01:38 -08:00 |
|
Cauan Cabral
|
03bac42366
|
Change fullPath option to fullBase in HtmlHelper::image for consistency
Updated test cases for that.
Included doc block about that option.
|
2012-01-18 08:32:40 -03:00 |
|
Cauan Cabral
|
90426674cb
|
Merge branch 'master' into 2.1
|
2012-01-17 23:18:54 -03:00 |
|
Cauan Cabral
|
0c0135ff5e
|
Option to return img src with fullpath address
|
2012-01-17 22:55:24 -03:00 |
|
AD7six
|
67f4fa0f20
|
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
|
2012-01-15 01:03:48 +01:00 |
|
AD7six
|
22f844c48f
|
prevent block="css" when using inline=false css
|
2012-01-15 01:03:17 +01:00 |
|
mark_story
|
c89c49c310
|
Enhance HtmlHelper::getCrumbs() $startText param
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.
Fixes #2475
|
2012-01-14 13:14:26 -05:00 |
|
mark_story
|
9562638610
|
Merge branch '2.0' into 2.1
|
2012-01-04 07:39:35 -05:00 |
|
mark_story
|
3e1c567f08
|
Remove duplicate methods.
Fix regression where #1345 was re-introduced.
Fixes #2434
|
2012-01-03 21:11:45 -05:00 |
|
ADmad
|
389072708a
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
|
2011-12-22 03:15:04 +05:30 |
|
mark_story
|
866177f37d
|
Fix issue with link generation and no title.
Fix urlencoded text from being displayed in text of links.
Fixes #2387
|
2011-12-19 20:49:01 -05:00 |
|
Kyle Robinson Young
|
c34bf673d5
|
Remove extra space in HtmlHelper radio tag
|
2011-12-18 09:40:23 -08:00 |
|
mark_story
|
82139fe8f6
|
Updating HtmlHelper to allow custom blocks.
Adding tests for blocks.
Adding missing tests.
|
2011-12-17 22:23:34 -05:00 |
|
Mark Story
|
4606ea39a9
|
Updating HtmlHelper and its tests to use View::append().
|
2011-12-17 22:23:34 -05:00 |
|
Kyle Robinson Young
|
d794084d38
|
More code standards formatting
|
2011-12-15 23:00:07 -08:00 |
|
Kyle Robinson Young
|
51f9837db4
|
Code standards formatting
|
2011-12-15 22:52:07 -08:00 |
|
ADmad
|
72497147bd
|
Changing default docType to 'html5'
|
2011-12-05 07:04:00 +05:30 |
|
Kyle Robinson Young
|
8197f87dbc
|
Spelling and grammar fixes
|
2011-12-01 21:58:09 -08:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
Kyle Robinson Young
|
1d50562931
|
Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers
|
2011-11-29 21:23:02 -08:00 |
|
mark_story
|
5180540d1f
|
Fix protocol relative urls for CSS and JS files.
Protocol relative urls are generally not on the same host
don't try and run them through the asset filters.
Fixes #2285
|
2011-11-24 21:04:57 -05:00 |
|
Kyle Robinson Young
|
4e8239a2a5
|
Add missing @link to docs if available to helpers
|
2011-11-13 22:08:20 -08:00 |
|
Florian Krämer
|
b6d7766e78
|
Updating the @link's in the doc blocks for the views
|
2011-10-15 12:46:22 -04:30 |
|
Majna
|
a5220fa7bb
|
Fixed doc block comments.
|
2011-10-11 00:22:23 +02:00 |
|
Juan Basso
|
61833294f0
|
Changed the visibility to methods that not affect others classes.
|
2011-08-20 01:39:30 -04:00 |
|
Juan Basso
|
f5a54d00dd
|
Changed methods and attributes from private to protected.
|
2011-08-20 00:43:34 -04:00 |
|
Juan Basso
|
620a65b2fc
|
Merge branch '2.0' into 2.0-api-doc
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
|
2011-08-14 21:12:05 -04:00 |
|
mark_story
|
a268eea24f
|
Expanding docs on HtmlHelper.
|
2011-08-07 18:17:14 -04:00 |
|
Juan Basso
|
895c10af7b
|
Adjusted some types in @param, @return and @var.
|
2011-07-31 22:57:17 -04:00 |
|
Juan Basso
|
fedadc091c
|
Included @throws in API that was missing.
|
2011-07-31 16:55:52 -04:00 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Juan Basso
|
02f290ac52
|
Fixed some API doc in views.
|
2011-07-28 22:45:47 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Mark Story
|
d6e262da2d
|
Fixing form action attributes being double encoded with
querystring attributes.
Fixes #1748
|
2011-06-23 14:32:53 -07:00 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Renan Gonçalves
|
ed96936ea7
|
According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything.
|
2011-05-30 22:26:42 +02:00 |
|
Renan Gonçalves
|
438050dcaa
|
Adding 'public' visibility to all public methods.
|
2011-05-30 22:02:32 +02:00 |
|