Commit graph

745 commits

Author SHA1 Message Date
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
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
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
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
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
Graham Weldon
41ae19b5bc Removed spaces at the end of lines. 2012-10-15 11:44:31 +11:00
AD7six
52f206064d unbrake Console/cake on osx 2012-10-04 21:41:22 +02: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
739b3b70f7 Update text in routes.php to clarify when to remove core routes. 2012-09-30 20:17:50 -04:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
mark_story
c83e941497 Merge branch 'master' into 2.3 2012-08-15 21:00:49 -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
mark_story
f963e378b5 Fix coding standards errors. 2012-07-26 21:22:50 -04:00
José Lorenzo Rodríguez
255705a81e Merge pull request #714 from shin1x1/pr_server_shell_2.3
Added ServerShell for PHP Built-in Server into 2.3 branch.
2012-07-25 14:10:28 -07:00
AD7six
c41ee9a5aa remove debug statement that slipped through
Thanks to @jippi for pointing out this error, which originally came from
a diff provided by.. @jippi
2012-07-19 16:05:24 +02:00
AD7six
70ac1c7e33 Adding symlink resolution to app/Console/cake
Otherwise, if you symlink to app/Console/cake the app path gets set to 2
folders above wherever the symlink is defined.
2012-07-16 16:55:53 +02:00
mark_story
2f7f5e1322 Use file cache as the default cache engine.
Too many people had issues using APC by default as its often configured
in strange ways, and works poorly on inexpensive hosting.

Fixes #2995
2012-07-15 09:11:27 -04:00
shin1x1
dd524c96e1 Added ServerShell for PHP Built-in Server. 2012-07-13 02:29:42 +09: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
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
1312cdaedf Remove extraneous space in .htaccess 2012-02-17 21:32:09 -08: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
90f4c03627 Moving view files from core to app 2012-02-16 01:58:11 +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
ADmad
e44d36f8db Merge pull request #416 from 0x20h/move-cache-docblock
Moved cache docblock from core.php to bootstrap.php
2012-02-06 12:18:58 -08:00
0x20h
10350a9fdc added a further note where to look for available cache implementations and their respective settings 2012-02-06 21:02:52 +01:00
mark_story
5cf5ee4410 Clarify which cache is using the indicated engine. 2012-02-04 10:42:48 -05:00
0x20h
162b77310c fixed typo 2012-02-01 20:14:56 +01:00
0x20h
bc8feefc89 added 'mask' option hint to file cache docblock 2012-02-01 20:12:34 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
Ceeram
4f1be12046 Merge branch '2.1-appshell' into 2.1 2012-01-23 15:29:03 +01:00
Graham Weldon
64d4387c82 Added default prefix to cache configurations. 2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a Set encoding in CSS file.
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -05:00
0x20h
54869fc965 moved note about 'default' cache configuration to the APC config docblock 2012-01-17 19:39:46 +01:00
0x20h
588090da21 moved docblock on default cache configuration to bootstrap.php, left a note in core.php 2012-01-17 08:58:22 +01:00
0x20h
1f31432a64 typo 2012-01-13 23:36:29 +01:00
0x20h
b5671eb7e0 added default acl.php in app/Config 2012-01-13 23:28:55 +01:00
Ceeram
9f40e6de79 move AppShell to app/Console/Command directory 2012-01-12 11:55:10 +01:00
mark_story
41bbc02603 Add next-version task. 2012-01-07 20:05:10 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Dien Vu
a1690a13bf Edit memcached's website:
http://www.danga.com/memcached/ 
moved to 
http://memcached.org/
2011-12-24 09:18:51 +07:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05: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
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08: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
21cd3f00ac Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
Ceeram
b380b5efb9 Add back missing .sql files, related to pull request 132 on docs repo 2011-11-17 13:00:54 +01:00
mark_story
542e5c91de Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 23:11:07 -05:00
ADmad
233a63366f Syncing files between app directory and bake skeleton 2011-11-14 02:32:59 +05:30
ADmad
87f12de1ab Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper. 2011-11-14 02:11:18 +05:30
ADmad
f2a58117ca Moving AppModel, AppController, PagesController out of core to app 2011-11-12 22:30:42 +05:30
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Kyle Robinson Young
60718c3b9f Remove 5.3 notice from Config/core timezone comment 2011-11-06 11:04:19 -08:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +01:00
mark_story
d6f7669f54 Merge branch '2.0' into 2.1 2011-10-23 21:07:09 -04:00
Majna
a9dbde0cbd Fixing incorrect doc blocks regarding error handler. 2011-10-23 21:55:20 +02:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
mark_story
183ffb29d7 Improving the exception stack traces.
Adding Debugger::getType()
2011-10-19 22:27:55 -04:00
Rachman Chavik
a60d71d19b removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00
mark_story
d7155d374b Making apc feature test rely on apc_dec.
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.

