Commit graph

1311 commits

Author SHA1 Message Date
mark_story
955bd338e7 Unsetting local vars, so that viewVars with the name will be extracted. 2009-10-08 23:55:17 -04:00
mark_story
0d3ef03b9f Updating file headers. 2009-10-07 23:43:01 -04:00
mark_story
06162d5022 Deprecating TextHelper::trim() as it is an alias for truncate().
Expanding use of mb_ methods.
Tests updated.
2009-10-07 23:43:01 -04:00
Niles
cbf676c0e4 remove call to deprecated method. 2009-10-06 08:42:35 -04:00
mark_story
c47e899ba1 Fixing HtmlHelper::css, and JavascriptHelper::link so that files containing the asset extension always get the extension added. Test cases added. Refs #139 2009-10-02 12:53:20 -04:00
mark_story
f12cbdba38 Fixing CacheHelper and multiple cake:nocache tags in a view file, breaking cake:nocache following $content_for_layout. Fixes #136 2009-10-01 01:03:47 -04:00
mark_story
347c175b85 Updating documentation blocks for CacheHelper. 2009-09-30 22:44:15 -04:00
mark_story
58ec259714 Merge branch '1.3-router' into 1.3-misc 2009-09-30 00:51:20 -04:00
mark_story
1c8ec459b6 Removing 'id' key param in FormHelper::create() it normally only served to make routing more complex. Removal also enables reverse routing to work with scaffolding. 2009-09-29 22:46:45 -04:00
mark_story
070bbb5d0e Removing magic 'title' key in Controller::set() and View::set()
Removing Controller::$pageTitle and View::$pageTitle.
Instead you should set('title_for_layout', $val) from your view or controller.
Test cases updated.
2009-09-28 21:23:40 -04:00
mark_story
508d737b6a Updating HtmlHelper::css, JavascriptHelper::link to not replace multiple occurences of CSS_URL or JS_URL when using Asset.filter settings.
Test cases added.
Thanks to 'robustsolution' for the patch.
Fixes #105
2009-09-26 14:22:12 -04:00
mark_story
06cf97459a Fixing XmlHelper::elem() when value is null and cdata = true. Removing empty invalid tag.
Test cases added.
Fixes #127
2009-09-24 22:43:31 -04:00
mark_story
e030400f8e Updating links in home.ctp to point a new address for changelogs and to code.cakephp.org instead of trac. 2009-09-24 22:26:55 -04:00
mark_story
7f49f7f455 Updating HtmlHelper and JavascriptHelper to use Helper::assetTimestamp 2009-09-24 00:16:19 -04:00
mark_story
ee514f3fc6 Adding Helper::assetTimestamp()
Refactor's repeated code from Html and Javascript Helpers.
Test cases added.
2009-09-23 23:45:11 -04:00
mark_story
26d2237df0 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-23 23:30:55 -04:00
ADmad
de4737323f Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-23 23:30:34 -04:00
mark_story
6946bb0295 Updating docs for FormHelper::inputs()
Fixes #110
2009-09-23 23:05:08 -04:00
mark_story
022f8ccaa2 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-22 19:04:40 -04:00
ADmad
07a89cd953 Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-22 18:57:30 -04:00
mark_story
e6cc81226d Merge branch '1.3-jshelper' into 1.3 2009-09-20 17:46:30 -04:00
ADmad
5049265a49 Fixed incorrect doc. block for TimerHelper::format 2009-09-20 11:08:48 -04:00
mark_story
05f908d36d Fixing failing tests in JsHelper caused by changed API in HtmlHelper. 2009-09-16 01:55:15 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
3ef53aa159 Applying optimization from 'wangbo' to View::renderCache(). Fixes #26 2009-09-14 23:56:50 -04:00
mark_story
f1194a4ec9 Commiting fix to pass tests in last commit.
Making View::renderCache tests more specific.
2009-09-14 23:53:04 -04:00
mark_story
01cf40bf12 Adding automatic use of $options for $disabledOptions in PaginatorHelper::next() and PaginatorHelper::prev(). Thanks to 'joaquin_win' for the initial patch. Refs #83 2009-09-14 23:06:24 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
mark_story
9c41efd6fe Adding NumberHelper::addFormat and test cases. Refs #5630 2009-09-10 22:54:49 -04:00
mark_story
5f6015c3c4 Updating file headers and removing @static. 2009-09-10 22:23:48 -04:00
mark_story
0065005f95 Fixing custom error class not being used if error for field is a named index. Test case added. Fixes #76 2009-09-10 09:57:23 -04:00
mark_story
cf3521737f Fixing selected with interval not selecting the correct option. Fixes #70. 2009-09-03 22:47:17 -04:00
mark_story
ce7864920f Adding ability to add arbitrary attributes to HtmlHelper::scriptBlock. Test case added. 2009-09-03 13:50:53 -04:00
mark_story
ead3b0ecf6 Allowing HtmlHelper::script() to take an array of options, allows for custom attributes to be added to script include tags. Test cases added. Fixes #2955 2009-09-03 13:45:39 -04:00
mark_story
c963d5cc43 Updating file headers. 2009-09-03 12:43:13 -04:00
mark_story
2ff5334347 Minor refactor to remove method calls to Inflector::camelize.
Adding tests to ensure references are maintained.
2009-09-03 09:37:25 -04:00
evilbloodydemon
75695341fa Helpers addressed by $this->Helper->func() 2009-09-03 00:58:26 -04:00
mark_story
4d458e93b6 Updating SessionHelper::flash() to use elements for custom flash wrapping html instead of layouts. 2009-09-01 00:03:56 -04:00
mark_story
1bedd8418b Merge branch '1.3-deprecation' into 1.3-misc 2009-08-31 23:41:41 -04:00
mark_story
5fa6e5b6f2 Removing deprecated params. 2009-08-31 22:34:14 -04:00
mark_story
4d7fc24850 Fixing errors generated by ajaxProvider class not being loaded when checking for method implementation. 2009-08-31 11:38:31 -04:00
mark_story
81cb097959 Merge branch '1.3-behavior-error' into 1.3-misc 2009-08-30 19:33:43 -04:00
mark_story
776992dc6c Further optimizations to path scanning. 2009-08-30 19:13:54 -04:00
mark_story
8be5de947b Minor refactor in how paths are checked, so that fallback extensions are checked only when all paths fail, instead of for each path. Refs #49 2009-08-30 19:07:36 -04:00
mark_story
ef23ecfe07 minor refactor for file_exists checks. 2009-08-30 18:59:07 -04:00
mark_story
81865bc960 Removing use of ife() from core classes. 2009-08-27 22:54:57 -04:00
mark_story
4bb5b615f7 Applying patch from 'mete0r' to make the legend generated FormHelper::inputs() more i18n friendly. Fixes #6360 2009-08-27 22:38:49 -04:00
mark_story
7c4d60abe8 Adding patch from 'grncdr' to allow default direction to be set for sort links created with PaginatorHelper::sort. Fixes #5151 2009-08-26 23:55:19 -04:00
mark_story
4f2d415663 Applying patch from 'kuja' to give default class names to links generated by Paginator::sort().
Fixes #6239
2009-08-26 23:33:13 -04:00
mark_story
38a4b619e6 Adding default classes to next and prev links.
Switching next() and prev() to use span by default.
2009-08-26 22:55:24 -04:00
mark_story
533f6e0d36 Updating doc block. 2009-08-26 22:54:23 -04:00
mark_story
136b4db7ad Deprecating $escape for HtmlHelper::tag() use $attributes['escape'] instead. Test case added. 2009-08-26 22:46:49 -04:00
mark_story
c2db059732 Adding error methods and templates for Missing Behavior class and Missing Behavior File errors. 2009-08-26 10:02:55 -04:00
mark_story
56d2423bc3 Additional documentation. 2009-08-24 22:57:01 -04:00
mark_story
1a51d58713 Updating file header. 2009-08-24 22:53:55 -04:00
mark_story
b265a99bc9 Removing deprecated properties. 2009-08-24 22:53:09 -04:00
mark_story
31ec714e2e Adding View::_paths() optimization.
Test cases added.
Refs #49
2009-08-23 23:13:56 -04:00
mark_story
325446a8b3 Updating View::_paths to remove an always miss file_exists() check.
Test case added.
Refs #49
2009-08-23 22:43:51 -04:00
mark_story
a0feb84789 Removing support for deprecated .thtml view file extension. 2009-08-22 11:50:02 -04:00
mark_story
7a3a6966c2 Removing deprecated View::renderElement() 2009-08-20 01:20:44 -04:00
mark_story
6b6d7959e1 Updating doc blocks. 2009-08-20 01:20:13 -04:00
mark_story
add1dede86 Removing conditional calling of View::_render() as a static method.
Updating doc blocks.
2009-08-20 01:15:08 -04:00
jperras
2737062c6f Fixing doc block for TimeHelper::timeAgoInWords(). Fixes #27. 2009-08-13 13:57:15 -04:00
jperras
deed69ea37 Adding ability to input an array parameter for 3rd argument of TextHelper::highlight(). Implements #17. 2009-08-13 13:32:34 -04:00
mark_story
06e59abb1f Removing trailing spaces. 2009-08-12 10:21:28 -04:00
mark_story
459fcb7a1a Applying patch from 'evilbloodydemon'. Fixes JqueryEngine::request() when wrapCallbacks is true. Test cases added. Fixes #20 2009-08-12 09:45:42 -04:00
mark_story
4b88ba5f9d Updating doc block. 2009-08-12 09:45:42 -04:00
mark_story
08f0c7c157 Fixing method dispatching errors in JsHelper with regards to Object::object, and PHP4 workarounds. 2009-08-12 09:45:42 -04:00
mark_story
a7e300a7c1 Adding warning errors when an incompatible class is used. 2009-08-12 09:45:42 -04:00
mark_story
b1a27b1760 Adding ability to inject an ajax provider class into paginator helper. updating tests. 2009-08-12 09:45:42 -04:00
mark_story
d69772952c Fixing fatal error in php4 2009-08-03 14:42:33 -04:00
mark_story
83a705f739 Merge branch '1.3' into 1.3-jshelper 2009-08-03 14:39:21 -04:00
AD7six
a4bc755cc7 whitespace normalization 2009-08-02 16:10:24 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
gwoo
d118c6a764 Merge branch '1.3-newlines' into 1.3 2009-08-02 12:08:55 -07:00
gwoo
7fc465309e Merge branch '1.2' into 1.3 2009-08-02 11:58:39 -07:00
jperras
70c331f5db Updating doc blocks for paginator helper. Thanks to savant for the patch. Fixes #4994.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8271 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:55:37 +00:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
mark_story
878f3367d4 Updating doc block on JavascriptHelper::object(). Thanks BrendonKox. Fixes #6540.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8266 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 06:24:55 +00:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
mark_story
6d1c38c1cc expanding doc blocks. 2009-07-29 22:48:40 -04:00
mark_story
3a5b782737 Adding newlines and tests for slideDown slideUp alternate syntax for jquery engine. 2009-07-29 22:37:41 -04:00
mark_story
5b13b29a92 Adding callbackArguments and parseCallbacks to jQuery engine. 2009-07-29 22:19:02 -04:00
mark_story
24299cf943 Implementing wrapped callbacks in Mootools. Fixing implementation in Prototype. Adding JsBaseEngineHelper::_processOptions() to reduce duplicate code.
Test cases appended and updated.
2009-07-29 00:05:27 -04:00
DarkAngelBGE
f88cc56cfe Coding standards fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00
mark_story
47cd941b53 Applying optimization patch to PaginatorHelper and test refactorings to PaginatorHelper test case. Thanks Phally. Fixes #6526
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8259 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 12:40:31 +00:00
mark_story
75026715d1 Adding additional tests to Request and updating callback argument list. 2009-07-28 00:04:43 -04:00
mark_story
2e82d229b7 Adding variable declaration. 2009-07-27 22:37:14 -04:00
mark_story
ebc221dbf7 Updating sortable options.
Fixing drag() when selector is a multiple element selection.
2009-07-27 22:36:22 -04:00
mark_story
ec10e90efb Merge branch '1.3' into 1.3-jshelper 2009-07-27 12:11:43 -04:00
mark_story
cde9afb486 Updating Mootools engine to work seamlessly with $() and $$() type selections. 2009-07-27 08:45:31 -04:00
mark_story
7246563bae Adding newlines 2009-07-26 21:58:58 -04:00
AD7six
fd0aaefb39 whitespace normalization 2009-07-26 12:46:07 +02:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
mark_story
d4d9db43a7 Updating PrototypeEngineHelper::request() to use dataExpression. Allowing Js::submit() to work with prototype. 2009-07-25 18:12:53 -04:00
mark_story
dda6c93529 implementing serializeForm() in Prototype engine. 2009-07-25 18:02:54 -04:00
mark_story
def4c98a08 Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/header.php
2009-07-25 17:35:27 -04:00
mark_story
6f10f5de6d Fixing issues with ajax forms and mootools. post needs to be lowercase.
Implementing serializeForm() in MootoolsEngine.
Updating doc blocks.
2009-07-25 17:10:22 -04:00
mark_story
2414a43c91 Adding HtmlHelper::scriptStart and HtmlHelper::scriptEnd. Further deprecates JavascriptHelper. Fixing issues in test case. 2009-07-25 15:43:26 -04:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
mark_story
4ebf5a4e32 Merge commit 'code/1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/lib/header.php
2009-07-25 01:35:36 -04:00
mark_story
9a66c2cfc5 Fixing method param in jQuery engine. Needed to be converted to 'type'.
Fixing issues in JsHelper::submit() related to data being escaped.
Updating tests cases.
2009-07-24 23:29:44 -04:00
mark_story
49e0e5743f Adding tests for custom url on submit() 2009-07-24 22:54:22 -04:00
mark_story
e8b39fb9a5 Updating docs for serializeForm.
Making url for form js more flexible.
2009-07-24 22:47:08 -04:00
mark_story
36722c0ef2 Implementing serializeForm() in jquery engine. 2009-07-24 22:46:33 -04:00
mark_story
76c13fa98e Adding non buffered tests to Js::link()
Implementing Js::submit() adding test cases.
2009-07-24 22:13:54 -04:00
gwoo
986af28de0 Merge branch '1.2' into 1.3 2009-07-24 15:57:30 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
e40428801e Removing all uses of uses() global method & replacing with require or App::import. 2009-07-24 13:41:08 -04:00
DarkAngelBGE
8f61c666c2 Removing usage of r() from core
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8252 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 20:51:24 +00:00
gwoo
61c2c3009d updating session requires and removing deperacted method from text helper 2009-07-23 13:07:03 -07:00
mark_story
93d64c4e76 Removing use of e() from core classes. Refs #6525
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00:00
gwoo
a9d98e73c3 Merge branch '1.2' into 1.3 2009-07-22 09:27:31 -07:00
DarkAngelBGE
fefbe77208 Minor refactorings for DboMysql, DboSource and TextHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
mark_story
a3d5a9beae Adding stubs for JsHelper::submit() 2009-07-21 00:24:58 -04:00
gwoo
56bee6e1fc fixes #6507 paginator sort directions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8239 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:53:14 +00:00
gwoo
4cfdd311a9 fixes #6476, crash on missing layout in session flash
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8238 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:33:12 +00:00
gwoo
a2f0ab8b27 Merge branch '1.2' into 1.3 2009-07-20 09:31:56 -07:00
mark_story
76d5855d72 Applying patch from 'Phally' Fixes multiple issues in PaginatorHelper related to first and last option in numbers(). Fixes #6516
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8234 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 19:46:33 +00:00
mark_story
a5bfe72bd2 Updating file header and doc blocks. 2009-07-17 00:10:48 -04:00
mark_story
4a4b9eefe5 Updating file headers.
Removing newlines.
2009-07-17 00:09:06 -04:00
mark_story
baea319122 Applying patch from 'Dremora' fixes JavascriptHelper::codeBlock() and blockEnd() bugs where content vanished due to incorrectly structured buffers. Minor behavior change in that codeBlock(null) no longer returns an opening script tag. The entire script tag is returned when blockEnd() is called.
Test cases updated and refactored.
Fixes #6504


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8231 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-14 17:11:46 +00:00
mark_story
04fa46f228 Updating Js::link() adding confirm option. 2009-07-12 18:42:36 -04:00
mark_story
5119e58e3b Starting work on Js::link() 2009-07-12 17:30:41 -04:00
mark_story
69de1291e1 Removing deprecated options from object()
Tests updated.
2009-07-11 17:31:54 -04:00
mark_story
50c624486e Updating tests to reflect changes in json encoding. 2009-07-11 17:21:06 -04:00
mark_story
9c51f720ed Merge branch '1.3' into jshelper-integration
Conflicts:
	cake/tests/cases/libs/view/helpers/js.test.php
