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
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
euromark
5324a8ca9c
cleanup
2012-10-27 00:26:54 +02: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
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
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
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
euromark
b47e3a7d92
move charset/App.encoding into CakeResponse
2012-09-27 20:28:19 +02: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
Ceeram
abe74adf8a
partial remove onlyAllow from baked code, only keep in delete to be rfc compliant
2012-08-26 15:00:49 +02:00
Ceeram
27d83eedfe
use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included
2012-08-25 09:38:40 +02: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
euromark
2a553dcfd1
unified doctype for browser related layout templates
2012-07-24 18:06:39 +02:00
euromark
4fe1ab1bf6
missing app uses statements
2012-07-21 13:34:33 +02:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
euromark
e1357ca8aa
indentation in templates
2012-07-18 03:24:55 +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
AD7six
a5fabcc1dc
No startup and teardown for controller tests
...
and.. no startup/teardown functions unless they are actually going to do more
than just call parent
2012-06-06 21:06:37 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Rachman Chavik
8e8763d69d
change to match syslog levels & customizable levels
2012-05-13 18:51:57 +07:00
Mark Story
5d3291ba19
Merge pull request #645 from huoxito/2.2
...
Make controller test template extends ControllerTestCase instead of CakeTestCase
2012-05-11 17:35:34 -07:00
Washington
287c7b432a
fix broken tests for TestTask class
2012-05-11 15:30:47 -03:00
Washington
c651bf25d3
remove stub class from controller tests template and mock condition to
...
make it extends ControllerTestCase
2012-05-11 14:51:56 -03: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
Washington
a238116734
make controller test template extends ControllerTestCase
2012-05-10 20:34:30 -03:00
AD7six
6aca8036f4
baked tests match code standard by default
2012-05-10 23:51:22 +02:00
AD7six
39a53fe0e2
updating model bake tempalte to meet code standards
2012-05-10 00:44:03 +02:00
AD7six
5b507636c7
baked controller code generates no errors
2012-05-10 00:37:51 +02:00
AD7six
5ef2a0100b
code standard fix
...
the baked test must have a blank line inbetwen the last function and the
end of the class
2012-05-09 23:38:29 +02:00
AD7six
d1f522e53a
attempt to get baked code output closer to phpcs standard
2012-05-09 23:38:29 +02:00
mark_story
b57489f3f1
Remove duplicate template.
...
Also remove double creating the home.ctp file.
Fixes #2842
2012-05-02 20:54:50 -04: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
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
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
e54e494b4b
Syncing app/webroot/index.php + skel directory.
...
Refs #GH-607
2012-04-17 20:45:59 -04: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
ADmad
4e1a2670da
Updating outdated layout file in skeleton
2012-04-14 19:22:52 +05:30
Jose Lorenzo Rodriguez
5a41024cf3
Removing hardcoded helper from PagesController in skel
2012-03-27 23:53:22 -04:30
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Kyle Robinson Young
b8705a71fb
Remove no longer needed empty file
2012-03-24 21:46:32 -07:00
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
664b0538b8
Fix more coding standards problems.
2012-03-04 22:49:38 -05:00
mark_story
db8c6b5c78
Fix most of the coding standards issues in Console/
2012-03-03 18:55:29 -05: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
Rachman Chavik
b545d8b201
fix getSchemaName() for Sqlserver.
...
Closes #2609 .
2012-02-23 08:25:07 +07: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
Jose Lorenzo Rodriguez
ea79ba81a4
Adding a simpler solution to the missing view files problem without altering the built paths in App
2012-02-20 15:39:03 -04:30
ADmad
c7cfd45884
Syncing bake skeleton with app
2012-02-16 01:58:11 +05:30
Majna
b61f46b030
Add Console/Templates and webroot/files to bake skel. Update tests.
2012-02-07 18:51:04 +01:00
mark_story
07dc558fb1
Sync CSS file with app/webroot.
2012-02-04 11:03:01 -05:00
mark_story
5cf5ee4410
Clarify which cache is using the indicated engine.
2012-02-04 10:42:48 -05:00
mark_story
fb7717c0da
Fix wonky tabs.
2012-01-27 20:59:03 -05:00
mark_story
9ff0739504
Improving test generation.
...
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
ADmad
00649cbdde
Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748 . Closes #2509
2012-01-26 17:56:42 +05:30
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
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Scott Harwell
153b9f9ee2
Updated to use camelize rather than classify
2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667
Added check for duplicate methods to prevent fatal php error
2012-01-16 14:45:12 -05:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
mark_story
0b0a69de1e
Update default layouts to use blocks.
2011-12-17 22:23:37 -05:00
Rachman Chavik
90af608489
keep existing data in unique HABTM closes LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07: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
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
Majna
87a3937def
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 20:06:07 +01:00
Andras Kende
4f64a9f6cd
removing $i as its no longer being used here. (probably was used before on zebra striping.)
2011-11-28 23:33:55 -06:00
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
ADmad
233a63366f
Syncing files between app directory and bake skeleton
2011-11-14 02:32:59 +05:30
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
b2414a777f
Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment
2011-11-06 13:17:07 -08:00
Vitor Pacheco
2b5b7694c9
Property 'name' removed of PagesController.
2011-11-05 15:25:41 -02:00
Majna
1b9b90d2e7
Replacing 'driver' with 'datasource'.
2011-11-04 23:07:31 +01:00
Marko Marković
385f6f164f
Fixed typos in css
2011-11-01 16:59:11 +01:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
8529d76e6f
Removing Xml prolog from default xml layouts.
...
Both DOMDocument and SimpleXML output the prolog when
saving xml.
Fixes #2171
2011-10-27 20:58:03 -04:00
m
5a5a542a71
Missing ini_set of include path for test.php
...
Fixes #2167
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-25 22:26:59 -04:00
mark_story
d92c73d821
Remove reference to XmlHelper.
...
Refs #2164
2011-10-25 20:16:58 -04:00
Majna
a9dbde0cbd
Fixing incorrect doc blocks regarding error handler.
2011-10-23 21:55:20 +02: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
e47b970811
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-16 15:45:47 -04:30
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
Renan Gonçalves
d2a664c2df
Fixing @package at in Cake/Console/Templates/skel files.
2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653
Fixing @package at in Cake/Console/Templates files.
2011-10-15 20:26:48 +02:00
Jose Lorenzo Rodriguez
f8772dc524
Also changing shell script in skel directory
2011-10-15 10:18:36 -04:30
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
evilbloodydemon
8e78308261
Removed unnecessary ClassRegistry::flush() from test template.
2011-10-12 13:37:50 +04:00
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
mark_story
3f778d8936
Fix inconsistency between app and skel directory.
...
Fixes #2077
2011-10-08 14:40:11 -04: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
ADmad
fa214e8716
Updating old usage Configure::read()
to new Configure::read('debug')
. Closes #2070
2011-10-06 17:02:15 +05:30
mark_story
2cc9523509
Adding old webkit gradient prefixes.
...
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
aae2b0c257
Fixing issue baking controller tests.
...
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
2011-10-02 22:53:37 -04:00
Graham Weldon
f69fc937cb
Fixed missing string append operator for baked homepage to include banner.
2011-10-02 11:58:11 +11:00
Ceeram
22029a1199
fixing email.php.default, from should have email as key
2011-09-29 14:59:27 +02:00
mark_story
8272758eb9
Adding block to home page for PHP version.
...
Fixes #2010
2011-09-24 10:41:22 -04:00
Renan Gonçalves
1b2b191212
Updating cake.generic.css to its newest version from app directory.
2011-09-20 20:29:55 +02: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
mark_story
3cb3424b4f
Add App::uses to baked controllers.
...
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0
Adding App::uses() call to model baking.
...
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
2011-09-09 20:43:04 -04:00
mark_story
3d44489b0c
Deprecating the %page% style placeholders in PaginatorHelper.
...
Updating scaffold and bake templates to not use deprecated placeholders.
2011-09-06 02:37:43 +01:00
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
8c75488979
More changes to the CSS, and updating the bake templates and scaffolds.
2011-09-03 10:06:01 +01:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
ADmad
34d3d6fe9e
Fixing doc block related to session configuration. Closes #1927
2011-08-23 04:07:08 +05:30
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
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
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
20e9015f80
Making skel files generate hard coded paths, when CakePHP
...
is not on the include_path, and exclude hard coded paths when it is.
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
Ceeram
dbdc0a1e37
moving test icons one dir up, and remove subdir img in img
2011-08-02 14:56:03 +02:00
Juan Basso
d84531d29c
Using @property to autocomplete components and helpers in some IDEs. Also added @property to bake of controller and model. Fixes #103 .
2011-07-31 20:28:35 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
febf28f34b
Merge remote-tracking branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/templates/default/views/home.ctp
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/media.test.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/test_app/views/pages/home.ctp
lib/Cake/Cache/Engine/ApcEngine.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Mark Story
4101388069
Syncing skel directory with app/Config.
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
Robert Sworder
fb3a1928d3
Minor comment and path changes.
2011-06-25 15:08:41 +01: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
7392902abd
Syncing skel CSS with app/webroot css.
2011-06-22 13:17:38 -07:00
Mark Story
f547032f6f
Removing altrow from the bake default templates.
...
Refs #306
2011-06-22 13:14:31 -07:00
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Mark Story
aee5ee5fe5
Merge pull request #119 from neterslandreau/2.0
...
Merging changes for skel files.
2011-06-13 17:53:17 -07:00
Niles
d5012f0e33
add required uses to template.
2011-06-13 10:18:59 -04:00
Renan Gonçalves
dfe58d7851
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-06-12 23:25:01 +02:00
Renan Gonçalves
2e3f828098
Updating the home.ctp file to include last changes made on directories name and i18n usage.
2011-06-12 23:24:42 +02: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
Renan Gonçalves
2a3f49bf00
Updating the cake.generic.css from skeleton template to match the changes made on commit cb946bbc
.
2011-06-12 22:42:22 +02:00
Niles
1079889d9f
fix missing uses command in bake template. fixes #1770 .
2011-06-12 11:54:47 -04:00
Vitor Pacheco
bfa7c12866
printing the legend of the forms in the templates
2011-06-04 14:42:22 -03:00
Juan Basso
21348169fa
Camelized templates folder.
2011-05-30 23:02:39 -04:00