Fixes #2105
2011-10-18 20:48:58 -04:00
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
mark_story
bda8df1b50 Fix issues with bash quoting and directories with spaces. 2011-10-15 09:56:04 -04:00
Jose Lorenzo Rodriguez
36fa2e87b4 Adding symlink support to the cake console executable 2011-10-14 22:15:26 -04:30
mark_story
6bf6d79979 Removing 'cake' domain from core.
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
2011-10-14 21:01:17 -04:00
Heath Nail
9e9b1f0382 Windows newlines for .bat files. 2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf Incresing sync between app and skel directories. 2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b Incresing sync between app and skel directories. 2011-10-14 15:06:36 -04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
mark_story
e07256b6d4 Update the .htaccess files to increase
compatibility with shared hosting servers.
Fixes #2010
2011-10-07 20:59:20 -04:00
mark_story
2cc9523509 Adding old webkit gradient prefixes.
Fixes #2066
2011-10-05 17:59:39 -04:00
Ceeram
22029a1199 fixing email.php.default, from should have email as key 2011-09-29 14:59:27 +02:00
mark_story
bfcfeeb3ab Updating package names in bootstrap file. 2011-09-20 20:16:06 -04:00
ADmad
7c87e9abc1 For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994 2011-09-16 13:40:04 +05:30
Jose Lorenzo Rodriguez
2bca1435ab Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 07:05:48 -04:30
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
0bb19dad16 Tidying up forms.
Making forms look consistent in IE9.
Minor updates.
2011-09-03 10:06:01 +01:00
mark_story
e735c57f0b Fixing issues in Firefox. 2011-09-03 10:06:01 +01:00
mark_story
ca078d9a25 Converging on 4px for border-radius.
Updating debug() to output a tiny bit more HTML so it can be made sexy.
2011-09-03 10:06:01 +01:00
mark_story
1c40a37439 Removing dead links from the home.ctp
Updating CSS for changes in previous commit.
2011-09-03 10:06:01 +01:00
mark_story
8c75488979 More changes to the CSS, and updating the bake templates and scaffolds. 2011-09-03 10:06:01 +01:00
mark_story
815b78c2f9 More tweaks to the error output and headings.
Removing extra | from debugger output.
2011-09-03 10:06:00 +01:00
mark_story
35024c02d0 Starting on pagination button refresh. 2011-09-03 10:06:00 +01:00
mark_story
c36bc1e6c1 Adding more fancy CSS3 styling. 2011-09-03 10:06:00 +01:00
mark_story
b56b6e3614 Making error messages look a bit fancier. 2011-09-03 10:06:00 +01:00
mark_story
efbeab6199 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00
Mark Story mark@mark-story.com
5424475a73 Fixing comment about Asset.timestamp to be accurate to the behavior.
Refs #1959
2011-09-01 19:05:17 +01:00
ADmad
34d3d6fe9e Fixing doc block related to session configuration. Closes #1927 2011-08-23 04:07:08 +05:30
mark_story
d93c8cb200 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
Martin Ueding
00a77b41f5 prepared utf8 database connection option 2011-08-13 17:13:27 +02:00
Majna
826001adc7 Added doc blocks for WincacheEngine. Fixed Memcache doc block. 2011-08-10 16:55:05 +02:00
Mark Story
b45e8eb0cd Adding comments about CAKE_CORE_INCLUDE_PATH.
Removing ini_set() blocks that don't need to exist.
2011-08-03 20:06:47 -04:00
Mark Story
721c438817 Re-adding support for PHP's include_path.
Moving constants that are made of other constants into bootstrap.php
2011-08-03 20:06:47 -04:00
Mark Story
8f38065c8f Adding missing Vendor directory.
Fixes #1859
2011-07-28 16:31:19 -04:00
Mark Story
c8647b227a Moving plugin route loading to app/Config/routes.php
Its old position would end up with plugin routes being loaded
after the core fallback routes.
2011-07-22 20:29:45 -04:00
mark_story
cfb3e8a15b Moving default routes into a separate file.
Removing Router::defaults() as its not needed anymore.
Removing default routes from inside router.
Removing properties related to default routes.
Removing dead tests and updating tests.
2011-07-22 20:29:45 -04:00
mark_story
2141b494cd Adding charset as it was previously omitted. 2011-07-22 20:29:44 -04:00
mark_story
ec40ce6aad Updating index.php and skel dir for response change. 2011-07-22 20:29:43 -04:00
Jose Lorenzo Rodriguez
feb567d4ee Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing 2011-07-07 02:34:22 -04:30
Thomas Ploch
4854b4a936 Removed legacy app/config folder from 2.0 branch. 2011-07-01 19:27:08 +02:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
0e09f75a66 Updating table styles. 2011-06-22 13:53:38 -07:00
Mark Story
edda41e23b Removing 'altclass' from scaffold templates.
Refs #306
2011-06-22 13:08:17 -07:00
Mark Story
694819cb81 Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787
2011-06-21 22:28:25 -07:00
Mark Story
f641da89fa Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787