2009-07-06 23:43:57 -04:00
davidpersson
68d333d088 Applying patches by ADMad updating HtmlHelper and adding test. Adding missing properties in test case. Preventing bleed through in test case. Fixes #6490
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8220 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-04 22:04:40 +00:00
gwoo
f1a4352620 Merge branch '1.2' into 1.3 2009-07-03 08:24:42 -07:00
gwoo
8971aad8bf closes #6413, scaffoldFields not working with add/edit methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8214 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:14:36 +00:00
gwoo
9e143bc335 fixes #6473, dot notation for sort in next/prev
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8213 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:48:10 +00:00
gwoo
bc359259a2 Merge branch '1.2' into 1.3 2009-07-02 09:27:00 -07:00
mark_story
fd818bc493 Applying patch from 'mulleto'. Fixes plugin view file location with CamelCase plugin names. Test cases added.
Fixes #6334

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8202 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 22:02:00 +00:00
mark_story
1ea5f94c29 Updating JavascriptHelper::escapeString to properly encode utf8 characters as per the JSON spec.
Test cases added, with comparisons to json_encode()
Fixes #6400

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8198 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-17 01:59:41 +00:00
gwoo
e54dbd430f fixes #6419, redirect with cached view page
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8193 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-10 17:11:17 +00:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
gwoo
fdd63d4e8e Merge branch 'master' into 1.3 2009-06-02 10:12:14 -07:00
mark_story
1910e5482b Updating doc block for HtmlHelper::css(). Fixes #6059
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8175 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:25:13 +00:00
jperras
4f2d65943f Fixing form helper checkbox hidden input generation for disabled fields. Thanks to 'trevorsg' for the patch & test case.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8173 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-14 03:26:53 +00:00
mark_story
bf7e257e02 Updating coding standards in bake templates and scaffolds. Fixes #6346
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8167 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-07 00:53:44 +00:00
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
gwoo
db71202aac Merge branch '1.2' into 1.3 2009-05-01 08:26:02 -07:00
mark_story
7eaf331213 Updating doc block for FormHelper::input(). Fixes #6328
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8160 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-29 12:40:15 +00:00
mark_story
5bdd5560b7 Merge branch '1.3-jshelper' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/jquery_engine.php
	cake/libs/view/helpers/js.php
2009-04-26 23:28:05 -04:00
mark_story
912f6589d5 Partial Revert "Adding optional param to remove colon on methods. Allows use inside"
This reverts commit b29e130606176e4ad4d834fdf42746b3c4085686.
2009-04-26 23:24:39 -04:00
mark_story
e990c5ba37 Adding optional param to remove colon on methods. Allows use inside
object literals.
2009-04-26 22:53:26 -04:00
mark_story
9754926d02 Merging with self. 2009-04-24 13:44:52 -04:00
mark_story
005cc1b338 Removing old JsHelperObject 2009-04-23 22:58:42 -07:00
mark_story
91edcacec2 Adding newlines between methods. 2009-04-21 09:31:52 -07:00