mark_story
9b0e26cc21
Deprecate MemcacheEngine and update defaults for Memcached
...
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.
Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
2013-08-31 13:29:54 -04:00
mark_story
f18d354f55
Merge branch 'master' into 2.4
2013-08-28 12:35:07 -04:00
Andras Kende
17f9661961
Added mask to File cache docblock
2013-08-27 10:02:48 -04:00
euromark
80d55feda6
also remove app ones
2013-08-25 21:42:03 +02:00
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
euromark
5ed9e5d691
sync and correct generic css
2013-08-19 21:51:04 +02: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
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
Jan Dorsman
39a1d76d08
Updating some View files to follow convention
2013-08-11 11:46:35 +02: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
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
mark_story
c28cde4e56
Update webroot files to fix an issue in ServerShell.
...
The previous fixes done in 2918ae9c7a
caused other issues preventing actions from being dispatched properly.
Fixes #3934
2013-07-27 17:01:35 -04:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
881e757a1e
Paths for App::build() require trailing /.
2013-07-22 13:51:09 +02:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
Mark Story
4774d62e7f
Merge pull request #1416 from majna/2.4-pages
...
Pages controller should render 404 on missing view file
2013-07-13 17:05:14 -07:00
AD7six
6b66aee138
use a simpler rewrite rule
...
The capture group isn't used - so don't captuer it
There are no get args in the rewrite rule so there's no need to
request appending the existing get args - they are unmodified.
2013-07-13 16:18:48 +00:00
Majna
1ce9fc537f
Pages controller should render 404 on missing view file
2013-07-13 17:41:16 +02:00
mark_story
2918ae9c7a
Update index.php to serve static files with query strings.
...
Trim off the query string before attempting to locate the file on the
filesystem. Thanks to Marko Marković for the initial patch.
Fixes #3910
2013-07-09 21:07:12 -04:00
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
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
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
Marc Würth
baadaec608
Fixed some typos in core.php
2013-04-23 21:48:23 +03:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
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
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
Rémi Dewitte
ab510d1700
Add settings array to connection parameters that executes SET statements once connected
2013-03-07 23:45:42 +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
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
5ce6542b98
Adjusted link for my docs-patch
...
https://github.com/cakephp/docs/pull/484
Moved url rewriting section
2013-02-06 03:14:33 +01:00
ADmad
758d717096
Remove banner from default homepage
2013-02-06 01:39:41 +05:30
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