Harold Putman
cfdac5e32d
Allow plus signs in URL's to pass unscathed in Helper functions.
...
According to RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.
2013-06-21 14:24:39 -04:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
mark_story
111bfa43d4
Fix incorrect autolinking when urls end at HTML tags.
...
Fixes #3879
2013-06-15 22:01:29 -04:00
mark_story
e2d69402e7
Remove dead view cache code.
...
Now that cache files contain the response headers, this is no longer
needed. Remove what is now duplicate code.
Refs #2358
2013-06-12 21:30:42 -04:00
Mark Story
e454f2d2a3
Merge pull request #1334 from thegallagher/2.3-cache-fix
...
Fix content-type header in cached views.
Fixes #2358
2013-06-12 18:27:42 -07:00
euromark
b5b8885096
doc block formhelper postLink
2013-06-12 18:14:02 +02:00
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
David Gallagher
e222b3b78e
Remove trailing space
2013-06-07 01:01:33 +10:00
David Gallagher
0ada093295
Set content-type to xml to replicate existing behaviour
2013-06-07 00:28:28 +10:00
David Gallagher
0eead76d4b
Fix content-type header in cached views. Fixes issue #2358
2013-06-06 23:33:51 +10:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07: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
Saleh Souzanchi
ca44413689
fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options
2013-06-01 14:16:23 +04: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
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
Mark Story
085ebae1d3
Merge pull request #1295 from cakephp/master-i18n-fixes
...
Master i18n fixes
2013-05-22 06:20:04 -07:00
euromark
fa02a2efc9
unify "Are you sure you want to delete"
2013-05-22 12:15:33 +02:00
euromark
e3e11a48e6
fix some domain translations and remove leftover true param from 1.x
2013-05-22 11:15:01 +02:00
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
mark_story
72b75660e5
Merge branch 'master' into 2.4
2013-05-16 21:31:27 -04:00
mark_story
f7d106a386
Fix FormHelper::tagIsInvalid with saveMany forms.
...
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.
Fixes #3828
2013-05-13 21:09:31 -04:00
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8
Add missing urlencoding to base/webroot.
...
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
mark_story
f745a02210
Add missing html escaping.
...
This should have been here the whole time. Many of these variables could
contain user input.
2013-05-09 23:12:07 -04:00
mark_story
a49c69acc4
Add missing h() calls to exception stack traces.
2013-05-09 22:23:20 -04:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
ADmad
91319bbe7b
Fix disabled attribute check.
...
Fixes #3818
2013-05-08 01:43:27 +05:30
Matt Creenan
3c46b8a491
Fix typo in link to cakephp book documentation
2013-05-06 13:00:06 -03:00
euromark
4c4fdc6f70
resolve unnecessary naming conflict in SQL dump output
2013-05-06 12:18:01 +02: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
mark_story
df8f5e8f84
Add additional entropy to postLink()
...
This should help make more uniq id's for postLinks that are created
sequentially.
Fixes #3807
2013-05-01 09:46:57 -04:00
mark_story
41d124d4de
Fix autoLinkUrls() not autolinking URL's without a /.
...
Refs #GH-1259
2013-04-30 17:02:07 -04:00
euromark
6b015d9771
fix select hours for 0/12
2013-04-30 14:54:09 +02:00
euromark
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
mark_story
62186ac8da
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
mark_story
65b1a94e63
Simplify how fullBase is calculated.
...
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.
Fixes #3777
2013-04-27 23:03:25 -04:00
ADmad
e11d0f829a
Added html5 required attribute for select tags too
2013-04-27 18:39:53 +05:30
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
euromark
67cc7f66da
dont add required class on wrapper div
2013-04-26 15:41:35 +02:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
64da4e75c4
Remove silly code.
...
Changing the 12'th hour into 0 shouldn't be done when figuring out the
meridian, it makes sorting things out later more complicated. Remove
some duplicated code.
2013-04-20 14:48:54 -04:00
mark_story
f6c3015705
Add additional tests and fix incorrect meridian selection
...
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.
Refs #GH-1237
2013-04-20 14:39:47 -04:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
mark_story
ed435870ae
Fix secure field lists when select elements have custom name attributes.
...
When a select element had a custom name attribute the secured field name
was incorrect.
Fixes #3753
2013-04-12 12:30:05 -04:00
ADmad
548cccbbe2
"maxlength" is not a valid attribute for input element of type "number" in html5.
2013-04-11 21:06:52 +05:30