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
|
42a5665660
|
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
|
2010-02-16 23:19:11 -05:00 |
|
Mark Story
|
0b1efd3e86
|
Fixing delivery of plugin assets that reside in the root of a plugin webroot directory. Tests added.
|
2010-02-16 23:18:49 -05: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
|
3f667eb412
|
Adding skipTables to ModelTask. Allows skipping of predefined tables. Adding i18n table to the default list of skipped tables. Fixes #327
|
2010-02-13 18:15:11 -05:00 |
|
Mark Story
|
b89f40be80
|
Adding file omitted from [46948dd2c0 ]
|
2010-02-13 17:56:19 -05:00 |
|
Mark Story
|
5f5aae71e7
|
Adding property to signal which actions to skip finding templates for. Fixes #330
|
2010-02-13 17:51:49 -05:00 |
|
Mitchell Amihod
|
2e8e233f73
|
Fixing syntax error for baked component test case. Updated relevant
test case.
Fixes #342.
Signed-off-by: Joël Perras <joel.perras@gmail.com>
|
2010-02-13 16:40:55 -05:00 |
|
Mark Story
|
7a655f7fde
|
Fixing broken skipIf commited in 46948dd2c0
|
2010-02-12 23:51:02 -05:00 |
|
renan.saddam
|
5653c720f0
|
Fixing an small error with token parsing, tests added. Refs #333.
|
2010-02-12 11:52:58 -02:00 |
|
renan.saddam
|
d975dc3190
|
Adding tests for previous commit. Refs #310.
|
2010-02-12 02:01:54 -02:00 |
|
renan.saddam
|
06109a2eed
|
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
|
2010-02-12 01:57:38 -02: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 |
|
renan.saddam
|
d5ea6b7c2a
|
Flushing the CR after a model is baked, tests added. Refs #310.
|
2010-02-12 01:57:04 -02: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 |
|
Mark Story
|
843d3c7095
|
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
|
2010-02-07 15:20:00 -05:00 |
|
Mark Story
|
1febd776bd
|
Fixing include errors caused by empty asset filters in Dispatcher::asset(). Fixes #313
|
2010-02-07 15:19:47 -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
|
f2a94f5959
|
Adding file omitted from [30cb38eb93 ]
|
2010-01-29 11:55:51 -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
|
2d81d25f41
|
Fixing issue where webroot paths would be incorrect when using a virtual host setup and no mod_rewrite. An additional app/webroot would be appended. Incorrect tests updated. Fixes #259
|
2010-01-27 11:08:04 -05:00 |
|
Mark Story
|
827c65a767
|
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
|
2010-01-26 17:57:25 -05:00 |
|