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
