Commit graph

680 commits

Author SHA1 Message Date
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
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Gordon Pettey (petteyg)
ec619eec04 Remove some spacial overkill 2013-01-23 23:20:41 +00:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01: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
Rachman Chavik
622d2f04f9 removing extra newline in baked files 2013-01-20 09:07:31 +07:00
jroberts0001
e8647d77eb Added App::uses to the PluginAppController and PluginAppModel bake templates 2013-01-20 08:47:52 +07:00
mark_story
5a6a45d0d1 Add support for --admin to bake controller all.
I missed this when originally implementing bake controller all.

Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
0ed9e3c120 Only bake HABTM associations for tables that exist.
bake often guesses wrong when it comes to habtm. Only add associations
we're highly confident of. This includes tables where the foreign table
also exists.

Refs #3532
2013-01-15 21:43:30 -05:00
mark_story
eff4004261 Don't treat tables that substring match as associations
The table structure of:

- packages
- userpackages
- georegions
- userpackages_georegions

Should not create a habtm between packages & georegions.

Fixes #3532
2013-01-14 20:39:01 -05:00
ADmad
d6c2df7b6b Display exact PDO error on default homepage 2013-01-12 11:30:25 +05:30
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
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
and-ers
c72c612625 Replaced simple and therefore pointless array_push function references with the ordinary way of adding an array element. This will increase the performance and the code looks much cleaner this way IMHO 2013-01-02 23:47:27 +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
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +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
Ceeram
6672eafe53 fix whitespace errors 2012-12-21 16:05:32 +01:00
Vinícius Krolow
c724f0739a Clean up code.
* It is not need to check the same thing twice
* One if condition instead of two ifs
* Ternary codition instead of checking if variable is null
* Returning early to avoid unnecessary conditional levels
* It is not needed to put an else as the if before already has returned
* Changing ternary conditional to PHP 5.2
* Removing some not needed conditions in the if, also changed to return false (instead of NULL) to follow the code block docs
* Changing to check before if the class_exists so we make sure that class was autoloaded before the condition

Squash of commits in https://github.com/cakephp/cakephp/pull/1034
2012-12-20 20:31:04 -05:00
mark_story
b346227d10 Fix issues with paths + spaces. 2012-12-19 17:35:56 -05:00
mark_story
fe2f56e8bd Fix path resolution when app dir has been renamed.
This solves path resolution when the default app dir has bee
renamed, and a relative path is used to run `cake`

Fixes #3474
2012-12-18 20:31:57 -05:00
Mark
8febb71b67 Merge pull request #1003 from dereuromark/2.3-cache-prefixes
cache prefix for view cache to avoid collisions with domains/languages
2012-12-17 00:46:08 -08:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
euromark
32f2426001 cache prefix for view cache to avoid collisions with domains/languages 2012-12-11 12:54:16 +01:00
Simon Males
693ca5481e Testing option value as a string 2012-12-10 23:02:51 +08:00
Simon Males
80773ad970 ConsoleOptionParser::_parseOption() tramples option values of 0 (zero). I believe the following condition is the culprit. 2012-12-10 22:13:38 +08:00
euromark
41f2d812bb fix ticket 3429 2012-12-03 12:31:56 +01:00
mark_story
35d67bf4a8 Merge branch 'master' into 2.3 2012-11-28 21:00:30 -05:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
Sethrin
c727444880 Fix behavior of --plugin param
Since plugins are not loaded in bootstrap, this is a good place to do it.
2012-11-26 22:13:01 -05:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
mark_story
587c7071b4 Fix incorrect order of arguments when added out of sequence.
Fixes #3385
2012-11-20 22:42:44 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
8f78b1e05b fix coding standards for whitespaces 2012-11-14 12:24:08 +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
Renan Gonçalves
929ed57844 Fixed TestShell options, removed space which caused the option to not be recognized. 2012-11-06 01:44:51 +01:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
ADmad
fa5ccf46d0 Fix coding standard errors 2012-11-04 02:52:00 +05:30
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
Kyle Robinson Young
f10c669813 Code standards fixes 2012-10-29 08:14:17 -07:00
Jose Lorenzo Rodriguez
8538c0e8ea Avoiding problems with relative paths in shell dispatcher 2012-10-28 12:57:44 +01:00
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02:00