Kyle Robinson Young
1312cdaedf
Remove extraneous space in .htaccess
2012-02-17 21:32:09 -08:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
Jose Lorenzo Rodriguez
a9c279aab0
Update version number to 2.1.0-RC
2012-02-20 18:10:22 -04:30
Jose Lorenzo Rodriguez
715c848577
Bringing theme code up to date with 2.0, cleaning logic a bit
2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
6918b70ec3
REmoving usage of deprecated ThemeView
2012-02-20 16:49:16 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b
Fixing a few failing test cases
2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4
Adding a simpler solution to the missing view files problem without altering the built paths in App
2012-02-20 15:39:03 -04:30
Jose Lorenzo Rodriguez
cec9d2e615
Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
...
This reverts commit 5c792aa831
2012-02-20 15:21:03 -04:30
Ceeram
ee54daef35
AclNode now throws exception instead of trigger_error
2012-02-20 15:41:57 +01:00
Mark Story
9e8152f949
Merge pull request #417 from 0x20h/php-acl
...
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
Christopher Vrooman
585f1e2c31
Minor changes to two error messages.
2012-02-19 14:47:49 -02:00
mark_story
943d928084
Merge branch '2.0' into 2.1
2012-02-18 22:19:38 -05:00
mark_story
89df484fc5
Remove un-necessary Set::merge().
...
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.
Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
2ddc3873c2
Update the Set::merge() documentation.
2012-02-18 16:01:07 -05:00
mark_story
20229eeb43
Merge branch '2.0' into 2.1
2012-02-18 11:22:18 -05:00
mark_story
fce70df6ff
Fix failing tests.
...
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -05:00
teddy
0ea00c5f07
urldecode $this->url before unsetting it from CakeRequest->query
2012-02-18 11:03:36 -05:00
teddy
e6905b44c3
urldecode custom route element values
2012-02-18 10:59:46 -05:00
mark_story
2f51ef00ed
Add failing tests for patches from 'teddyzeenny'.
2012-02-18 10:53:47 -05:00
mark_story
2097d5a968
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:10:14 -05:00
mark_story
89b9bb7297
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00
Mark Story
60df31cfb6
Merge pull request #487 from dogmatic69/2.1
...
2.1
2012-02-17 17:38:03 -08:00
euromark
77624552eb
added missing assertText methods to assert cross OS
2012-02-17 23:36:57 +01:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
Majna
c40d132f81
Fix Folder::tree() when excluding dot files or folders.
...
When 'exclude' param is array('.') files/folders are not skipped. Added test.
2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942
fixing up the docs for Collection::attached(), was showing behaviors but is for all collections
2012-02-17 13:25:37 +00:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
Kyle Robinson Young
0c27a26cb8
Use ComponentCollection and AclComponent on DbAclTest to avoid error
2012-02-16 22:57:31 -08:00
Kyle Robinson Young
75882507bc
Remove unnecessary loadFixtures() calls
2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637
Cleaning up ModelCrossSchemaHabtm test case
2012-02-16 22:25:53 -08:00
Kyle Robinson Young
2d43f1873c
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-16 21:45:37 -08:00
Kyle Robinson Young
4141a3ab5b
Load specific test plugins rather than all to avoid conflicts
2012-02-16 20:03:44 -08:00
Tigran Gabrielyan
af2fd03590
Added startText feature to HtmlHelper::getCrumbList()
2012-02-16 19:17:43 -08:00
mark_story
14228fa469
Fix more tests to use assertTextEquals()
...
Refs #2148
2012-02-16 21:51:56 -05:00
euromark
2afece41a0
email component osFix removal due to new assertTextEquals
2012-02-16 21:34:43 -05:00
mark_story
6412797dfc
Add missing static.
2012-02-16 20:58:43 -05:00
Kyle Robinson Young
9fdc17eb1f
Fix failing AuthComponent test
2012-02-16 15:58:42 -08:00
Majna
d41e5621b7
Fix missing and invalid assertions in tests.
...
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
dogmatic69
3246cf7c1e
adding the model alias so that there are no issues when the find has a join on it
2012-02-16 16:22:45 +00:00
ADmad
5c792aa831
Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit.
2012-02-16 18:15:12 +05:30
Mark Story
df0d1d681f
Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878
...
Option 'currentClass' always defaults to 'current'.
2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7
Option 'currentClass' always defaults to 'current'.
2012-02-16 00:11:43 -03:00
ADmad
bda05293d7
Fixed failing test cases
2012-02-16 02:22:20 +05:30
ADmad
c7cfd45884
Syncing bake skeleton with app
2012-02-16 01:58:11 +05:30
ADmad
90f4c03627
Moving view files from core to app
2012-02-16 01:58:11 +05:30
mark_story
6fda055a1e
Move initialize logic to __construct().
...
Fixes #2582
2012-02-15 14:15:44 -05:00
ADmad
55f63bbd5b
Fixing error message. Closes #2579
2012-02-15 12:41:01 +05:30
mark_story
27367b491a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Rachman Chavik
89d4b58073
fix indentation and add __construct() docblocks
2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04
rename protected variable to $_engine
2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c
adding tests for engine overrides
2012-02-14 23:28:57 +07:00
AD7six
369d316835
Restructure internals of Extract task
...
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
2012-02-14 15:30:09 +01:00
Vinícius Krolow
07adcfe2f7
fixing regex of autoLinks to work with urls that have www
2012-02-14 11:08:37 -02:00
Rachman Chavik
d6fd051fb4
changing methods in CakeTime class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4
changing methods in CakeNumber class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445
changing methods in String class to static
2012-02-14 09:34:36 +07:00
mark_story
25ee90ace4
Fix failing tests.
2012-02-13 21:28:07 -05:00
mark_story
76711c9f71
Add missing rawurlencode()
...
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.
Fixes #2572
2012-02-13 21:16:57 -05:00
mark_story
afecb713ab
Make button type nullable.
...
Fixes #GH365
2012-02-13 21:00:57 -05:00
Thomas Ploch
1a07f55d43
Renamed parameter to CakeResponse::cookie() to match cakephp standard naming.
2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response
2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4cfc033387
Fixing failing test cases
2012-02-13 00:26:10 -04:30
Jose Lorenzo Rodriguez
4f176d4284
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-02-12 21:04:35 -04:30
Ceeram
bc07ba3839
Added option['deep'] to saveAll, to save unlimited levels associated data
...
Squashed commit of the following:
commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 22:29:33 2012 +0100
update docblocks for deep save
commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff12afb05b95aa7e34f1be12
2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701
Updating docblock
2012-02-12 22:11:55 +05:30
mark_story
ad09b910ee
Remove pointless comparison.
2012-02-12 10:09:25 -05:00
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
ab09229d40
Update API docs
...
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
4c01ba7224
Add ics mime type.
...
Fixes #2565
2012-02-11 11:39:24 -05:00
mark_story
7e17da0ae8
Fix notice error when reading empty values.
...
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.
Fixes #2537
2012-02-11 11:33:04 -05:00
mark_story
6f914174a6
Fix issues with double / & leading/trailing /
...
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated. This also allows settings[actionPath] to be
permissive in what it accepts.
Fixes #2563
2012-02-11 10:29:18 -05:00
mark_story
0207a61e9b
Move alias wrapping into _formatAddress()
...
Fixes #2502
2012-02-11 10:16:08 -05:00
ADmad
e1dba6798f
Added missing echos
2012-02-11 13:53:46 +05:30
Kyle Robinson Young
730ac10ae4
Add missing options to NumberHelper docblocks
2012-02-10 22:17:58 -08:00
ADmad
83e8d436f8
Fixing docbloc and adding tests for FormHelper::tagIsInvalid(). Refs #2562
2012-02-11 06:09:58 +05:30
Mark Story
6502ab8f39
Merge pull request #473 from majna/2.1-cache-clear
...
Fix Cache::clear() calls in tests.
2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138
Adding order on created to the find, avoid failing test by incorrect order in postgres
2012-02-10 23:51:41 +01:00
Ceeram
2897c72215
AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
...
Conflicts:
lib/Cake/Model/AclNode.php
lib/Cake/Model/Aco.php
lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
Majna
42cbb8cafe
Fix Cache::clear() calls in tests.
2012-02-10 20:38:41 +01:00
Ceeram
7e5ef1dc0d
avoid failing tests by 1 second diff
2012-02-10 19:53:04 +01:00
mark_story
9c1fa28d60
Its EXECUTE not EXECUCUTE
...
Also make the search insensitive as casing bugs are no fun.
2012-02-10 12:43:07 -05:00
Ceeram
f8fef907c8
avoid failing tests by 1 second off
2012-02-10 18:29:25 +01:00
Ceeram
028ba27522
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-02-10 17:26:16 +01:00
Ceeram
97f48dcdb3
fix failing test, caused by postgres ordering
2012-02-10 17:26:05 +01:00
Rachman Chavik
9b62e7ddab
changing test order
...
L10nTest defines DEFAULT_LANGUAGE causing CakeTimeTest to fail
2012-02-10 22:26:00 +07:00
Rachman Chavik
b4f51df491
recreating TimeHelperTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
fbd3f87be6
recreating TextHelperTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
8074959637
moving TimeHelperTest to CakeTimeTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
4574dbc273
fix failing test
2012-02-10 22:26:00 +07:00
Rachman Chavik
59342e0524
moving methods from TextHelperTest to StringTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
ef73fff6be
adding NumberHelperTest
2012-02-10 22:25:59 +07:00
Rachman Chavik
cd7a8452a2
renaming NumberHelperTest to CakeNumberTest
2012-02-10 22:25:59 +07:00
Jose Lorenzo Rodriguez
fd17e33e78
Making CakeNumber::addFormat static so it is easier to configure globally for the app
2012-02-10 22:25:59 +07:00
Rachman Chavik
2dc9986fad
moving methods from TextHelper to String
2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8
moving NumberHelper to CakeNumber
2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126
moving TimeHelper to CakeTime
2012-02-10 22:25:59 +07:00
ADmad
e2b273e891
Renaming option type to tag to avoid potential conflict in future with html attribute.
2012-02-10 19:44:55 +05:30
ADmad
7a42290021
$options param in Helper::assetUrl() now defaults to empty array.
2012-02-10 19:05:15 +05:30
ADmad
be694d8d6b
Allowed specifying media path using 'src' attribute
2012-02-10 13:06:55 +05:30
mark_story
0cfec525b2
Allow SqlServer to execute procs correctly.
...
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.
Fixes #2558
2012-02-09 22:27:30 -05:00
