mark_story
3b7b322d41
Update API links.
2013-03-05 20:58:03 -05:00
José Lorenzo Rodríguez
fd7158c108
Merge pull request #1119 from ravage84/patch-2
...
Adjusted link for my docs-patch
2013-02-16 06:12:48 -08:00
Marc Würth
514d9675d8
Updated .gitignore, synced app & skel
...
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)
Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Marc Würth
5ce6542b98
Adjusted link for my docs-patch
...
https://github.com/cakephp/docs/pull/484
Moved url rewriting section
2013-02-06 03:14:33 +01:00
ADmad
758d717096
Remove banner from default homepage
2013-02-06 01:39:41 +05:30
ADmad
d6c2df7b6b
Display exact PDO error on default homepage
2013-01-12 11:30:25 +05:30
ADmad
5aa9c26fdf
Update doctypes to html5
2012-12-23 02:57:30 +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
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
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
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +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
ADmad
4e1a2670da
Updating outdated layout file in skeleton
2012-04-14 19:22:52 +05:30
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
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
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
mark_story
5cf5ee4410
Clarify which cache is using the indicated engine.
2012-02-04 10:42:48 -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
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
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
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
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
Juan Basso
acc0660989
Changed the emails folder in layouts to CamelCased. Fixes #1730 .
2011-05-24 01:05:29 -04:00
Jose Lorenzo Rodriguez
3b725290ba
Renaming elements and layouts
2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826
Renaming more folders
2011-05-13 02:31:33 -04:30
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30
Juan Basso
fac5ae50d0
Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415 .
2011-04-20 23:47:21 -04:00
Jose Lorenzo Rodriguez
6737380deb
Partial migration of folders to camelcase in app
2011-03-22 00:46:51 -04:30
