Commit graph

559 commits

Author SHA1 Message Date
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
mark_story
739b3b70f7 Update text in routes.php to clarify when to remove core routes. 2012-09-30 20:17:50 -04:00
Mark Story
bc2d449487 Merge pull request #776 from andraskende/2.2
update email layout to use fetch
2012-08-15 16:32:44 -07:00
Andras Kende
8511a6a178 update to use fetch 2012-08-15 14:24:38 -07:00
Andras Kende
3f1c831800 update to use fetch 2012-08-15 14:24:15 -07:00
Jose Lorenzo Rodriguez
ec7ec73b66 Merge branch '2.1' into 2.2 2012-07-01 17:35:24 -04:30
ADmad
93123a8e6f Change "create" to "edit" since said view and layout file already exist in app now. 2012-06-26 02:37:40 +05:30
AD7six
ad7b5bfb88 fix whitespace
tabs for indentation
spaces for alignment
2012-06-06 14:32:43 +02:00
AD7six
36e15a065b Make app/Console/cake pwd insensitive
With the previous versions of cake - you'd install cake in your path and
therefore when executed the pwd was a variable.

With the creation of app/Console/cake this is not true any more, and
copying the existing use of `pwd` for app means there is an implicit
assumption that it will always and only be ran from the app dir. If it
is ran from elsewhere - it's as if the core lib/Cake/Console/cake
had been run (app dir is "missing" no boostrap, no app-plugins etc.)

With this change, all of these act exactly the same:

    cd ~/root/app
    Console/cake

    cd ~/root/app/Console
    ./cake

    cd ~/root
    app/Console/cake

    cd /anywhere
    ~/root/app/Console/cake
2012-06-06 14:32:43 +02:00
Jelle Henkens
ab1f336e21 Adding timeout and port options to the redis cache engine 2012-05-29 23:39:56 +01:00
Rachman Chavik
8e8763d69d change to match syslog levels & customizable levels 2012-05-13 18:51:57 +07:00
Rachman Chavik
e5b33627d5 minor updates to the logging changeset
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
2012-05-11 21:19:45 +07:00
Rachman Chavik
5c4f741529 add default logging config in Config/bootstrap.php 2012-05-11 12:37:00 +07:00
Graham Weldon
7f04fbd7dc Minor spacing changes to fix coding standards in webroot/test.php in app/ 2012-05-01 09:40:16 +10:00
Graham Weldon
1253529c44 Removed indentation to satisfy coding standards in webroot/index.php in app/ 2012-05-01 09:38:16 +10:00
Graham Weldon
dc0d05516a Removed single line of whitespace to fix some coding standards in PagesController in app/ 2012-05-01 09:36:08 +10:00
Graham Weldon
ce5e6027cd Fixed coding standards in cake.php console in app/ 2012-05-01 09:34:26 +10:00
Graham Weldon
9539023b82 Fixed coding standard errors in schema.php in app/ 2012-05-01 09:32:10 +10:00
Graham Weldon
d40a8a90a8 Fixing coding standards in i18n schema in app/ 2012-05-01 09:30:22 +10:00
Graham Weldon
23d8e636b9 Fixed coding errors in db_acl.php in app/ 2012-05-01 09:28:02 +10: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
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04:00
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Kyle Robinson Young
89d3221adc Update available App::build settings in bootstrap 2012-04-22 21:16:00 -07:00
Jose Lorenzo Rodriguez
ed0c5a4746 Merge branch '2.2-lazy-helpers' into 2.2 2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
Jose Lorenzo Rodriguez
15dcd6046b Fixing typos 2012-04-22 17:07:43 -04:30
mark_story
c49da62c23 Update content_for_layout to use fetch()
Fixes #2803
2012-04-18 22:23:18 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
Mark Story
be38058586 Merge pull request #607 from jnrbsn/remove-bad-path-info-code
Remove bad path info code
2012-04-17 17:42:39 -07:00
Jose Lorenzo Rodriguez
826699a670 Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher
Filters
2012-04-17 00:42:18 -04:30
Juan Basso
9beaa9602f Unified error handlers. Now the regular error handler will receive the fatal errors too. 2012-04-14 16:08:36 -04:00
Juan Basso
a72288c378 Fixing doc. 2012-04-14 16:08:36 -04:00
Juan Basso
05cdae6d1a Renamed fatal error handler configuration for follow the same logic of consoleHandler name. 2012-04-14 16:08:36 -04:00
Juan Basso
1428659f88 Moved the fatal error detection to App::shutdown and keeping the fatal error handler cleaner. It helps to be extended by applications/plugins. 2012-04-14 16:08:35 -04:00
Juan Basso
440f0c38eb Added a handler for fatal errors, showing internal server error page when debug is disabled or a custom fatal error page when enabled. 2012-04-14 16:08:35 -04:00
ADmad
4e1a2670da Updating outdated layout file in skeleton 2012-04-14 19:22:52 +05:30
Jonathan Robson
a10093d2af PATH_INFO never gets used.
See <http://github.com/cakephp/cakephp/pull/606> for discussion.
2012-04-12 23:13:57 -05:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
oldskool
4ceab12085 Added "missing" comma after smtp log option.
Signed-off-by: mark_story <mark@mark-story.com>
2012-04-08 21:09:05 -04:00
Jose Lorenzo Rodriguez
f349c9e34c Removing hardcoded helpers from Controller and PagesController class since they are now lazy loaded 2012-03-27 23:45:01 -04:30
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
ADmad
0832e18e9e Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682 2012-03-18 14:05:41 +05:30
mark_story
5713cd3269 Fix the way bash is invoked.
Using /usr/bin/env is more portable to various *nix flavours.
Fixes #2688
2012-03-15 20:20:39 -04:00
mark_story
1254a1068f Fixing issues with unwanted querystring parameters.
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params.  This is
yet another case where named parameters are fail.  Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.

Fixes #2678
2012-03-14 20:20:55 -04: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
mark_story
0568746bfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e Change cake.php to allow cake libs at ROOT
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.

Fixes #2613
2012-02-26 12:03:22 -05:00