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
mark_story
a275555297
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
Tigran Gabrielyan
30d6341e7f
Fixed bug in CacheHelper where PluginAppController was not being loaded
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-28 22:35:42 -05:00
Majna
d7b06194a4
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 18:24:28 +01: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
Mark Story
7cfd27e7f6
Merge pull request #419 from radig/2.1
...
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476 )
2012-01-25 18:05:56 -08:00
Kyle Robinson Young
f69edb5c80
Remove incorrect parameter in HtmlHelper::script docblock example
...
Fixes #76
2012-01-23 16:01:38 -08:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
wnasich
c95ab282dc
Test case and Fix for: Number::currency() issue
...
Fixes currency() for custom formats and numbers between -1 and 1.
Fixes #2489
Conflicts:
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
lib/Cake/View/Helper/NumberHelper.php
2012-01-19 21:07:27 -05: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
Jose Lorenzo Rodriguez
fa99b58622
Ensuring the javascript provider class is loaded before checking method on it
2012-01-07 18:03:22 -04:30
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
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196
Merge pull request #387 from shama/patch-text-truncate
...
Prevent TextHelper::truncate() from breaking HTML
2011-12-30 07:15:35 -08:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Mark Story
7f46ede097
Add more complete api docs for label()
...
Fixes #2415
2011-12-27 10:08:54 -05:00
Kyle Robinson Young
acca796d10
Fix tag order when closing open tags with TextHelper::truncate()
2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f
Prevent TextHelper::truncate() from breaking HTML
...
Fixes #2397
2011-12-24 21:25:07 -08:00
mark_story
2c0e030831
Move call to tagIsInvalid to FormHelper
...
tagIsInvalid() doesn't exist in Helper, and shouldn't be
called from that class.
Fixes #2411
2011-12-23 20:41:16 -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
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
c272a8b3ca
Update doc blocks.
2011-12-19 22:13:02 -05:00
mark_story
c13e6588f5
Datetime labels should point at the first input.
...
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.
Fixes #427
2011-12-19 22:09:46 -05:00
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
5225fe2b5c
Ability to set hiddenField value with FormHelper::checkbox
...
Fixes #1811
2011-12-18 23:34:19 -08:00
Kyle Robinson Young
c34bf673d5
Remove extra space in HtmlHelper radio tag
2011-12-18 09:40:23 -08:00
Kyle Robinson Young
c93dab69a3
Correct placement of between on FormHelper radio and input
...
Fixes #1992
2011-12-18 08:25:42 -08:00
mark_story
bcb8444ab1
Make CacheHelper able to handle nocache tags in elements.
...
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
2011-12-17 22:23:37 -05:00
mark_story
fb20841d25
Doing some internal re-factoring in CacheHelper.
...
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
2011-12-17 22:23:37 -05:00
mark_story
dcf8c0fd04
Re-factoring duplicated code out.
2011-12-17 22:23:36 -05: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
mark_story
78325a13b9
Remove un-used variable.
...
Fixes #2382
2011-12-16 23:02:27 -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
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
8bb6f8803c
Fix infinite loop when minYear/maxYear are not int.
...
Refs #2361
2011-12-11 22:11:14 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
ADmad
df097796c4
Fixing incorrect setting of default value for 'onDomReady' option in JsHelper::writeBuffer()
2011-12-08 14:03:39 +05:30
mark_story
64eb38a953
Fix disabled + SecurityComponent
...
Disabled inputs should be omitted from the secured fields.
This will enable forms to submit successfully as long as those
inputs stay excluded from the form submission.
Fixes #2333
2011-12-07 22:30:40 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
Kyle Robinson Young
7f22fcdbf5
Fix TextHelper excerpt method to work as documented
...
Fixes #2339
2011-12-05 12:12:09 -08:00
ADmad
72497147bd
Changing default docType to 'html5'
2011-12-05 07:04:00 +05:30
mark_story
457dd73ed0
Move viewVars assignment after callbacks.
...
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.
Fixes #2335
2011-12-03 14:45:21 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
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
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -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
teddyzeenny
803e7be363
Apply base64 encoding after helper serialization
2011-11-28 14:02:39 +02:00
teddyzeenny
a4aaaff53a
Escape single quotes after Helper serialization
2011-11-28 13:15:23 +02: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
Christian Hieke
61b9d77b75
Ceeram suggested this change https://github.com/cakephp/cakephp/pull/322#issuecomment-2780158
2011-11-24 09:41:58 +01:00
mark_story
07462f0bef
Fix nested name attributes for submit()
...
Nested name attributes and Security component did not co-operate.
Fixes #2271
2011-11-23 20:40:25 -05:00
mark_story
ceaf6871e0
Fix import.
2011-11-21 10:18:12 -05:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
mark_story
95b85118c7
Fix issue with button() and nested name attributes.
...
Buttons with nested name attributes were not properly unlocked
and caused SecurityComponent to black hole the request.
Fixes #2271
2011-11-19 11:43:09 -05:00
mark_story
f36c43bfe4
Add protected to method picked from 1.3
2011-11-19 11:37:37 -05:00
mark_story
c8ab4ad05b
Fix issue in TimeHelper with translated values.
...
LC_TIME files using unicode code points would incorrectly display.
Use either the Multibyte class or mbstring to correctly detect
and convert values.
Fixes #912
Conflicts:
lib/Cake/View/Helper/TimeHelper.php
2011-11-19 10:12:05 -05:00
Christian Hieke
7dfe72708f
Allow a boolean value for the disabled attribute in function radio.
2011-11-17 15:59:14 +01:00
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Kyle Robinson Young
4e8239a2a5
Add missing @link to docs if available to helpers
2011-11-13 22:08:20 -08:00
ADmad
87f12de1ab
Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper.
2011-11-14 02:11:18 +05:30
mark_story
42f9f8e2c3
Fixing strict errors.
...
While this is a minor API change, its required to
make CakePHP pass E_STRICT in testing.
2011-11-12 21:42:20 -05:00
mark_story
92688e2a49
Fix keying in SessionHelper::flash()
...
It shouldb e looking for the plugin in the params key. This
makes SessionHelper compatible with SessionComponent.
2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591
Fix session flash with plugins.
...
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
2011-11-12 11:03:17 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
Kyle Robinson Young
7df3252d6b
Add missing @link to TimeHelper docblocks and correct @return
2011-11-11 10:51:14 -08:00
Mark Story
946753acde
Merge pull request #306 from shama/patch-2
...
Fix incorrect toQuarter docblock return tag
2011-11-07 06:18:44 -08:00
Renan Gonçalves
f09904ca91
Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt
2011-11-07 10:44:28 +01:00
Kyle Robinson Young
72502e8fec
Remove extra fromString in TimeHelper::gmt and update docblock
2011-11-06 22:54:52 -08:00
Kyle Robinson Young
09300433f5
Fix incorrect toQuarter docblock return tag
2011-11-06 22:26:58 -08:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
mark_story
6623b7dc9d
Update generated cache files.
...
- Cache files should contain a response object on the controller.
Without it bad things happen.
- Include the $request and $response contructor arguments for Controller.
- Update import -> uses()
Refs #2190
2011-10-31 22:27:43 -04:00
mark_story
bcdf61a9d5
Adding escaping by default for TextHelper::autoLink()
...
TextHelper::autoLink, autoLinkEmails, and autoLinkUrls now all
escape HTML by default, this can be disabled using the escape => false option.
Fixes #1625
2011-10-29 12:08:43 -04:00
mark_story
ce9bb6b632
Fix validation detection in FormHelper
...
string values for validation means a single validation method.
That implies the field is required.
Fixes #2181
2011-10-28 21:35:43 -04:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
c2c63d373c
Fix incorrect field detection for habtm fields.
...
Fields on habtm models would always be treated as multiselects.
Even when there were additional fields specified.
Fixes #2153
2011-10-25 22:21:27 -04:00
mark_story
7547d2c2d1
Update doc block concerning plugins.
...
Fixes #2146
2011-10-25 20:33:55 -04:00
mark_story
d6bf1479c8
Add documentation and test for FormHelper::select()
...
An alternate syntax was undocumented and untested. Fix that.
Refs #1794
2011-10-23 22:27:07 -04:00
mark_story
d62351eb36
Revert the changes done to remove the 'cake' domain
...
After some discussion, polutting the app POT file
with unchanging Cake strings was incorrect. Having these
strings in a separate POT file allows reuse of translations across
projects.
Refs #2103
2011-10-23 20:36:31 -04:00
mark_story
25e9aaf6c8
Removing the remaining cake domain translations.
...
3rd time is a charm.
Fixes #2103
2011-10-19 23:09:21 -04:00
mark_story
7c70b371bf
Removing the rest of the 'cake' domain.
...
These string should all be part of the app POT files.
Fixes #2103
2011-10-19 22:55:50 -04:00
Johannes N
30504ef32b
Enable Asset timestamp for image submit buttons.
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2011-10-19 21:51:18 -04:00
mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
mark_story
6ecbcccf25
Updating links to the book.
2011-10-16 09:36:51 -04:00
Florian Krämer
b6d7766e78
Updating the @link's in the doc blocks for the views
2011-10-15 12:46:22 -04:30
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
Dave
db51c0539a
Fix TextHelper::autoLinkUrls() from linking iframes
...
iframe and img elements should not be autolinked.
Fixes #GH-208
2011-10-10 22:16:46 -04:00
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00