mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04: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
b6a2c2a982
update bootstrap config
2013-06-21 16:38:25 +02:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
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
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
euromark
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
ADmad
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
Marc Würth
993ec1fed6
Fixed some typos in core.php
...
In sync with this one https://github.com/cakephp/cakephp/pull/1244
2013-04-23 21:50:26 +03:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
Rachman Chavik
331580bbad
Removing stray whitespace
2013-04-18 21:33:23 +07:00
Rachman Chavik
051fc0c140
Remove copyright information from bake templates
2013-04-18 21:28:06 +07:00
mark_story
d01d291d13
Remove unused define.
...
The LOG_ERROR constant is no longer used by the logging system. It is an
unused relic from 1.x. Additionally changing the value of ERROR to not
be error creates counterintuitive code.
Fixes #3762
2013-04-16 12:32:00 -04:00
Ceeram
6bf9363217
Add option to skip exception types for logging.
...
add blacklisting for logging exceptions
add test for skipping exception logging, and fix typo and cs
add example to docblock in core.php for skipLog
remove app_error.php skips, those are no longer used in 2.x
use assertContains instead of assertRegExp
check for instanceof, instead of matching names
2013-03-26 15:11:39 +01:00
mark_story
3b7b322d41
Update API links.
2013-03-05 20:58:03 -05:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
euromark
eb49c4b666
proper response and response code (404 instead of 200)
2013-02-22 10:36:05 +01:00
José Lorenzo Rodríguez
fd7158c108
Merge pull request #1119 from ravage84/patch-2
...
Adjusted link for my docs-patch
2013-02-16 06:12:48 -08:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
ADmad
ee4a116936
Fix coding standards
2013-02-10 12:51:22 +05:30
Marc Würth
514d9675d8
Updated .gitignore, synced app & skel
...
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)
Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
97a60c28c7
Updated copyright and added references to license file for non-standard copyright references
2013-02-08 21:26: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
Marc Würth
94ca499dec
Brought home.ctp in skel folder in sync
2013-02-06 03:16:48 +01:00
Marc Würth
72765a2afc
Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync
2013-02-03 20:00:32 +01:00
ravage84
af8b1e22ef
Added a note about plugin assets not working witout url rewrite
...
http://cakephp.lighthouseapp.com/projects/42880/tickets/25-i-installed-but-dont-see-the-images-and-css-of-debugkit
> Plugin assets do not work without url rewriting, this is in the
documentation for CakePHP itself. I guess it could be repeated for this
and every other plugin.
> I could have sworn it was with the Plugin Assets section, but
apparently its not there. Perhaps its just something I know from
experience.
See also:
* http://cakephp.lighthouseapp.com/projects/42648/tickets/1755-plugin-webroot-without-mod_rewrite-problem
* http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/500-plugin-css-directories-bug#ticket-500-8
Signed-off-by: mark_story <mark@mark-story.com>
Refs #GH-1113
2013-02-03 13:12:29 -05:00
mark_story
410981296c
Fix ServerShell not being able to handle plugin assets.
...
Fixes #3575
2013-01-28 22:21:58 -05:00
AD7six
51946ff8fd
Remove Security.level from core.php
...
it's not used by cake, and it can confuse users familiar with 1.3
that this setting exists yet doesn't do anything in later versions
2013-01-22 09:56:01 +01:00
ADmad
d6c2df7b6b
Display exact PDO error on default homepage
2013-01-12 11:30:25 +05:30
AD7six
967526540a
app/Console/cake is not pwd sensitive
...
the app dir does not need to be guessed based on the pwd - derive
from the path to the executable
2013-01-06 22:09:07 +01:00
Graham Weldon
a9293aa385
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
Ceeram
f792136c26
adding a note about custom error handler classes
2012-12-27 13:18:52 +01:00
Jose Lorenzo Rodriguez
bcda684ad7
Copying changes doe to cake executable to skel files
2012-12-23 00:23:01 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
ADmad
5aa9c26fdf
Update doctypes to html5
2012-12-23 02:57:30 +05:30
euromark
32f2426001
cache prefix for view cache to avoid collisions with domains/languages
2012-12-11 12:54:16 +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
Ceeram
aaf2d2ef71
fix remaining cs errors
2012-11-04 13:56:13 +01:00
Jose Lorenzo Rodriguez
6c1bed3d26
Adding warning to home.ctp when DebugKit is not installed
...
Adding a list of official plugins to home.ctp
Removing old link to live.cakephp.org and replacing it with
plugins.cakephp.org
2012-11-03 15:57:22 +09:00
euromark
5324a8ca9c
cleanup
2012-10-27 00:26:54 +02:00
Renan Gonçalves
02cfacec41
Make app/Console/cake pwd insensitive on Mac OS X.
...
Follow up of [36e15a065b
].
2012-10-26 01:14:09 +02:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00