ADmad
1b8165d890
Enhancing email component to allow using alias for attachments. Closes #6
2010-04-03 00:37:02 +05:30
Mark Story
e6f9c420b6
Removing transactional property from the Set test, as it was removed from the Model in the last commit. Ref #531
2010-04-02 13:55:05 -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
Mark Story
ffb5c36578
Adding tests for plugin shortcut route generation. Refs #535
2010-04-02 13:32:14 -04:00
ADmad
d92202c6da
Fixed controller test case which generated a property undefined notice
2010-04-02 00:01:06 +05:30
Mark Story
176c12e5fe
Adding tests for creating directories with trailing slashes. Closes #520
2010-03-30 22:35:49 -04:00
José Lorenzo Rodríguez
75900883e6
Making DboPostgres::value() return NULL when given an empty array, as DboMysql does
2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb
Using value() in default value generation with CakeSchema and DboPostgres
2010-03-29 23:50:40 -04:30
predominant
84ad35ca7a
Added test for XML Helper serialization. Refs #284
2010-03-29 12:21:14 +11:00
Mark Story
068631ebe2
Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added.
2010-03-28 16:59:24 -04:00
ADmad
d365fafe4d
Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false
2010-03-28 05:29:42 +05:30
Mark Story
7b28fdec85
Fixing Security::cipher() not being able to correctly decrypt numeric values. Fixes #513
2010-03-27 17:19:42 -04:00
Mark Story
1210a4f598
Fixing whitespacing.
2010-03-27 16:28:59 -04:00
Mark Story
8ab5abe852
Merge remote branch 'origin/1.2' into 1.3
2010-03-27 16:28:00 -04:00
Mark Story
3040c6f586
Moving tests around in set test.
2010-03-27 16:27:23 -04:00
Mark Story
35446a42a9
Making filtering of extracted arrays remember their key. This fixes attribute selectors followed by parent selectors returning seemingly random results. Fixes #502
2010-03-27 16:23:46 -04:00
Mark Story
3075eda8b6
Merge remote branch 'origin/1.2' into 1.3
2010-03-27 14:30:27 -04:00
Mark Story
b559be5822
Moving xml_parser_free() so parser resources are freed immediately after they are used. Helps reduce memory consumption in Xml class. Refs #505
2010-03-27 12:48:31 -04:00
Mark Story
0c29fd0094
Merge remote branch 'origin/1.2' into 1.3
...
Conflicts:
cake/libs/cake_session.php
cake/libs/controller/components/session.php
cake/libs/model/model.php
cake/libs/router.php
2010-03-27 11:48:49 -04:00
predominant
9bd0960cf1
Merge remote branch 'origin/1.3' into 1.3
2010-03-26 20:36:04 +11:00
predominant
0dfc07ba0d
Fixes #53 , ordering of XML::toArray() operations.
2010-03-26 20:30:17 +11:00
predominant
ec3f4b8d34
Fixes #53 , ordering of XML::toArray() operations.
2010-03-26 19:59:09 +11:00
Mark Story
888fdd3dd5
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-03-25 23:44:53 -04:00
Mark Story
d20aa23711
Fixing issues where paths added to build() would be appended into the search paths after the default paths.
...
Fixed issue where paths added with build() would be lost when calling build() again to change a different path type.
Tests updated.
Fixes #410
2010-03-25 23:44:40 -04:00
predominant
5d3f0d7fe0
Fix for Session Component to use CakeSession started() checks. Refs #332 .
2010-03-26 14:36:40 +11:00
predominant
9f5949ab52
Fix for Session Component to use CakeSession started() checks. Refs #332 .
2010-03-26 14:29:27 +11:00
José Lorenzo Rodríguez
41734503a6
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
...
* '1.3' of git@github.com:cakephp/cakephp1x:
Supporting Model.* syntax on postgres.
Changing variable $title to $title_for_layout. Closes #511
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500
Qouting fields inside postgres functions when prepended a DISTINCT, closes #512
2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d
Supporting Model.* syntax on postgres.
2010-03-25 17:33:34 -03:00
Mark Story
4f4d3f9ffe
Fixing extraction of non-zero arrays with only one element and attribute selectors. Fixes #475
2010-03-24 23:25:02 -04:00
Mark Story
cbb65ca85f
Moving failing test into new method for non-zero array extraction.
2010-03-24 22:36:38 -04:00
Jimmy Bourassa
e8e520d6f2
Added test case for a bug in Set::extract
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-24 22:34:41 -04:00
Mark Story
9d3f2fb4a7
Moving Non-Zero tests for Set::extract() into a separate method.
2010-03-24 22:33:51 -04:00
Mark Story
9334aeabc2
Adding tests for loading helpers off of additional paths. Closes #410
2010-03-24 22:11:53 -04:00
Mark Story
3883f728fb
Adding tests for Fixture importing. Fixing importing fixtures for databases that require custom fields handling like postgresql. Fixes #481
2010-03-22 23:28:58 -04:00
Mark Story
817ebf5ec8
Merge remote branch 'ceeram/1.3-467' into 1.3
2010-03-21 20:41:54 -04:00
Juan Basso
5e8665cd8d
Allowing routes to set an extension when Router::parseExtension() is
...
being used. Fixes #492
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:23:48 -04:00
Ceeram
7337c12f4f
test for ticket #467
2010-03-19 01:48:28 +01:00
ADmad
6a723bb515
Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477
2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
0f876e1a1b
Merge branch 'saveAll' into 1.3
...
* saveAll:
Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430
Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
28cb57a92c
Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
...
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3
Prevent sql error for uuids if id is specified as null
...
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520
Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
...
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
c51f4076f7
Forcing order on find('all') in test. It is not safe to asume returned row order in postgres
2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
201a952218
Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table
2010-03-16 15:12:27 -04:30
AD7six
0c951b7248
Prevent sql error for uuids if id is specified as null
...
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
661fcd32ab
Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields.
2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81
Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459
2010-03-15 22:55:14 -04:00
Mark Story
3ab687043e
Updating DboPostgres test to reflect changes in test suite.
2010-03-14 19:27:36 -04:00
ADmad
70d0c64283
Removing constant REQUEST_MOBILE_UA, and added variable $mobileUA instead for mobile browser detection. Also added new user agent string 'webOS', closes #457
2010-03-15 01:58:38 +05:30
Mariano Iglesias
1120d0daff
Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent
2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642
Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent
2010-03-14 16:34:57 -03:00
Mark Story
a51cceab18
Merge branch 'dbo-source-cache' into 1.3
2010-03-14 15:11:48 -04:00
Mark Story
5ec965830c
Fixing issues caused by daylight savings time switch.
2010-03-14 13:20:52 -04:00
Mark Story
c059cf5175
Implementing cacheMethod(). Helps to solve #458 , as it provides features to control and clear method caches.
2010-03-13 22:55:18 -05:00
ADmad
688daf2c35
Allowing the default transliteration map used in Inflector::slug to be customized using Inflector::rules. Closes #321 , #334 , #439 .
2010-03-14 02:22:46 +05:30
Mark Story
178099d15b
Adding test that closes #455
2010-03-13 00:26:23 -05:00
Mark Story
028668b7a6
Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450
2010-03-13 00:18:51 -05: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
677ff2d8b7
Removing outcommented code.
2010-03-12 23:03:06 -05:00
Mark Story
239e34f032
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-03-10 21:49:55 -05:00
Mark Story
64c627a352
Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418
2010-03-10 21:49:22 -05:00
Mark Story
4c668c036c
Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418
2010-03-10 21:46:28 -05:00
José Lorenzo Rodríguez
d8a757ce75
Fixing empty value check to avoid a mistaken default value selection in Helper::value. closes #290
2010-03-10 15:16:02 -04:30
Dieter Plaetinck
9a9bc3643b
fix typo in DboPostgresTestDb::testOrderAdditionalParams()
2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b
Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time
2010-03-09 16:09:16 -04:30
José Lorenzo Rodríguez
acccf964a5
Fixing some tests for Postgres Dbo and adding test cverage for extra params in order function, closes #353
2010-03-09 15:24:03 -04:30
Mark Story
af317a107b
Fixing issues in Set::combine() when data or paths used result in empty datasets. Tests added. Fixes #414
2010-03-08 23:07:36 -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
e6664f0ea4
Fixing SQL errors when running model_behavior tests with postgresql. Fixes #406
2010-03-07 19:02:19 -05:00
Mark Story
1ae922cea1
Fixing missing reference operators in test cases.
2010-03-05 22:06:20 -05:00
Mark Story
af92276ba9
Adding missing reference operators to getInstance methods.
2010-03-05 21:41:48 -05:00
José Lorenzo Rodríguez
e4a5ca528c
Fixing virutal fields fetching for postgresql, closes #417
2010-03-05 16:07:59 -04:30
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
predominant
382e11ccde
Changed Configure::write to return true on success. Maked testing result simpler.
2010-03-04 10:20:15 +11:00
hiromi2424
256ce41b1f
LC_TIME support multi-byte value.
2010-03-02 23:51:22 -04:30
Mark Story
3b3987de7f
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-02-28 13:52:02 -05:00
Mark Story
65169971d4
Making memory leak test work with margins present in php5.3.1
2010-02-28 13:51:47 -05:00
Mark Story
428ee1998a
Updating paths so app layout doesn't break tests.
2010-02-28 13:44:04 -05:00
Mark Story
dbe35a495c
Updating Object test to include fixtures for both comment fixtures.
2010-02-28 13:34:37 -05:00
Mark Story
2a19a8d5e4
Updating CakeSchema test so it runs in both solo and group contexts. Changing table used on TestPluginComment to match its name.
2010-02-28 13:31:23 -05:00
Mark Story
27ffd43214
Fixing issue in component test where AppController will cause failing tests due to bleed through.
2010-02-28 12:48:34 -05:00
José Lorenzo Rodríguez
29eed5f5e8
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
2010-02-28 13:09:15 -04:30
José Lorenzo Rodríguez
f0e73e1158
Changing order of expectations to get more correct results
2010-02-28 13:08:36 -04:30
Mark Story
6360d8d306
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-02-28 12:26:54 -05:00
Mark Story
322d8e667c
Removing duplicate method.
2010-02-28 12:26:15 -05:00
José Lorenzo Rodríguez
d5fa897681
Adding tests for startupProcess and shutDownProcess in controller
...
Fixing variable reference
2010-02-28 12:55:35 -04:30
Mark Story
e0eb48d250
Adding expectError to catch errors coming from FileEngine.
...
Fixing incorrect tests in ApcTest.
2010-02-28 12:15:25 -05:00
Mark Story
e0abe99d7d
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/html.php
cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
Mark Story
37cf55470f
Adding tests for Component::triggerCallback(). Deprecating other Component methods, as they are just wrappers for triggerCallback().
2010-02-28 01:49:19 -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
ec5d9729b0
Model::find(first) no longer uses the id set in a model as the default conditions. Fixes #266
2010-02-27 11:32:29 -05:00
Mark Story
0960abcfb9
Removing workaround code for PHP 5.3.0. Error is no longer being generated in PHP 5.3.1
2010-02-27 11:26:16 -05:00
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
fbf054b22b
Making FileEngine emit errors when a path does not exist but is used for caching. Should make cryptic errors coming from Cache easier to figure out. Removed useless private property.
...
Tests added.
Fixes #384
2010-02-22 23:21:30 -05:00
Mark Story
7075aa5e86
Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323
2010-02-20 11:42:17 -05:00
Juan Basso
416abed211
Test of ticket #323 .
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-02-20 11:35:54 -05:00
Mark Story
763aa524b9
Fixing recursive directory creation when nested create() calls fail. Fixes #347
2010-02-20 11:25:46 -05:00
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
f4c670e5be
Fixing lack of space in meta tags lacking a link attribute.
...
Fixes #371
2010-02-20 01:39:15 -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
c7de42033c
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-02-17 22:23:16 -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
renan.saddam
63f7900ba1
Checking if the last query returned a error, tests added. Fixes #72 .
2010-02-17 22:31:00 -03:00
Mark Story
2279b1a736
Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297
2010-02-16 22:35:16 -05:00
renan.saddam
d7b49e3494
Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324 .
2010-02-15 14:46:18 -03:00
Mark Story
f04add4f79
Fixing querystring parameters being chopped off of absolute webroot asset paths.
2010-02-13 20:43:02 -05:00
Mark Story
6ccc43d776
Adding tests for Cache not generating errors when Cache.disable = true. Refs #286
2010-02-13 18:51:39 -05:00
Mark Story
7a655f7fde
Fixing broken skipIf commited in 46948dd2c0
2010-02-12 23:51:02 -05:00
Mark Story
46948dd2c0
Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329
2010-02-11 22:57:24 -05:00
Mark Story
0ce14ceb7e
Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307
2010-02-11 22:03:43 -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
Mark Story
9edf2d1d80
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-02-07 16:45:55 -05:00
Mark Story
7384f56144
Fixing issues with old method names being used in EmailComponent.
2010-02-07 16:45:36 -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
Mark Story
6c3c5e9012
Merge remote branch 'rchavik/ticket_293' into 1.3
...
Conflicts:
cake/libs/controller/components/email.php
2010-02-07 16:26:37 -05:00
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
104da15a73
Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289
2010-02-06 14:20:56 -05:00
Mark Story
e6404f2d06
Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289
2010-02-06 14:20:28 -05:00
Mark Story
f389591085
Merge remote branch 'phally/1.3-email_component' into email-integration
2010-02-04 21:36:26 -05:00
rchavik
f585630286
Test case: EmailComponent $to accepts array (closes 293)
2010-02-04 09:35:33 +07:00
Mark Story
4b269e3170
Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276
2010-02-02 20:39:33 -05:00
Mark Story
7daad4acaf
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-02-02 20:39:25 -05:00
Mark Story
2adac05dad
Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276
2010-02-02 20:39:05 -05:00
predominant
8d382d9168
Fixes #288 . TextHelper truncation not playing nice with html in ending.
2010-02-02 09:13:52 +11:00
José Lorenzo Rodríguez
aadf62de6e
Improving tests for Set::diff
2010-01-31 20:26:57 -04:30
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
7fb7c5ebf6
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-29 11:56:09 -05:00
Mark Story
887ddb9575
Adding tests for deletion of multiple habtm associations. Reverting changes made in [ 15518b8c9a
] that caused incorrect removal of links when deleting records. Fixes #247
2010-01-29 11:55:18 -05:00
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
Mark Story
30cb38eb93
Refactoring extensions in ScaffoldView to reflect removal of magic .thtml extension.
...
Adding test for interaction of Themed views and Scaffolded views. Fixes #255
2010-01-28 11:11:19 -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
Juan Basso
57997e770c
Refactory of DboSource::name() to improve performance. Added more tests to it.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-27 12:24:06 -05:00
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
66a8910810
Fixing cakephp domain name.
2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc
Fixing @link tags to ease merging.
2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54
Fixing doc tags to make merge easier.
2010-01-26 16:51:53 -05:00
Mark Story
fc304056a3
Removing Session deletion of nonce token on blackhole. Fixes possible CSRF risk from multiple submissions of the same invalid data. Refs #214
2010-01-26 13:59:26 -05:00
Mark Story
c195d654b3
Fixing TranslateBehavior test to run in php4.
2010-01-26 11:00:37 -05:00
Mark Story
38eac37bb1
Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252
2010-01-25 12:49:12 -05:00
Mark Story
5fcbc33a75
Adding tests for CURRENT_TIMESTAMP to DboSource.
2010-01-25 12:25:14 -05:00
José Lorenzo Rodríguez
03200440ed
Fixing TranslateBehavior and $tablePrefix. Closes #168
2010-01-24 18:27:08 -04:30
Phally
3c265283e7
Added support for Message-ID headers.
2010-01-24 23:29:53 +01:00
Mark Story
5d35fd8d38
Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250
2010-01-22 10:30:22 -05:00
Phally
2e46504d05
Fixed failing test case due to changes in 1.3.
2010-01-21 23:07:42 +01:00
José Lorenzo Rodríguez
e77ed92646
Merge branch '1.3-cache' into 1.3
...
* 1.3-cache:
Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Removing php5 visibility keywords.
Fixing various errors related to Cache::increment() and Cache::decrement().
Removing test ignore
Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a
Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
...
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
ff7e906ba2
Removing php5 visibility keywords.
...
Fixing increment count tests in xcache test.
2010-01-21 14:06:18 -05:00
Mark Story
47c7387548
Fixing various errors related to Cache::increment() and Cache::decrement().
...
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
e150db2a45
Removing test ignore
2010-01-21 13:24:22 -05:00
Mark Story
2915493049
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6
Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223
2010-01-21 11:59:49 -05:00
José Lorenzo Rodríguez
dff7e17fa2
Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 12:11:44 -04:30
ADmad
a8040506b0
Fixing spacing between button tag attributes. Fixes #241
2010-01-21 22:03:03 +05:30
Mark Story
913450daef
Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208
2010-01-21 10:35:20 -05:00
Phally
984dc50f37
Merge commit 'upstream/1.3' into 1.3-email_component
2010-01-21 00:05:03 +01:00
ADmad
570c9e5304
Cleaning up commented and unneeded test cases and moving tests to more appropriate file
2010-01-21 01:42:54 +05:30
Mark Story
317463096a
Refactoring tests in l10n that use object properties.
2010-01-20 14:53:57 -05:00
Mark Story
ae4a31f070
Making DEFAULT_LANGUAGE also set $language var which sets Config.language to a correct value. Fixes #228
2010-01-20 14:33:37 -05:00
renan.saddam
39dd15d3f6
Removing the with key from otherFields array, also fixing the page title. Tests added.
2010-01-19 14:05:29 -02:00
Mark Story
e1b0c41254
Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field
as field
. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220
2010-01-19 09:22:13 -05:00
Mark Story
9f8e0e163e
Removing getTests included by accident.
2010-01-18 21:59:18 -05:00
Mark Story
9b3a2fd658
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-18 21:57:46 -05:00
Mark Story
080e34718d
Minor refactor, and adding tests from previous commit. Fixes #208
2010-01-18 21:57:03 -05:00
José Lorenzo Rodríguez
cb4a1f07e5
Fixing issue with persistModels and plugin models, closes #192 and #198
2010-01-18 13:13:10 -04:30
Mark Story
06ba7ac828
Adding omitted default route, and test cases to test its functionality. Fixes #212
2010-01-18 10:05:23 -05:00
Mark Story
5203397a6a
Adding error expectation to model_write test. Models using useTable = false, will still issue count queries to their datasources when exists() is called.
2010-01-16 20:24:27 -05:00
Mark Story
3be28fc749
Fixing errors in CakeTestCase::testAction tests case caused by changes in test suite not always forcing an output parameter.
2010-01-16 20:18:20 -05:00
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
Mark Story
f1276ce337
Fixing several issues in the CodeCoverageManager test case.
2010-01-16 20:14:16 -05:00
Mark Story
34fed29d05
Renaming session test case.
...
Adding missing doc block to inflector test case.
Updating Set::map reverse test to reflect changes in Model.
Removing Inflector from lib group as the reset test breaks many other tests.
Adding a table property to the session fixture.
2010-01-16 19:19:12 -05:00
Mark Story
1acc4c879a
Removing debug() from scaffold test.
2010-01-16 18:15:38 -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
Mark Story
1a8c3fd405
Fixing infinite loops caused by stale caches.
2010-01-15 16:17:34 -05:00
Mark Story
c20aba6b9c
Merge branch 'merger' into 1.3
2010-01-15 13:27:19 -05:00
Mark Story
f11068b831
Trimming trailing whitespace from files. Refs #201
2010-01-15 13:26:47 -05:00
Mark Story
09ad7418f5
Merge remote branch 'origin/1.2' into merger
...
Conflicts:
cake/console/templates/skel/config/inflections.php
cake/libs/model/cake_schema.php
cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-15 00:11:33 -05:00
Mark Story
34c4af549c
Adding missing reference operators for php4 compatibility.
2010-01-15 00:09:59 -05:00
Mark Story
f1a0690415
Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well.
2010-01-15 00:02:24 -05:00
Mark Story
276d183bdd
Adding conditional to php5 only function use.
2010-01-14 23:40:18 -05:00
Mark Story
371ac3971a
Fixing php4 compatibility in model_read test.
2010-01-14 23:38:24 -05:00
Mark Story
3a38e0869f
Fixing php4 issues in ErrorHandler and ErrorHandler testcase.
2010-01-14 23:17:24 -05:00
Mark Story
d4d9ed7bfe
Fixing test cases and php4 compatibility in Debugger.
2010-01-14 23:06:48 -05:00
Mark Story
5212406ea7
Making xml data test php5 only as Xml::compare() is non-functional in php4
2010-01-14 22:48:19 -05:00
Mark Story
5d280ea977
Making CodeCoverageManager and CakeSession tests run in php4. Removing test case for removed method.
2010-01-14 22:47:49 -05:00
Mark Story
2093f05ce7
Fixing php4 compatibility issues in CakeLog.
2010-01-14 22:33:14 -05:00
Mark Story
8f2a4a1e0e
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a
Trimming trailing whitespace from files. Refs #201
2010-01-14 20:15:54 -05:00
Joël Perras
259b59cae1
Adding optional $reset parameter to Inflector::rules(). Fixes #91 .
...
Inflector::rules() now has an optional 3rd parameter, $reset, which can
be set to true if you desire to remove the default inflections defined
in Inflector.
Note that the reset will only affect those inflection types which you
have explicitly re-defined in the $rules parameter.
2010-01-14 18:18:55 -05:00
Joël Perras
eb7e10db50
Updating Inflector::slug() handling of $map argument. Fixes #18 .
...
When passing a $map to Inflector::slug(), the $map values will now
overwrite any default mappings that Inflector::slug defines.
Modified pre-existing test-case for Inflector::slug() when using a $map.
2010-01-14 17:51:14 -05:00
Joël Perras
adb0c809a0
Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199 .
...
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
José Lorenzo Rodríguez
09b466f8aa
Fixing whitespace and removig calls to Helper::output() introduced by error
2010-01-14 15:38:48 -04:30
José Lorenzo Rodríguez
0b3758dc91
Bug fix in I18n
...
Changing calls from date to strftime in TimeHelper
Implementing TimeHelper::converSpecifiers() to conver format strings to be windows safe and I18n friendly
Implementing TimeHelper::i18nFormat() to format dates with preferred locale date format
Changing TimeHelper::format() to handle inversion of first two parameters, while being backwards compatible. If called with the first parameter as a time string it will call TimeHelper::i18nFormat()
2010-01-14 14:11:57 -04:30
José Lorenzo Rodríguez
a980f72364
Refactoring I18n::translate() to return time format string or arrays when category is LC_TIME
...
Tests added
2010-01-14 09:54:45 -04:30
José Lorenzo Rodríguez
589972d581
Merge branch '1.3' into github-i18n
...
* 1.3: (137 commits)
Updating tests to reflect SessionHelper's loss of magic inclusion.
Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated.
Fixing merge var test case for non magic session component.
Fixing Pagescontroller test and removal of pageTitle from controller.
Fixing component and controller test cases to work with less magical session component.
Removing the magical addition of SessionComponent to components array. This makes components more declarative, and removes magic that cannot be undone by the end developer.
Fixing failing tests due to deleted assets.
Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100 .
Updating CakeTestSuiteDispatcher parsing of .
Adding missing </p> to Html test reporter template.
Updating css file in skel dir.
Fixing alignment issues in tables.
Removing orphaned method.
Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
Adding php5 check to avoid errors when using __get() or __isset() methods in models
Fixing include in test of CodeCoverageManager. Fixes #196
Fixing var name when not have SimpleTest or XDebug installed.
Moving skel/config/sql to skel/config/schema
Fixing output of 'Actions' in bake templates. Now outputs a __() call.
Updating scaffolds to match new bake design.
...
2010-01-14 08:34:03 -04:30
Mark Story
1980a46b46
Updating tests to reflect SessionHelper's loss of magic inclusion.
2010-01-14 00:09:14 -05:00
Mark Story
a56bc5585c
Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated.
2010-01-13 23:55:09 -05:00
Mark Story
a85da63956
Fixing merge var test case for non magic session component.
2010-01-13 23:49:11 -05:00
Mark Story
32832f4810
Fixing Pagescontroller test and removal of pageTitle from controller.
2010-01-13 23:49:11 -05:00
Mark Story
540e81b1b0
Fixing component and controller test cases to work with less magical session component.
2010-01-13 23:49:11 -05:00
Mark Story
67b69b3106
Fixing failing tests due to deleted assets.
2010-01-13 23:47:31 -05:00
Joël Perras
15b8a3ec71
Updating copyright date on all files.
2010-01-13 23:47:14 -05:00
ADmad
848dc518ab
Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
2010-01-14 04:13:39 +05:30
Juan Basso
d8257518de
Fixing include in test of CodeCoverageManager. Fixes #196
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:38:26 -05:00
José Lorenzo Rodríguez
4e3aedecde
Fixing persitModel and plugin Behaviors. Closes #192
2010-01-13 09:53:00 -04:30
Mark Story
84840c7b04
Fixing issues with magic input() type detection and adding/updating tests.
2010-01-12 23:27:17 -05:00
Mark Story
d8e7aa929c
Merge branch '1.3-misc' into 1.3
2010-01-12 17:18:14 -05:00
Mark Story
8e22e8cbea
Merge branch '1.3-test-suite' into 1.3-misc
2010-01-12 09:31:07 -05:00
Mark Story
a0c3c4b803
Updating AuthComponent::startup() so that being redirected to loginAction with no Auth.redirect value in the session and a non empty loginRedirect defined, the Auth.redirect value is not overwritten. This prevents redirection to already accessible pages. Test cases updated.
...
Fixes #173
2010-01-11 23:54:06 -05:00
José Lorenzo Rodríguez
04562982b2
Fixing doc block
2010-01-11 15:34:16 -04:30
José Lorenzo Rodríguez
7e9fc9f705
Test case for date format definition using a LC_TIME locale file
2010-01-11 15:19:57 -04:30
José Lorenzo Rodríguez
50f58da60d
Continuing work on locale definition file parser
2010-01-11 15:12:24 -04:30
José Lorenzo Rodríguez
8bc4f0336e
Beginings of a parser of locale definition file
2010-01-11 15:09:42 -04:30
José Lorenzo Rodríguez
aa9258cbd1
Adding test for DboSource::group() and virtual fields
...
Closes #184
2010-01-11 12:22:59 -04:30
Phally
bbb105fc8c
Added virtual field support for GROUP BY.
2010-01-11 11:46:59 -04:30
Mark Story
4ada5b7eea
Fixing notice errors caused by incorrect datatyping in php4.
2010-01-11 09:44:51 -05:00
Mark Story
da26124add
Renaming CodeCoverageManager::start() to init().
...
Adding a start(), stop(), and clear() methods to CodeCoverageManager.
Making CakeBaseReporter toggle code coverage on and off as needed.
Updating test case for CodeCoverageManager.
2010-01-10 13:23:37 -05:00
Mark Story
a41678e51f
Merge branch '1.3-misc' into 1.3-test-suite
2010-01-10 12:53:00 -05:00
Mark Story
6147de7725
Fixing notice errors in test case.
2010-01-10 12:52:06 -05:00
Mark Story
836c7de7cb
Updating CodeCoverageManager test case and CodeCoverageManager
2010-01-10 12:48:40 -05:00
Mark Story
e304246e8f
Updating test manager test cases to reflect changes in API.
2010-01-10 12:39:21 -05:00
predominant
0959de6031
Adding more tests to check cache paths and stupid values.
2010-01-10 20:54:20 +11:00
predominant
3bd8bd2e0e
Adding Inflector::underscore tests
2010-01-10 20:52:49 +11:00
tPl0ch
61079f6317
Fixes #42 . Updated Sanitize::clean() with 'remove_html' option. Updated Sanitize::html() to accept new options. Updated test cases.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-07 19:04:49 -05:00
tPl0ch
5ae0164574
Added Validation::uuid(). Updated test cases.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-06 21:29:55 -05:00
Mark Story
65a12ed902
Adding tests for previous commit.
2010-01-06 21:26:52 -05:00
Mark Story
683be26bcb
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
2010-01-06 21:14:25 -05:00
predominant
e2a2770d9f
Fixing validation errors for wrong case checking on Validation::ip.
...
Adding IPv6 validation for Validation::url().
Added tests for ports in urls.
Fixed port length allowance on Validation.
2010-01-07 11:02:05 +11:00
Mark Story
be7ce6e923
Fixing issues where chained jQuery engine requests wouldn't eval() script elements, making ajax pagination much harder.
2010-01-06 11:59:15 -05:00
predominant
1302fba632
Fix validation of IPv6 on IPv4 checks.
...
Separate IPv4 and IPv6 validation to allow strict checking.
2010-01-06 00:53:48 +11:00
Mark Story
3c88d81735
Adding tests for model method validation with multiple parameters and addition of original validation rule to method params. Closes #149
2010-01-01 23:34:11 -05:00
ADmad
5f987a4996
Controller data is now set to an array instead of Xml object if request content type is 'application/xml'
2009-12-31 17:36:58 +05:30
Mark Story
41e6fdf346
Merge remote branch 'fahad/1.3-l10n' into 1.3-misc
2009-12-29 23:39:08 -05:00
Mark Story
49e9550482
Merge branch '1.3' into 1.3-misc
2009-12-29 22:07:23 -05:00
Mark Story
32683d3d64
Fixing issues in PrototypeEngineHelper where parameters would end up wrapped in a function() {} when marked as a dataExpression. This prevented the sending of form data.
...
Tests added.
Fixes #142
2009-12-29 21:52:59 -05:00
Ali Farhadi
f86a80ac9e
Fixing failing tests caused by changes in L10n class, and removal of duplicate test.
2009-12-30 00:24:05 +03:30
Mark Story
b377905741
Fixing whitespacing and formatting of doc blocks.
2009-12-28 23:00:38 -05:00