Commit graph

132 commits

Author SHA1 Message Date
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
ADmad
084636bf9d Add App::uses() 2012-11-03 21:55:46 +05:30
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
mark_story
a3ae58da09 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
mark_story
affb3192ad Fix issue where including elements + extending views fails.
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
2012-09-30 22:44:27 -04:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
Rachman Chavik
0cae19a14e enable PluginDot for routeClass parameter 2012-09-12 21:24:56 +07:00
ADmad
28951865c6 Hidden divs created by FormHelper can now be customized. 2012-09-04 23:56:30 +05:30
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
894fc1256a Add test cases for strings containing quotes.
Show that both double and single quoted strings are
handled correctly by ExtractTask.

Closes #3155
2012-08-30 23:48:32 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
Ber Clausen
bdac857293 Add plugin support to IniReader, and harden tests.
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
mark_story
d66d37c92b Merge branch 'master' into 2.3 2012-08-24 22:50:29 -04:00
Ceeram
e7dc23b920 Ensure callbacks are triggered when using Xml/Json view with view templates.
PaginatorHelper for instance needs this to correctly set options
2012-08-22 13:13:49 +02:00
Renan Gonçalves
172e4bed5d Fix STRICT warnings on PHP 5.4 2012-08-21 13:08:43 +02:00
mark_story
d5333a2ff1 Merge branch 'master' into 2.3 2012-08-20 16:20:27 -04:00
ber clausen
0dec093f48 The actual config file must always have .php extension. 2012-08-13 23:50:58 -03:00
euromark
2a553dcfd1 unified doctype for browser related layout templates 2012-07-24 18:06:39 +02:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Rachman Chavik
9bafc5a3bb CakeEmail: create request object before rendering
Closes #2931
2012-06-04 09:18:29 +07:00
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Rachman Chavik
07d9a75fcb Helpers in custom CakeErrorController are lost
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.

This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing.  This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
Rachman Chavik
595cad84b3 ensure that plain CakeLogInterface still works 2012-05-13 18:51:57 +07:00
Rachman Chavik
49bc818d36 new base class Log/Engine/BaseLog 2012-05-11 12:37:00 +07:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Jose Lorenzo Rodriguez
9f415d012c Merge branch '2.2-cache-groups' into 2.2
Conflicts:
	lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
2012-04-22 18:59:22 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
ADmad
b1e7164d1a Implemented translation of validation rule arguments in validation error messages. Closes #2816 2012-04-22 23:25:07 +05:30
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
Jose Lorenzo Rodriguez
70f3cc579c Renaming a few things in dispatcher filters to maccht general naming style in CakePHP 2012-04-16 23:41:32 -04:30
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
mark_story
0f2100767b Add failing test for #2661 2012-04-14 10:24:20 -04:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
Thomas Ploch
ce8b10e46f Fixing cache group related test cases. 2012-03-26 14:30:01 +02:00
Jose Lorenzo Rodriguez
16bde9c723 Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705 2012-03-24 14:34:29 -04:30
mark_story
94b3839b2e Fix a few more small issues. 2012-03-18 23:25:19 -04:00
mark_story
1e403c6a7f Fix more coding standards issues. 2012-03-17 23:53:13 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Mark Story
9e8152f949 Merge pull request #417 from 0x20h/php-acl
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
ADmad
bda05293d7 Fixed failing test cases 2012-02-16 02:22:20 +05:30
Rachman Chavik
fe479c636c adding tests for engine overrides 2012-02-14 23:28:57 +07:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
4949a87b7e Fix issues with duplicate msgid values.
Msgid values could be duplicated if the same string was used
for singular and pluralized translations.  Re-index how the data is
stored so duplicate singular detection per domain is easier.

Fixes #2538
2012-02-06 21:25:11 -05:00
mark_story
01b45cc246 Add files I forgot in previous commit. 2012-01-30 22:29:52 -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