mark_story
|
622e500943
|
Merge branch '1.3-router' into 1.3-misc
|
2009-09-27 16:20:22 -04:00 |
|
mark_story
|
76c1c1cb8e
|
Implementing Routing.prefixes.
Replaces Routing.admin and streamlines the use of Routing prefixes so they behave more consistently with admin routing.
|
2009-09-27 00:12:03 -04:00 |
|
mark_story
|
3e394f1fa8
|
Adding test cases for Routing.prefixes.
|
2009-09-26 22:48:57 -04:00 |
|
mark_story
|
3904c6f7b5
|
Adding constructor to Router.
Adding __setPrefixes to initialize prefixes and merge Routing.admin with new Routing.prefixes.
|
2009-09-26 22:37:19 -04:00 |
|
mark_story
|
2f46f39225
|
Removing subclassing of Object.
|
2009-09-26 22:24:24 -04:00 |
|
mark_story
|
cf849e3cf8
|
Removing svn tags.
|
2009-09-26 22:22:43 -04:00 |
|
mark_story
|
6dbb8f3994
|
Merge branch '1.3' into 1.3-misc
|
2009-09-26 21:18:15 -04:00 |
|
jperras
|
22721fcb8b
|
Replacing use of Configure::corePaths() with App::core() in Debugger.
|
2009-09-26 18:25:15 -04:00 |
|
jperras
|
9a2cd886fe
|
Fixing call-time pass by reference.
|
2009-09-26 17:08:01 -04:00 |
|
mark_story
|
bf551c2267
|
Merge branch '1.3-misc' into 1.3
|
2009-09-26 15:17:02 -04:00 |
|
jperras
|
03b1089f1d
|
Updating docs for Set library. Deprecating Set::isEqual().
|
2009-09-25 15:05:06 -04:00 |
|
jperras
|
f231b59cfb
|
Clarifying some Set documentation. Removing deprecated &get() method.
|
2009-09-25 14:31:05 -04:00 |
|
jperras
|
1a4f806bfd
|
Merge branch '1.3-misc' into 1.3-misc-set-apply
|
2009-09-25 14:20:28 -04:00 |
|
mark_story
|
daa97f702a
|
Fixing use of deprecated method.
|
2009-09-25 11:36:27 -04:00 |
|
jperras
|
f3d0769912
|
Renaming ConnectionManager::__getDriver() to ConnectionManager::__connectionData().
|
2009-09-25 11:08:41 -04:00 |
|
jperras
|
c2ec96067a
|
Refactoring ConnectionManager & tests.
|
2009-09-25 11:08:34 -04:00 |
|
jperras
|
7e5fe04a77
|
Merge branch '1.3-misc' into 1.3-misc-plugin-datasources
|
2009-09-24 23:14:12 -04:00 |
|
jperras
|
c3cd98af42
|
Implementing loading datasources from plugins.
|
2009-09-24 22:56:02 -04:00 |
|
jperras
|
11365e7a09
|
Fixing return by reference error on the use of ConnectionManager::getDataSource() on a non-existing datasource.
|
2009-09-24 19:29:35 -04:00 |
|
jperras
|
ffad7a74a2
|
Merge branch '1.3-misc-plugin-datasources' into 1.3-misc
|
2009-09-24 16:26:17 -04:00 |
|
jperras
|
ed74653d72
|
Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource().
|
2009-09-24 16:23:39 -04:00 |
|
mark_story
|
bf3fe1f4f6
|
Merge branch '1.3-timestamp' into 1.3-misc
|
2009-09-24 00:22:18 -04:00 |
|
mark_story
|
7f49f7f455
|
Updating HtmlHelper and JavascriptHelper to use Helper::assetTimestamp
|
2009-09-24 00:16:19 -04:00 |
|
mark_story
|
ee514f3fc6
|
Adding Helper::assetTimestamp()
Refactor's repeated code from Html and Javascript Helpers.
Test cases added.
|
2009-09-23 23:45:11 -04:00 |
|
mark_story
|
26d2237df0
|
Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
|
2009-09-23 23:30:55 -04:00 |
|
ADmad
|
de4737323f
|
Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-09-23 23:30:34 -04:00 |
|
jperras
|
b2eb1882a4
|
Adding convenience method Set::apply().
|
2009-09-23 21:03:09 -04:00 |
|
jperras
|
1ed4a63416
|
Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc
|
2009-09-22 22:49:23 -04:00 |
|
renan.saddam
|
42fac9ec71
|
Fixing Xml::toArray() when blank nodes are provided. Fixes #87.
|
2009-09-22 17:47:11 -03:00 |
|
jperras
|
2b0d13733e
|
Fixing parameter ordering error of array_map in AuthComponent::allow(). Adding test.
|
2009-09-21 12:14:20 -04:00 |
|
mark_story
|
42017e95c6
|
Merge branch '1.3-console' into 1.3
Conflicts:
cake/tests/cases/console/libs/schema.test.php
|
2009-09-20 19:05:03 -04:00 |
|
mark_story
|
50bd279018
|
Merge branch '1.3-auth' into 1.3
|
2009-09-20 17:53:23 -04:00 |
|
mark_story
|
e6cc81226d
|
Merge branch '1.3-jshelper' into 1.3
|
2009-09-20 17:46:30 -04:00 |
|
jperras
|
ca632461f1
|
Adding tilde (~) to accepted characters for URL validation. Fixes #52, and legacy trac enhancement 6213.
|
2009-09-19 12:14:47 -04:00 |
|
mark_story
|
d5376e64aa
|
Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261
|
2009-09-19 01:17:20 -04:00 |
|
mark_story
|
05f908d36d
|
Fixing failing tests in JsHelper caused by changed API in HtmlHelper.
|
2009-09-16 01:55:15 -04:00 |
|
mark_story
|
5717e3b59c
|
Merge branch '1.2' into 1.2-merger
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
|
2009-09-16 01:23:49 -04:00 |
|
mark_story
|
793c6ec07a
|
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
|
2009-09-15 22:00:49 -04:00 |
|
mark_story
|
2c633912e0
|
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
|
2009-09-15 22:00:04 -04:00 |
|
mark_story
|
f764c53c55
|
Removing Inflector's inheritance on Object, as it was unecessary.
Adding irregular waves => wave missed in merge from 1.2
|
2009-09-15 21:44:27 -04:00 |
|
mark_story
|
3ef53aa159
|
Applying optimization from 'wangbo' to View::renderCache(). Fixes #26
|
2009-09-14 23:56:50 -04:00 |
|
mark_story
|
f1194a4ec9
|
Commiting fix to pass tests in last commit.
Making View::renderCache tests more specific.
|
2009-09-14 23:53:04 -04:00 |
|
mark_story
|
01cf40bf12
|
Adding automatic use of $options for $disabledOptions in PaginatorHelper::next() and PaginatorHelper::prev(). Thanks to 'joaquin_win' for the initial patch. Refs #83
|
2009-09-14 23:06:24 -04:00 |
|
mark_story
|
4a6412fb27
|
Adding tests for AuthComponent::action().
Adding plugin support for AuthComponent in actions mode. Refs #33
|
2009-09-14 00:29:33 -04:00 |
|
mark_story
|
090eb27be1
|
Updating imports in AuthComponent and AuthComponent test case.
|
2009-09-13 23:42:25 -04:00 |
|
mark_story
|
326424592d
|
Merge branch '1.2' into 1.2-merger
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/libs/inflector.php
cake/libs/view/view.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
|
2009-09-13 13:52:58 -04:00 |
|
mark_story
|
76f6e3dd07
|
Merge branch '1.3-numberhelper' into 1.3-misc
|
2009-09-11 21:07:30 -04:00 |
|
Niles
|
20fa1c9693
|
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
|
2009-09-11 06:58:56 -04:00 |
|
Niles
|
b9970f7484
|
replace deprecated method calls.
|
2009-09-11 06:58:23 -04:00 |
|
mark_story
|
9c41efd6fe
|
Adding NumberHelper::addFormat and test cases. Refs #5630
|
2009-09-10 22:54:49 -04:00 |
|