Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
mark_story
800ffa804b
Fix invalid CSS in fixture files.
...
Fixes #4041
2013-09-03 09:55:04 -04:00
Ceeram
84c980f1f4
avoid notices when loading locale file
...
Conflicts:
lib/Cake/Test/Case/I18n/I18nTest.php
2013-09-01 06:05:40 +02:00
mark_story
4f237e6a93
Merge branch '2.4' making 2.4 into the master branch.
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
Mark van Driel
c4ec8bedd0
Fixed category constant values: constants in Cake don't use the same values as PHP (Linux)
2013-08-27 12:30:39 +02:00
Mark van Driel
88d7fbeb53
Extract category strings to separate .po files
2013-08-25 23:04:05 +02:00
AD7six
09cf69c452
Pass Controller:$components config to mocked components
...
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
2013-08-19 10:33:16 +00:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
Marc Würth
4c13a39f3e
Removed else clauses after redirects and added return before redirect() and flash() calls
2013-08-08 21:10:41 +02:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
euromark
8b21710c95
whitespace correction
2013-07-25 13:26:21 +02:00
Majna
1ce9fc537f
Pages controller should render 404 on missing view file
2013-07-13 17:41:16 +02:00
Rachman Chavik
0555895de3
Remove leftover temp file
2013-07-07 11:20:37 +07:00
Rachman Chavik
4bb0a1228a
Fix I18n to extract plugin model validation messages
2013-07-07 11:20:14 +07:00
Marc Würth
2609016dfe
Changed http links to lighthouse, groups.google and github to https
...
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
4671f235ad
duplicate line removed
2013-06-13 14:15:00 +02:00
euromark
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02:00
Mark Story
4b7c128f04
Merge pull request #1320 from ravage84/docblock-improvements
...
Improved the DocBlocks and other code cleanup
2013-05-31 07:36:04 -07:00
Mark
525bf3b362
Merge pull request #1297 from dereuromark/master-email-wrapping
...
enforce a better email wrapping to send valid emails
2013-05-31 07:30:32 -07:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Marc Würth
2bbd391972
Synced PHP version annotations
...
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
euromark
75b5a323e4
enforce a better email wrapping to send valid emails
2013-05-23 18:34:39 +02:00
Rik van der Heijden
dddf8aafb9
Fixed curly brackets at a few class definitions
2013-05-04 13:23:58 +02:00
Mark
faa6292f15
Merge pull request #1255 from dereuromark/master-copyright-noise-removed
...
Remove copyright noise from test files
2013-04-30 02:24:25 -07:00
Mark Story
ac94d11e65
Merge pull request #1254 from dereuromark/master-spelling-corrections
...
spelling corrections (a url to an URL, unify URL)
2013-04-29 09:27:48 -07:00
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
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Graham Weldon
a3702fcf2b
More copyright updates
2013-02-08 21:29:18 +09:00
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +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
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01: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
mark_story
869d556d07
Fix typos & strict errors.
2012-11-24 22:42:14 -05:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
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
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
0x20h
bfaea78504
allow more elaborate regex rules
2012-01-13 23:29:23 +01:00
0x20h
95a41af9db
allow multiple roles for a rule to be specified as string or array
2012-01-13 22:02:25 +01:00
0x20h
153152642c
PHP configuration file base Acl implementation
2012-01-13 21:43:48 +01:00
Ceeram
eaf6f0e2c1
add missing App::uses()
2012-01-12 18:01:27 +01:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
87924414fc
Update Configure::load() to use Set::merge()
...
This fixes some of the awkward behavior that using
array_merge_recursive() could create.
Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
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