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 |
|