Conflicts:

	app/webroot/css/cake.generic.css
2011-06-21 22:28:03 -07:00
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Renan Gonçalves
564bf87764 Using exit instead of die, as did in 2e8bbd5e.
Fixing an typo.
Using i18n on test.php file and pointing it to right directory.
2011-06-12 23:12:22 +02:00
ADmad
cb946bbcf3 Added warning message on homepage for misconfigured URL rewriting. Removed dead link for cakeforge.org 2011-06-05 03:34:28 +05:30
Juan Basso
6f821e0d4d Changes relatives to templates from last commit. 2011-05-30 23:11:09 -04:00
Juan Basso
6aca8dc11a Updating the copyright to 2011. 2011-05-30 22:46:14 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
ADmad
6b7dbcdd1c Adding warning message on homepage for misconfigured URL rewriting. Closes #1577 2011-05-26 20:35:28 +05:30
Juan Basso
acc0660989 Changed the emails folder in layouts to CamelCased. Fixes #1730. 2011-05-24 01:05:29 -04:00
Juan Basso
3812ac70cb Fixed the default name of email transport. Fixes #1728. 2011-05-24 01:01:58 -04:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
mark_story
600609cc87 Adding testsuite icons to the repo, so they are local assets instead of remote ones.
Fixes #1708
2011-05-22 09:15:04 -04:00
Leonid Mamchenkov
574cee7510 Fixed typo in documentation 2011-05-16 21:58:18 +03:00
AD7six
0508055ee9 remove CAKE_TEST_LIB constant 2011-05-15 17:36:39 +02:00
Jose Lorenzo Rodriguez
91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
mark_story
b6ef1305df Backporting changes made to Memcache in 2.0 to address issues with persistent
connections.  Refs #1705
2011-05-13 22:10:58 -04:00
Thomas Ploch
4aa9254316 Updated Memcache settings docblock in core.php (skel and config). Removed probably misleading comment about FCGI. Fixes #1705 2011-05-14 00:55:28 +02:00
Thomas Ploch
402c4a7a6f Added 'persistent' setting to MemcacheEngine.
Fixes #1705 when connections are not closed when using i.e. FCGI.
2011-05-13 23:44:59 +02:00
Jose Lorenzo Rodriguez
3b725290ba Renaming elements and layouts 2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826 Renaming more folders 2011-05-13 02:31:33 -04:30
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30
evilbloodydemon
1d7d20768f Fixed typo in variable name 2011-04-26 21:44:37 +04:00
Juan Basso
24fbaafe01 Merge with 2.0-email. 2011-04-23 22:36:55 -04:00
Juan Basso
fac5ae50d0 Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415. 2011-04-20 23:47:21 -04:00
Juan Basso
e0b4623065 Added support to sender email. Fixes #13. 2011-04-19 20:24:51 -04:00