Commit graph

929 commits

Author SHA1 Message Date
mark_story
465c24f903 Adding a test case for TextHelper::toList(). Closes #1043 2010-08-26 20:30:30 -04:00
mark_story
903b260638 Changing spaces to tabs. 2010-08-26 20:29:03 -04:00
mark_story
750fe3aa05 Removing text() and password() as the new __call method handles them.
Updating test cases and adding a test for allowing a magic method to override the type.
2010-08-17 00:13:22 -04:00
mark_story
e79df23491 Adding a magic __call method to handle html5 inputs and simplify input generation logic. 2010-08-17 00:06:23 -04:00
mark_story
f46241a6e7 Merge branch '2.0' into 2.0-helpers 2010-08-16 23:02:44 -04:00
mark_story
2abf34d93e Fixing issue where an app that was in a directory that had the same name
as a controller would end up failing to find view cache files.
Adding test for app name in controller name failure to create cache
Fixes #1025

Conflicts:

	cake/libs/view/helpers/cache.php
2010-08-16 22:11:25 -04:00
mark_story
705e90bef7 Merge branch '1.3' into 2.0-merge
Conflicts:
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
2494156e9a Removing reference operators that caused tests to fail.
Adding an alias as several tests relied on a User object being in the registry to autodetect fields.
2010-08-10 23:18:43 -04:00
mark_story
6d9cee57ba Fixing failing tests from merge with 1.3 2010-08-10 23:18:42 -04:00
mark_story
dfa5273b22 Making SessionHelper not use ClassRegistry to access View. SessionHelper still needs to not inherit from CakeSession. 2010-08-10 23:18:41 -04:00
mark_story
576eba3ef9 Removing ClassRegistry use from FormHelper and its test case. 2010-08-10 23:18:41 -04:00
mark_story
90b0ac7258 Removing remaining ClassRegistry::getObject() in HtmlHelper. 2010-08-10 23:18:41 -04:00
mark_story
7efe1636aa Making HtmlHelper not use ClassRegistry to access the View instance. Updating test cases. 2010-08-10 23:18:41 -04:00
mark_story
d6362f1857 Converting spaces to tabs. 2010-08-10 23:18:38 -04:00
mark_story
6a88452072 Updating TextHelper to not use create_function(). The create_function calls leaked memory and didn't work with the new helper constructors. 2010-08-10 23:18:38 -04:00
mark_story
2d791e1ed0 TextHelper test case constructor issues fixed. There are still fails caused by create_function in the helper. 2010-08-10 23:18:38 -04:00
mark_story
4672cee5d3 Removing dispatchMethod from JsHelper, its not really that useful, and is good at hiding bugs in mock tests.
Updating test cases.
2010-08-10 23:18:38 -04:00
mark_story
0e933e8893 Updating most helper test cases to use View in their constructors. 2010-08-10 23:18:38 -04:00
mark_story
1371cefc3d Applying patch from 'thatcode' to fix an issue where FormHelper::datetime() would not use 'default' or 'value' keys like other inputs would. This corrects an unintentional inconsistency in the methods. Test cases added. Fixes #988 2010-08-09 23:49:18 -04:00
mark_story
d6e3c318cd Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-08-04 23:59:17 -04:00
mark_story
22673a5348 Adding a test case for CacheHelper correctly generating filenames when $this->here includes all the named and passed args. Refs #977 2010-08-04 23:08:43 -04:00
Juan Basso
72bb229a9c Added tests to ticket #959 2010-08-04 22:10:44 -03:00
Juan Basso
8f1bdd5378 Change to RssHelper use Xml class instead XmlHelper. 2010-07-28 17:47:02 -03:00
ADmad
6527e9269a Fixing detection and automatic appending of extension '.js' to urls in call to HtmlHelper::script(). Closes #965 2010-07-29 02:11:00 +05:30
José Lorenzo Rodríguez Urdaneta
4c71dd845e Merge remote branch 'origin/2.0' into 2.0-request
Conflicts:
	cake/libs/controller/components/auth.php
	cake/tests/cases/libs/controller/components/auth.test.php
