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
|
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
|
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 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|