euromark
5b298c1306
remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway
2013-04-29 17:16:53 +02:00
euromark
ff0aa70b59
fix line length for templated emails
2013-04-29 16:18:00 +02:00
Graham Weldon
a3702fcf2b
More copyright updates
2013-02-08 21:29:18 +09:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Bram Borggreve
f69fe20376
Makes sure these two files are valid JavaScript by adding comment marks
...
to them, this way editors (NetBeans 7.3 for instance) stop marking them
invalid.
2012-11-28 15:29:50 +01:00
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
213d4caa85
coding standards
2012-09-20 01:50:15 +02:00
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
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
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
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
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
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -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
ADmad
bda05293d7
Fixed failing test cases
2012-02-16 02:22:20 +05:30
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
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
mark_story
69b1c33f1f
Fix extending in loops.
2011-12-27 19:24:16 -05:00
mark_story
70981d05ca
Throw an exception when a view extends itself.
2011-12-27 19:24:15 -05:00
mark_story
047e93e285
Clean up internal API's
...
- There was some duplication in element() for handing plugins.
- Deprecate options[plugin] for element()
- Add file omitted in previous commit.
2011-12-27 19:24:15 -05:00
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
mark_story
f0f3eb9ba9
Fix a few outstanding issues with blocks.
...
- Blocks left open after rendering files should trigger
an exception.
- Fix strict errors.
- Correct doc blocks.
2011-12-17 22:23:37 -05:00
mark_story
bcb8444ab1
Make CacheHelper able to handle nocache tags in elements.
...
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
2011-12-17 22:23:37 -05:00
mark_story
e06895ef91
Adding view files for tests.
...
Adding test case for elements + extending
Making elements extend each other.
2011-12-17 22:23:35 -05:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
e7a7e57ba6
Fix bare require() to use App::uses()
...
Fixes #2346
2011-12-06 20:09:05 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
mark_story
79d6a850ad
Fix theme files with spaces in them.
...
Fixes #2324
2011-12-01 18:16:01 -05:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
c1f5dc1e40
Make XmlView consistent with JsonView.
...
Both allow a view script or a serialize key with the name
of the variable to be serialized.
2011-11-27 23:51:48 -05:00
mark_story
5e9b1583e5
Making JsonView work more like the XmlView.
2011-11-27 23:51:48 -05:00
mark_story
b20803bb6f
Fix parse error when short tags are on.
2011-11-27 23:51:48 -05:00
Juan Basso
a6c1aafcc4
Added XmlView.
2011-11-27 23:51:47 -05:00
Juan Basso
873489053c
Not loading helpers and others stuffs not necessary to Json view. Tests added.
2011-11-27 23:51:47 -05:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
d62351eb36
Revert the changes done to remove the 'cake' domain
...
After some discussion, polutting the app POT file
with unchanging Cake strings was incorrect. Having these
strings in a separate POT file allows reuse of translations across
projects.
Refs #2103
2011-10-23 20:36:31 -04:00