Ceeram
faddfbe2d0
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-12-01 20:30:45 +01:00
Ceeram
0a1772c929
adding default name, for dbs that dont expose a PK
2011-12-01 20:30:36 +01:00
ceeram
95e8f1d8b2
Merge pull request #345 from shama/patch-standards
...
Adhere to code formatting standard
2011-11-30 23:58:27 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
49708ec837
Fix cachefiles being generated with "
...
Cache files with SQLite should not contain "
Fixes #2323
2011-11-30 21:56:25 -05:00
mark_story
65b87af6c0
Adding set to autoloader.
...
Fixes #2319
2011-11-30 21:14:39 -05:00
mark_story
4b292b139e
Fix build, I'm a dork.
2011-11-30 21:00:07 -05:00
ADmad
166e03e7de
Merge pull request #344 from majna/2.0-controller-template
...
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 11:18:52 -08:00
Majna
87a3937def
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 20:06:07 +01:00
Ceeram
b5c4b85601
Fixing cascading delete, when using foreignKey false and setting condition on hasOne.
2011-11-30 20:02:36 +01:00
Mark Story
87a8af420f
Merge pull request #343 from shama/patch-standards
...
Adhering to coding standards
2011-11-30 08:26:47 -08:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
José Lorenzo Rodríguez
32a3737cca
Merge pull request #342 from shama/patch-doc
...
Add @link to helper docblocks
2011-11-29 21:56:08 -08:00
Kyle Robinson Young
1d50562931
Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers
2011-11-29 21:23:02 -08:00
mark_story
7f68699fcd
Fix return values in Cache.
...
The documentation indicates that false/or the value will be returnned.
Using both null and false to indicate failure is confusing. Use only
false to indicate failure. It might be better in the future to use
exceptions for trying to read/write on missing cache configs.
2011-11-29 23:17:17 -05:00
mark_story
992a1554e1
Fix incorrect alias/name usage.
...
Fixes #2317
2011-11-29 20:44:30 -05:00
Renan Gonçalves
8568ac6613
Trying to take into account the number of days in a month.
2011-11-30 01:14:39 +01:00
Graham Weldon
af2e7c1e9b
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-29 23:00:47 +11:00
ADmad
c653d8361f
Merge pull request #341 from andraskende/master
...
removing $i as its no longer being used here.
2011-11-28 23:59:39 -08:00
Andras Kende
4f64a9f6cd
removing $i as its no longer being used here. (probably was used before on zebra striping.)
2011-11-28 23:33:55 -06:00
Ceeram
57a1a2814d
Fixing modeltask to use correct table
...
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
Jose Lorenzo Rodriguez
1668067740
Releasing 2.0.4
2011-11-28 11:20:58 -04:30
Renan Gonçalves aka renan.saddam
3efc728185
Merge pull request #337 from teddyzeenny/patch-view-caching
...
Patch for view caching - Helper serialization
2011-11-28 04:21:26 -08:00
teddyzeenny
803e7be363
Apply base64 encoding after helper serialization
2011-11-28 14:02:39 +02:00
teddyzeenny
a4aaaff53a
Escape single quotes after Helper serialization
2011-11-28 13:15:23 +02:00
Jose Lorenzo Rodriguez
8f1125ed4d
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-28 00:54:16 -04:30
Jose Lorenzo Rodriguez
f6534d2962
Fixing issue where changing the case for an action in the url would allow the action in the AuthComponent making it accessible to not-logged in users
2011-11-28 00:52:47 -04:30
mark_story
390db7beba
Fix issue with dots in request URLs.
...
Dots in request url's often resulted in an additional get parameter
being added.
Fixes #2303
2011-11-26 21:24:53 -05:00
José Lorenzo Rodríguez
6f285224ae
Merge pull request #336 from shama/patch-doc
...
Add @link to global functions
2011-11-26 14:50:53 -08:00
Kyle Robinson Young
1d843f84b9
Add @link to global functions
2011-11-26 14:42:37 -08:00
m
fb3d3ca943
Add test for XML.
...
Test xml with multiple model results
Fixes #2304
2011-11-26 14:43:19 -05:00
Christian Hieke
a51626840e
Escape special characters in XML.
...
Fixes #2188 .
2011-11-25 21:20:26 -05:00
mark_story
54aef7216f
Add failing test for #2188
2011-11-25 21:19:31 -05:00
ADmad
73674c648c
Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278
2011-11-26 02:48:49 +05:30
Jose Lorenzo Rodriguez
2bffd4c26d
Preventing memory leak in PDO when retrieving results from the driver, fixes #2293
2011-11-25 13:36:14 -04:30
mark_story
5180540d1f
Fix protocol relative urls for CSS and JS files.
...
Protocol relative urls are generally not on the same host
don't try and run them through the asset filters.
Fixes #2285
2011-11-24 21:04:57 -05:00
Ceeram
179a5c8559
remove order, which was required with setting default order on CakeTestModel
2011-11-24 22:20:29 +01:00
Ceeram
c12c853f10
moving order for finds from constructor to beforeFind
2011-11-24 22:12:39 +01:00
mark_story
2969a8f6ac
Make a few more tests run in AllTests.
2011-11-23 21:30:28 -05:00
mark_story
4103fe14a2
Fix double / issue in ExtractTask
...
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.
Fixes #2284
2011-11-23 21:03:24 -05:00
mark_story
07462f0bef
Fix nested name attributes for submit()
...
Nested name attributes and Security component did not co-operate.
Fixes #2271
2011-11-23 20:40:25 -05:00
Renan Gonçalves aka renan.saddam
0cd45d4711
Merge pull request #329 from shama/patch-doc
...
Add @link to CookieComponent docblocks
2011-11-23 00:58:21 -08:00
Kyle Robinson Young
bc0e0b5c05
Add @link to CookieComponent docblocks
2011-11-22 22:32:13 -08:00
Ceeram
07d1621bc5
fixing CakeTestModel constructor of previous commit, cleaning up after schema() call
2011-11-23 01:32:27 +01:00
Ceeram
05940ae1ec
adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified
2011-11-22 21:50:17 +01:00
Ceeram
f57c287c43
fixing test to ensure tests dont fail on 1 second timestamp diff
2011-11-22 17:21:00 +01:00
Ceeram
7d6637f55b
ensure test doesnt fail by 1 second diff in timestamp
2011-11-22 10:57:36 +01:00
Renan Gonçalves aka renan.saddam
f68d0f95e1
Merge pull request #328 from shama/patch-doc
...
Add @link to Shell docblocks
2011-11-22 01:37:23 -08:00
Kyle Robinson Young
bb51b0f497
Add @link to Shell docblocks
2011-11-21 21:33:07 -08:00
ADmad
0e6697dbc6
Skipping failing test when run through web browser.
2011-11-22 02:00:58 +05:30