2010-07-27 22:02:08 -04:30
predominant
3430930fde Remove Session helepr disabling tests. 2010-07-27 22:25:37 -04:00
predominant
86a7263ab5 Fix cookielifetime variable declaration for CakeSession. 2010-07-27 22:25:37 -04:00
predominant
b054e122f1 Comment out testValid() for SessionHelper 2010-07-27 22:25:37 -04:00
predominant
6f2cee65b6 Fix removed valid() test. 2010-07-27 22:25:37 -04:00
predominant
04b67e59fc Fix tests to remove checking of session ID directly on Session Helper. 2010-07-27 22:25:37 -04:00
Juan Basso
43d49095ae Removing xml helper. Use SimpleXML instead. 2010-07-26 21:39:45 -03:00
Thomas Ploch
fb9faf10f7 Added missing option arrays to abstract function definitions in JsBaseEngineHelper. Fixed test cases accordingly. Fixes #704 . 2010-07-13 20:04:11 -04:00
mark_story
8b847cffef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/helper.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:54:28 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
dae14ac72b Removing debug. 2010-06-28 23:44:36 -04:00
mark_story
7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
mark_story
1c47702cb9 Updating formatting to match coding standards. 2010-06-28 22:53:33 -04:00
Leszek Stachowski
68a9c9c5ab Added HtmlHelper::getCrumbList() to generate semantically correct
(x)html breadcrumb navigation path and a test to it. Fixes #856

Signed-off-by: mark_story <mark@mark-story.com>
2010-06-28 22:36:28 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
f11f9ebc68 Adding test case for #867. 2010-06-28 21:32:49 -04:00
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
5945edd983 Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838 2010-06-21 21:17:37 -04:00
mark_story
e14d8e5280 Updating test cases to work with JsBaseEngineHelper being abstract. 2010-06-20 22:31:24 -04:00
mark_story
d59544b64f Renaming test case classes to better match the filenames. 2010-06-13 10:01:37 -04:00
mark_story
50144d6b5b Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 2010-06-12 22:50:09 -04:00
mark_story
f0d755bd8e Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806 2010-06-10 19:11:26 -04:00
mark_story
9ee4a12a9d Adding additional tests for FormHelper::input() and checkbox generation and checked attribute being set for truthy values. Close #806 2010-06-10 12:48:55 -04:00
José Lorenzo Rodríguez
7aa01c4c77 Migrating SessionHelperTest to phpunit 2010-06-04 23:42:21 -04:30
mark_story
e41e89cd2a Making magic select not override magic hidden. Tests added.
Fixes #782
2010-06-04 00:20:14 -04:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
José Lorenzo Rodríguez
50021ee646 Merge branch '2.0-phpunit' of git@github.com:cakephp/cakephp into 2.0-phpunit 2010-05-18 23:57:41 -04:30
José Lorenzo Rodríguez
103d5c2505 Partially migrated JsHelperTest to phpunit 2010-05-18 23:56:50 -04:30
mark_story
07c957e827 Making PaginatorHelper test run under PHPUnit. 2010-05-19 00:14:37 -04:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
76f94d5c75 Fixing form attribute access and broken test. 2010-05-17 23:31:47 -04:00
José Lorenzo Rodríguez
327d42d6de Fixing CacheHelperTest for phpunit 2010-05-17 22:35:54 -04:30
José Lorenzo Rodríguez
f7949d6ace Fixing FormHelperTest for phpunit 2010-05-17 22:30:04 -04:30
mark_story
f114d4299d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods.
Tests added.
Fixes #728
2010-05-17 18:25:50 -04:00
mark_story
4915645fb1 Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 2010-05-16 23:42:14 -04:00
José Lorenzo Rodríguez
32a46e9eda Converting HtmlHelperTest to phpunit 2010-05-15 21:05:22 -04:30
mark_story
4453c9122d Fixing JsHelper test cases to use the request object. 2010-05-14 23:29:16 -04:00
mark_story
322cceb8c1 Updating Text and Time test cases. 2010-05-14 23:13:31 -04:00
mark_story
0eebda9ee1 Updating HtmlHelper test to use request object.
Removing reference operators.
2010-05-14 23:11:38 -04:00
Mark Story
3983bf318d Updating PaginatorHelper and its test cases to use the request object. 2010-05-14 00:32:56 -04:00
Mark Story
c5dfd128fb Updating FormHelper and its tests to use the request object. 2010-05-14 00:21:22 -04:00
Mark Story
0d3011d2c3 Updating CacheHelper to use CakeRequest. 2010-05-14 00:12:29 -04:00
José Lorenzo Rodríguez
8c3df122eb Merge commit 'lorenzo/2.0-phpunit' into 2.0-phpunit
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
	cake/tests/lib/test_manager.php
