Commit graph

15883 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
848a0ce217 Fiexed error in CakeSession that would call start() in an infinite loop
when the session is marked as invalid
2013-12-07 22:25:33 +01:00
José Lorenzo Rodríguez
06a89f128a Changing order of jpeg aliases so that mapType() returns the most common one 2013-09-28 14:24:13 +02:00
mark_story
e96fe515a1 Rename config class used in test cases.
Having a separate classname for testing allows the testsuite to not
provide a classname that the application would. This allows composer to
generate the correct classmap when CakePHP is installed with composer.

Fixes #4112
2013-09-27 22:22:23 -04:00
Mark Story
cd9b325bef Merge pull request #1690 from bcrowe/master
Updated additional references of Cake to CakePHP
2013-09-27 18:59:34 -07:00
Bryan Crowe
bb65765d70 Updated additional references of Cake to CakePHP 2013-09-27 21:31:35 -04:00
Frank de Graaf
3e8af8b180 Merge pull request #1689 from dereuromark/master-cakephp-name
Cake to CakePHP name
2013-09-27 12:16:25 -07:00
Frank de Graaf
ceb78fee9c Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect
Fixed infinite redirects when authenticated user tried to access login p...
2013-09-27 12:13:36 -07:00
euromark
9a86f7e883 correct spelling mistake 2013-09-27 20:28:03 +02:00
euromark
df269ba0ef Cake to CakePHP name 2013-09-27 19:36:43 +02:00
ADmad
4dbf9107a8 Fixed infinite redirects for authenticated users accessing login page. 2013-09-27 22:33:07 +05:30
Mark Story
355e2efbc6 Merge pull request #1685 from dereuromark/master-autolink
Test to prove that autoLink has issues with umlauts.
2013-09-27 06:53:38 -07:00
Mark Story
066e0b6677 Merge pull request #1684 from dereuromark/master-shell
Bugfix: Assert own tasks are loaded before trying to access taskNames.
2013-09-27 06:52:12 -07:00
euromark
bd87ef45f2 complete autoLinkEmail() 2013-09-27 15:01:46 +02:00
euromark
205f7a504b also fix autoLinkEmail() 2013-09-27 14:56:53 +02:00
Frank de Graaf
41a7739b69 Merge pull request #1686 from andydhobbs/ticket-4108
Fixes bad merge of #1683.

Refs #4108.
2013-09-27 05:53:10 -07:00
euromark
2a954b6095 Make TextHelper::autoLink() work properly with umlauts. 2013-09-27 14:48:57 +02:00
Andy Hobbs
56f1c9b8b5 Ticket 4108
- updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver
2013-09-27 13:03:32 +01:00
Renan Gonçalves
bd1c0b18ff Merge pull request #1679 from dereuromark/master-cleanup-tests
Don't use comp. wrappers anymore.
2013-09-27 04:10:39 -07:00
euromark
c23531e806 Assert own tasks are loaded before trying to access taskNames. 2013-09-27 12:53:18 +02:00
Mark Story
ad1b80645d Merge pull request #1683 from andydhobbs/ticket-4108
Fix fields cache to depend on the schemaName as well.

Fixes #4108
2013-09-26 07:04:55 -07:00
Andy Hobbs
0f7d6a90a1 Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
2013-09-26 11:56:14 +01:00
Renan Gonçalves
ad0944c491 Merge pull request #1681 from bcrowe/hotfix-camelcasejs
Updated JavaScript in doc blocks and helper references
2013-09-26 01:52:18 -07:00
Bryan Crowe
ab4bc16463 Updated Controller:: doc block and ControllerMergeVarsTest:: 2013-09-25 22:53:23 -04:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
euromark
0b45a2eca8 correct order of params 2013-09-25 22:07:52 +02:00
euromark
9844da8e99 Don't use comp. wrappers anymore. 2013-09-25 20:58:29 +02:00
Mark Story
1c148c28f0 Merge pull request #1677 from dereuromark/master-cleanup
App::import to App::uses
2013-09-25 11:40:17 -07:00
euromark
0ae69aace9 App::import to App::uses 2013-09-25 19:40:14 +02:00
Mark Story
bb4716a9ee Merge pull request #1675 from bar/patch-1
Wrong signature.
2013-09-25 06:37:39 -07:00
Renan Gonçalves
f7a7e27206 Merge pull request #1674 from dereuromark/master-disabled-radio
Resolves ticket #4100
2013-09-25 06:09:26 -07:00
ber clausen
39bc8dff97 Wrong signature. 2013-09-25 09:12:49 -03:00
euromark
2455af09c5 Resolves ticket #4100 2013-09-25 14:01:35 +02:00
Mark Story
c71392716b Merge pull request #1673 from bcrowe/hotfix-instanceof
Replaced all is_a() calls with instanceof operator
2013-09-24 20:05:29 -07:00
Bryan Crowe
3e05ab897c Missed a couple instanceOf asserations 2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b Replaced true asserations with instanceOf asserations in test cases 2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
Mark Story
b883202890 Merge pull request #1672 from dereuromark/master-instance
is_a() to instance of - completes PR 1669
2013-09-24 14:37:50 -07:00
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
Mark Story
af368132a5 Merge pull request #1669 from bcrowe/hotfix-instancecheck
Use instanceof instead of is_a() in Controller.php
2013-09-23 18:51:46 -07:00
Bryan Crowe
1393325ad1 Use instanceof instead of is_a() in Controller.php 2013-09-23 21:37:27 -04:00
Mark Story
5059274183 Merge pull request #1668 from bcrowe/hotfix-bootstrapdocblock
Updated doc block readability in bootstrap.php
2013-09-23 18:15:38 -07:00
Bryan Crowe
e00812d3f8 Updated doc block readability in bootstrap.php 2013-09-23 21:09:26 -04:00
mark_story
a30f861f2c Use array_key_exists instead of isset()
This allows contains() to work with null values.

Fixes #4083
2013-09-19 21:44:09 -04:00
Mark Story
68aefe7eda Merge pull request #1658 from dereuromark/master-tests
correct and simplify tests
2013-09-18 16:24:36 -07:00
euromark
f62f46562c add missing create() for creating a new record. 2013-09-19 00:23:56 +02:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
Mark Story
3e8db7e5f7 Merge pull request #1657 from ADmad/bugfix/tree
Fixed TreeBehavior::recover() when using scope. 

Fixes #4062.
2013-09-18 14:57:37 -07:00
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
Mark Story
e690c9340c Merge pull request #1656 from dereuromark/master-validation-rules-casing
Fix casing of validation rules in bake
2013-09-18 10:39:39 -07:00
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00