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
