Commit graph

15404 commits

Author SHA1 Message Date
Mark Story
310a7a1acf Merge pull request #452 from ltunc/named-bug
Fix urlencoded keys in named parameters.
2012-01-29 15:37:43 -08:00
Anton
57eec6e6fc added decoding of keys for named parameters 2012-01-30 00:26:56 +02:00
Anton
57bd1ea5f9 added test for check nested url 2012-01-30 00:25:48 +02:00
mark_story
a275555297 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
mark_story
4dd13ef554 Fix issue where session would always be regenerated.
Fixes #2519
2012-01-29 15:37:14 -05:00
mark_story
a4740f02f1 Remove odd inflection.
This additional inflection isn't needed.  People can type the classname
they want.

Refs #2514
2012-01-29 13:56:53 -05:00
mark_story
e770c7a72d Split the AclComponent classes up.
Refs #2514
2012-01-29 13:54:26 -05:00
mark_story
1600322a54 Splitting ConfigReaderInterface out into a separate file.
Refs #2514
2012-01-29 13:30:05 -05:00
mark_story
b9053161f4 Split I18nModel into a separate file.
Refs #2514
2012-01-29 13:28:08 -05:00
mark_story
0fb6f88a2e Split Cache + CacheEngine into separate files.
Refs #2514
2012-01-29 13:25:06 -05:00
ADmad
ca32ca185a Fixing API docblock 2012-01-29 22:24:26 +05:30
Tigran Gabrielyan
30d6341e7f Fixed bug in CacheHelper where PluginAppController was not being loaded
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-28 22:35:42 -05:00
Mark Story
21cf8ad018 Merge pull request #448 from majna/2.1-paging-current
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 10:06:56 -08:00
Majna
d7b06194a4 Add option for 'current' class to PaginationHelper::numbers(). 2012-01-28 18:24:28 +01:00
José Lorenzo Rodríguez
f28ba9002a Merge pull request #447 from slimus/2.1
2.1 fix bake shell options
2012-01-28 09:12:53 -08:00
slimus
7c08e4b0f4 Update lib/Cake/Console/Shell.php 2012-01-28 23:45:44 +07:00
slimus
57e4751a82 fix shell help for incorrect user input 2012-01-28 16:36:59 +07:00
mark_story
752711e963 Fix missing behavior constructor. 2012-01-27 21:10:57 -05:00
mark_story
fb7717c0da Fix wonky tabs. 2012-01-27 20:59:03 -05:00
mark_story
3b9f88030e Add tests for previous commit. 2012-01-27 20:59:03 -05:00
mark_story
9ff0739504 Improving test generation.
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00
mark_story
d904ab00fa Merge branch '2.0' into 2.1 2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8 fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464 2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
ADmad
00649cbdde Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748. Closes #2509 2012-01-26 17:56:42 +05:30
mark_story
9089bba84b Fix failing test. 2012-01-25 21:19:16 -05:00
mark_story
5b9d69fcc8 Update image() docs. 2012-01-25 21:14:01 -05:00
Mark Story
7cfd27e7f6 Merge pull request #419 from radig/2.1
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476)
2012-01-25 18:05:56 -08:00
mark_story
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
AD7six
ecbe337052 Make extending a missing element throw an exception
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception

in addition "absolute" paths can be used such that (using elements as an
example)

$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp

Closes #2504
2012-01-25 13:04:45 +01:00
Ceeram
6d69ec3a78 update book link 2012-01-25 10:12:59 +01:00
mark_story
154b001552 Fix tests that fail on windows.
Refs #2148
2012-01-24 21:12:26 -05:00
mark_story
bd0104d972 Add methods to CakeTestCase
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.

Refs #2148
2012-01-24 21:08:56 -05:00
mark_story
29514b08fb Fix re-numbering of values in exportVar()
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.

Fixes #2506
2012-01-24 20:52:43 -05:00
mark_story
dbece1f157 Add test for saveField() + foreign key.
Closes #2507
2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588 Fix indentation. 2012-01-24 20:32:06 -05:00
AD7six
11ed1e6ea5 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-24 13:55:56 +01:00
AD7six
def96c0460 throw an exception if the view you try to extend doesn't exist
or element, or layout
2012-01-24 13:54:39 +01:00
Ceeram
95aa7e32c3 include theme in _passedVars array 2012-01-24 10:42:18 +01:00
mark_story
354716cf60 Fix issues with sparse arrays in ThemeView.
Fixes #2500
2012-01-23 20:22:06 -05:00
José Lorenzo Rodríguez
c877d17f86 Merge pull request #440 from shama/patch-html-doc
Remove incorrect parameter in HtmlHelper::script docblock example
2012-01-23 16:05:52 -08:00
Kyle Robinson Young
f69edb5c80 Remove incorrect parameter in HtmlHelper::script docblock example
Fixes #76
2012-01-23 16:01:38 -08:00
Ceeram
4f1be12046 Merge branch '2.1-appshell' into 2.1 2012-01-23 15:29:03 +01:00
Jose Lorenzo Rodriguez
62b203f54c Update version number to 2.1.0-beta 2012-01-22 21:18:22 -04:30
Graham Weldon
48679029a0 Merge pull request #438 from predominant/2.1
Prefix for cache configuration
2012-01-22 15:57:22 -08:00
Graham Weldon
64d4387c82 Added default prefix to cache configurations. 2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
9d0a67ddec Avoiding class name conflicts 2012-01-22 16:46:41 -04:30
José Lorenzo Rodríguez
5cc2860c41 Merge pull request #437 from josegonzalez/2.1-theme-view
2.1 theme view
2012-01-22 12:52:00 -08:00
Jose Diaz-Gonzalez
c2519e702d Merging ThemeView and View class
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
2012-01-22 15:45:26 -05:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30