2010-05-12 23:58:56 -04:30
ADmad
3539660cd0 Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 2010-05-12 00:42:02 +05:30
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
José Lorenzo Rodríguez
b53d21ff52 Fixing a group test case to show how to create one, and to make pass TestManager test case 2010-05-04 23:58:17 -04:30
Mark Story
c5fdeec7a1 Updating FormHelper tests to use CakeRequest. 2010-05-03 23:39:43 -04:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true
Closes #654
2010-04-30 16:42:59 -04:30
José Lorenzo Rodríguez
9b040a5ed3 Fixing code formating 2010-04-30 16:07:59 -04:30
ADmad
0471ea046f Adding test case for 'required' class adding to wrapping div based on model validations. Refs #654 2010-05-01 01:19:52 +05:30
ADmad
c2bd87144e Adding test case for HtmlHelper::url() showing use of key 'full_base' for parameter. Refs #627 2010-04-27 00:19:01 +05:30
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
2010-04-23 21:21:31 -04:00
Mark Story
9e08196c76 More tests for ajax link delegation. 2010-04-23 21:14:23 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
Mark Story
999eb4be7b Fixing illegal access in HtmlHelper tests, replacing with mock object. 2010-04-23 20:51:24 -04:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
Mark Story
215333e56f Making tests more accurate to normal use, removing extra params and adding some tests for sortKey. Refs #614 2010-04-22 22:53:36 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
2010-04-19 23:25:57 -04:30
Mark Story
9ae8b737dc Trimming trailing whitespace. 2010-04-17 13:05:26 -04:00
Mark Story
ae8ace79fa Adding additional tests for JavascriptHelper::object() options. Closes #588 2010-04-17 12:44:04 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
74d7682707 Fix translation shortcut usage through testing console for updates 2010-04-16 02:38:12 +10:00
Mark Story
c4d57bd6e7 Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper. 2010-04-14 00:13:33 -04:00
Mariano Iglesias
a6b83cdd93 Fixing issue where TextHelper::autoLinkUrls was failing on some expressions 2010-04-13 15:39:30 -03:00
predominant
4982705d07 More time helper test jiggering. Some peope still experiencing issues. 2010-04-13 15:06:44 +10:00
predominant
df76ff47e3 Fix TimeHelper tests failing due to timezone changes. 2010-04-13 12:20:58 +10:00
José Lorenzo Rodríguez
ceb2a1d4ed Removing date_default_timezone_set, as it is only available in php 5+
Hoping for the days were this type of commit is no longer needed
2010-04-09 09:40:27 -04:30
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
predominant
21f61ee34a Merge remote branch 'origin/1.3' into 1.3 2010-04-09 21:58:25 +10:00
predominant
cb0ae6ed76 Fixed TimeHelper tests. Force setting of timezone to GMT+5 to ensure tests are passing. 2010-04-09 21:20:01 +10:00
predominant
ac81ba75cb Added timezone setting to allow tests to pass in all timezones. 2010-04-09 21:17:55 +10:00
Mark Story
30e6c57a96 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 23:37:27 -04:00
Mark Story
c38249ac28 Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
José Lorenzo Rodríguez
05af213d59 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-08 22:26:04 -04:30
José Lorenzo Rodríguez
03e3c3249f Removing whitespace at the end of the file 2010-04-08 22:15:49 -04:30
Mark Story
94391d71c2 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 22:41:55 -04:00
Mark Story
9d3a2c61d4 Removing test that is no longer relevant due to changes in Router. 2010-04-08 22:40:45 -04:00
José Lorenzo Rodríguez
59f7cb47d3 Improving test coverage on FormHelper to show the usage of the 'secure' key for inputs.
Fixing issue with select inputs that does not honor the value of 'secure'
2010-04-08 18:23:07 -04:30
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
Mark Story
3503872ab8 Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 2010-04-02 15:50:43 -04:00
Mark Story
d058234c1c Adding tests to PaginatorHelper::sort() for creating sort links that point at plugin shortcuts. Refs #535. 2010-04-02 13:43:03 -04:00
predominant
84ad35ca7a Added test for XML Helper serialization. Refs #284 2010-03-29 12:21:14 +11:00
Mark Story
5ec965830c Fixing issues caused by daylight savings time switch. 2010-03-14 13:20:52 -04:00
Mark Story
e304c48ec4 Adding test to show that select() doesn't always auto select options named 'Array'. Disproves #412 2010-03-12 23:17:11 -05:00
Mark Story
bed4027d37 Making JsHelper::writeBuffer() use the isAjax param to hint the domReady() event. Disabling domready events when the request isAjax fixes issues in prototype and makes output code simpler. Fixes #429 2010-03-08 22:51:46 -05:00
predominant
2218d186c8 Revert "Fixing escaping of forward slash for JS Engines."
This reverts commit 7334fdfbdf.
2010-03-09 14:30:28 +11:00
predominant
7d81d81176 Merge remote branch 'origin/1.3' into 1.3 2010-03-09 12:28:06 +11:00
predominant
7334fdfbdf Fixing escaping of forward slash for JS Engines. 2010-03-09 12:26:25 +11:00
Mark Story
1d449e3847 Refactoring label generation into a method.
Fixing issues with labels having a for attribute = Array when an array of id's is provided.
Fixing issues where a date input would require you to provide id keys for hour, minute, and meridian even if you were not using them.
Fixes #411
2010-03-04 22:46:43 -05:00
José Lorenzo Rodríguez
1f1e0f4ff7 Merge commit 'origin/1.3' into 1.3-form 2010-02-27 23:23:43 -04:30
José Lorenzo Rodríguez
b782563daf Adding test for form input templates 2010-02-27 23:18:21 -04:30
José Lorenzo Rodríguez
0ca5c11e6c Making the form helper put the "required" class on all imputs that have a validation rule and does not explicitly sets allowEmpty => true in validation array 2010-02-27 22:58:27 -04:30
Mark Story
3192e130af Fixing magic select creation for fields that have plural variables added to the view. 2010-02-27 11:01:28 -05:00
José Lorenzo Rodríguez
9a4de854d6 Improving the guessing process of required fields in the form helper.
Now it does not rely on the "required" property of the validation array anymore, which was misleading
2010-02-23 09:55:01 -04:30
Mark Story
06fc87fc2d Fixing lack of space in meta tags lacking a link attribute.
Fixes #371
2010-02-20 01:41:56 -05:00
Mark Story
6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
Mark Story
96bbbb2d72 Applying fixes made to JavascriptHelper to JsBaseEngine. 2010-02-17 22:27:52 -05:00
Mark Story
ab688b88f4 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:22:53 -05:00
Mark Story
2209f198f8 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:21:48 -05:00
Mark Story
0fda18d11c Fixing entity encoding of url strings inside remoteFunctions contained in safe CDATA blocks. Fixes #127 2010-02-08 23:07:13 -05:00
ADmad
8c1c0e63c0 Allowing a html tag's attribute to be omitted from ouput by setting its value to null or false. Closes #316 2010-02-08 03:00:43 +05:30
ADmad
6f08d86c8e Links generated by PaginatorHelper::prev and PaginatorHelper::next are now wrapped in 'span' or the tag specified in options. Fixes #311 2010-02-07 23:56:50 +05:30
Mark Story
7daad4acaf Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00
predominant
8d382d9168 Fixes #288. TextHelper truncation not playing nice with html in ending. 2010-02-02 09:13:52 +11:00
ADmad
59a4732eb8 Fixing issue where value of '$and' was appended to output string even when list array contained only one element. Fixed #285 2010-01-31 23:43:58 +05:30
Mark Story
832b15ba3e Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated. 2010-01-29 10:06:47 -05:00
ADmad
c9e047ce37 Adding 'orderYear' option for FormHelper::year to allow control over ordering of select options 2010-01-28 01:48:53 +05:30
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
ADmad
a8040506b0 Fixing spacing between button tag attributes. Fixes #241 2010-01-21 22:03:03 +05:30
Mark Story
0e09fee3b1 Correcting timehelper tests to use correct timestamp for indicated times. Making timezone output more resilient. 2010-01-16 20:14:57 -05:00
José Lorenzo Rodríguez
1910a7f7ee Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Removing gettests from jsHelper test case.
2010-01-15 19:04:13 -04:30
José Lorenzo Rodríguez
3bd4cc07a6 Fixes to make TimeHelper and test cases more compatible with PHP 4 2010-01-15 17:48:41 -04:30
Mark Story
476ef19fff Removing gettests from jsHelper test case. 2010-01-15 17:16:51 -05:00