José Lorenzo Rodríguez
|
eedd823fd8
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-11-03 00:23:18 -04:30 |
|
mark_story
|
bff711e2dc
|
Merge branch '2.0-console' into 2.0
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
|
2010-11-02 23:49:19 -04:00 |
|
Juan Basso
|
b0a600f925
|
Merge branch '2.0-post-method' into 2.0
|
2010-11-03 01:42:06 -02:00 |
|
Juan Basso
|
adb2d90b9a
|
Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://"
|
2010-11-03 01:26:41 -02:00 |
|
mark_story
|
c9ca3c3785
|
Fixing path constants in DbConfig and FixtureTask to be more consistent between web and cli.
|
2010-11-02 23:25:36 -04:00 |
|
Juan Basso
|
b752766d6c
|
Using full base when $url is empty.
|
2010-11-03 01:16:38 -02:00 |
|
mark_story
|
6d54202c4c
|
Adding another group test case file for all the console tests at once.
|
2010-11-02 23:15:33 -04:00 |
|
mark_story
|
d1403b0da8
|
Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99.
Test cases updated. Fixes #1253
|
2010-11-02 21:56:24 -04:00 |
|
mark_story
|
2403d7fedc
|
Applying updates to skel/core.php. Fixes #1255
|
2010-11-02 21:43:33 -04:00 |
|
Nigel
|
3dc1f6edfa
|
Fixed the minutes into seconds for session timeout Fixes #1255
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-11-02 21:42:06 -04:00 |
|
Mark Story
|
e6aeae8935
|
Fixing issue where value in difference array was always the string value instead of the original value.
|
2010-10-31 22:44:45 -04:00 |
|
Mark Story
|
94f9f7afeb
|
Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest.
|
2010-10-31 22:42:16 -04:00 |
|
Mark Story
|
a3da915abd
|
Fixing issue where value in difference array was always the string value instead of the original value.
|
2010-10-31 22:41:33 -04:00 |
|
Mark Story
|
c2063f1229
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2010-10-31 21:58:38 -04:00 |
|
Mark Story
|
b67d3fac44
|
Updating FormHelper to fix failing test from merge.
|
2010-10-31 21:57:51 -04:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
Juan Basso
|
7f448a1d35
|
Allowed the use of empty() and isset() in Controllers aliases properties.
|
2010-10-31 22:02:26 -02:00 |
|
Mark Story
|
b86bec14b5
|
Removing dead code in EmailComponent.
Fixes #1248
|
2010-10-31 00:00:54 -04:00 |
|
Juan Basso
|
e380b76e16
|
Created an exception to error 405 (Method Not Allowed) and changed the delete action in bake to use it.
|
2010-10-30 23:13:54 -02:00 |
|
Juan Basso
|
4eed660a62
|
Changed the form style to not affect layout.
|
2010-10-30 22:39:31 -02:00 |
|
Juan Basso
|
a040c9a218
|
Changed the cake bake to use postLink for delete actions.
|
2010-10-30 21:58:42 -02:00 |
|
Mark Story
|
d5f582beee
|
Merge branch 'master' of http://github.com/kwiky/cakephp into kwicky
|
2010-10-30 00:29:21 -04:00 |
|
Mark Story
|
e9851a644b
|
Merge branch 'form-selected' into 2.0
|
2010-10-30 00:08:21 -04:00 |
|
Mark Story
|
3b5dafadc5
|
Adding value option documentation.
|
2010-10-29 23:56:22 -04:00 |
|
Robert Sworder
|
593c45b6e7
|
Whitespace changes
|
2010-10-29 23:43:50 -04:00 |
|
Robert Sworder
|
9eb533b9f6
|
dateTime functions + tests
|
2010-10-29 23:43:50 -04:00 |
|
Robert Sworder
|
a876c77987
|
meridian function
|
2010-10-29 23:43:50 -04:00 |
|
Robert Sworder
|
6d97aedd47
|
__selectOptions function
|
2010-10-29 23:43:50 -04:00 |
|
Robert Sworder
|
d3c1e8c974
|
minute function + tests
|
2010-10-29 23:43:49 -04:00 |
|
Robert Sworder
|
5f0700342b
|
hour function + tests
|
2010-10-29 23:43:49 -04:00 |
|
Robert Sworder
|
6620b3b8fc
|
month function + tests
|
2010-10-29 23:43:49 -04:00 |
|
Robert Sworder
|
529791842c
|
year function + tests
|
2010-10-29 23:43:49 -04:00 |
|
Robert Sworder
|
a1b1a07af2
|
__dateTimeSelected and day functions done, with tests
|
2010-10-29 23:43:48 -04:00 |
|
Robert Sworder
|
30f3494c98
|
Select function signature changed. Corresponding tests changed.
|
2010-10-29 23:43:48 -04:00 |
|
Robert Sworder
|
115c6102b9
|
Changes to make tests pass...
|
2010-10-29 23:43:48 -04:00 |
|
Juan Basso
|
5674ac4cf8
|
Added the require to dispatcher in skel to cake bake.
|
2010-10-30 01:29:26 -02:00 |
|
Juan Basso
|
2d9d4547f4
|
Importing File class, used by some methods.
|
2010-10-30 01:26:18 -02:00 |
|
Juan Basso
|
daa8d1fac2
|
Added a message to avoid the use of postLink and postButton in forms.
|
2010-10-30 00:32:14 -02:00 |
|
Mark Story
|
148870f492
|
Using a simple regexp instead of a strpos to ensure the protocol is at the beginning of the url.
|
2010-10-29 22:10:24 -04:00 |
|
Mark Story
|
3a95a546e8
|
Doing some code cleanup and moving conditionals around.
|
2010-10-29 21:45:09 -04:00 |
|
Mark Story
|
dbce29a058
|
Doing some refactoring, to reduce code duplication.
|
2010-10-29 21:37:03 -04:00 |
|
Mark Story
|
3ca0cdb1ee
|
Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created.
Tests added.
|
2010-10-29 21:33:56 -04:00 |
|
mark_story
|
14ec8703c1
|
Removing dirty hack in Router for detecting requestAction.
|
2010-10-29 11:16:50 -04:00 |
|
mark_story
|
fff8279c2b
|
Using patch from 'wals' to add generic exclude option to the ExtractTask. Allows you to exclude path segments from the generated PO files.
Fixes #1138
|
2010-10-29 00:40:04 -04:00 |
|
mark_story
|
086cf279ba
|
Applying doc block changes to app/config/core.php as well. Fixes #1138
|
2010-10-29 00:16:42 -04:00 |
|
mark_story
|
18bffe8600
|
Applying doc block changes from 'teknoid'. Fixes #1239
|
2010-10-29 00:15:48 -04:00 |
|
mark_story
|
f29bb562cb
|
Adding a test for saving blank fields on a model. Closes #1243.
|
2010-10-29 00:13:09 -04:00 |
|
mark_story
|
f5fd069583
|
Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
|
2010-10-27 23:03:31 -04:00 |
|
mark_story
|
16387f1961
|
Applying patch from 'Utoxin' that removes hardcoded 'app' string from Dispatcher. Fixes #1231
|
2010-10-27 22:42:12 -04:00 |
|
mark_story
|
d7847288e4
|
Adding Fennec as a built-in mobile browser.
Refactoring a test case to pull out the exceptional case.
Fixes #932
|
2010-10-27 22:32:15 -04:00 |
|