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 |
|
Mark Story
|
d051b69312
|
Merge pull request #914 from dereuromark/2.3-i18n-extract
Normalize paths in generate pot files to always use /
Fixes #3306
|
2012-10-25 17:12:55 -07: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 |
|
euromark
|
f3bbe89ede
|
solves ticket 3306
|
2012-10-25 17:08:52 +02:00 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01: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 |
|
mark_story
|
513851d1c1
|
Update skel directory logging configuration.
|
2012-10-13 02:29:25 -04:00 |
|
mark_story
|
e58c93c39d
|
Fix trailing whitespace.
|
2012-10-01 21:21:53 -04:00 |
|
mark_story
|
a3ae58da09
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/View/View.php
|
2012-10-01 21:20:25 -04:00 |
|
Andras Kende
|
fa5d2c1941
|
removed 2 empty lines
|
2012-10-01 04:19:36 -07:00 |
|
Andras Kende
|
f5be83d452
|
formatting changes..
|
2012-10-01 02:58:30 -07:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
mark_story
|
739b3b70f7
|
Update text in routes.php to clarify when to remove core routes.
|
2012-09-30 20:17:50 -04:00 |
|
ADmad
|
035f727686
|
Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
|
2012-09-30 14:41:37 +05:30 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
Mark Story
|
87fc86133c
|
Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
|
2012-09-28 17:49:32 -07:00 |
|
James Michael DuPont
|
2d46fc60be
|
Fixing undefined variable usage
Squash of pull request #872
|
2012-09-28 20:46:25 -04:00 |
|
euromark
|
b7f1740d2b
|
correcting coding-standards
|
2012-09-28 13:49:51 +02:00 |
|
euromark
|
b47e3a7d92
|
move charset/App.encoding into CakeResponse
|
2012-09-27 20:28:19 +02:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
Renan Gonçalves
|
fe5b49e6eb
|
Fixing variable name used to set error handlers.
|
2012-09-24 13:41:56 +02:00 |
|
mark_story
|
3dd82e6d88
|
Fix Database/ from always being appended to the driver name.
Fixes #3223
|
2012-09-19 20:55:39 -04:00 |
|
euromark
|
213d4caa85
|
coding standards
|
2012-09-20 01:50:15 +02:00 |
|
dogmatic69
|
d0bb8a94b4
|
die() to exit()
|
2012-09-15 11:20:51 +01:00 |
|
dogmatic69
|
f5a8eb6bbf
|
ADmads comments
|
2012-09-14 19:57:51 +01:00 |
|
dogmatic69
|
cfadc4dbb0
|
strict type checks and removing some duplicate count() calls by setting a variable
|
2012-09-14 19:26:00 +01:00 |
|
dogmatic69
|
5cc03ca805
|
converting if($foo == true) to if($foo)
|
2012-09-14 18:54:29 +01:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|