Commit graph

166 commits

Author SHA1 Message Date
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
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
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
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