ADmad
|
7ed90c72ae
|
Updating API docblock for Model::query()
|
2012-04-03 19:06:41 +05:30 |
|
mark_story
|
72cb96b727
|
Fix a few more coding standards errors.
|
2012-04-02 23:23:53 -04:00 |
|
mark_story
|
18296d2bf6
|
Fix a few coding standards errors.
|
2012-04-02 23:19:05 -04:00 |
|
Ceeram
|
34a730dfd8
|
ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709
|
2012-04-02 18:48:02 +02:00 |
|
mark_story
|
e5ca80b711
|
Add additional sort flag support.
Add natural, numeric, and string sorting to Hash.
Fixes #1700
|
2012-04-01 23:09:15 -04:00 |
|
mark_story
|
4e67698506
|
Fix issues with SQLServer + boolean columns.
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.
Fixes #2439
|
2012-04-01 22:10:05 -04:00 |
|
Mark Story
|
50de1289a9
|
Merge pull request #592 from suzuki/2.2-cakeemail
Fixed CakeEmail::reset, no initialize charset and headerCharset
|
2012-04-01 18:19:08 -07:00 |
|
Norio Suzuki
|
26b93afc3c
|
fixed CakeEmail::reset, no initialized charset and headerCharset property
|
2012-04-01 23:42:18 +00:00 |
|
mark_story
|
475a1596b7
|
Merge branch '2.1' into 2.2
|
2012-04-01 15:37:21 -04:00 |
|
mark_story
|
ee7a224639
|
Fix a code style warning.
|
2012-03-31 21:40:20 -04:00 |
|
mark_story
|
6677127c8e
|
Fix coding standard error.
|
2012-03-31 21:38:39 -04:00 |
|
mark_story
|
432d00de19
|
Another small optimization.
|
2012-03-31 21:37:10 -04:00 |
|
mark_story
|
7d098fa5f0
|
Some small performance optimizations.
|
2012-03-31 21:25:02 -04:00 |
|
mark_story
|
6a9fdd841a
|
Fix failing tests.
Set::merge() accepts anything even non-array values.
|
2012-03-31 13:38:09 -04:00 |
|
mark_story
|
990fbcdea0
|
Remove duplicated code backup.
This restoration/backup is done in the parent class.
|
2012-03-31 13:32:44 -04:00 |
|
Mark Story
|
54bfa4cc05
|
Merge pull request #587 from shama/patch-mb-number
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
|
2012-03-31 10:22:25 -07:00 |
|
mark_story
|
a463033ee9
|
Set -> Hash
|
2012-03-31 08:49:04 -04:00 |
|
ADmad
|
3495422ac5
|
Always use error layout when rendering error pages.
|
2012-03-31 12:42:17 +05:30 |
|
ADmad
|
04c30238cb
|
Merge pull request #585 from shama/patch-auth-redirect
Default to loginRedirect, if set, on authError in AuthComponent
|
2012-03-30 23:19:22 -07:00 |
|
ADmad
|
1763219053
|
Adding tests for getting session id when using DatabaseSession. Disproves #2734
|
2012-03-31 00:40:44 +05:30 |
|
Ceeram
|
65f25ed910
|
test added to show pagination conditions will not result in incorrect count, refs #2736
|
2012-03-30 19:06:01 +02:00 |
|
Ceeram
|
eba0b1f999
|
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
|
2012-03-28 22:34:31 +02:00 |
|
Ceeram
|
7df6477526
|
add test to prove #2723
|
2012-03-28 22:24:02 +02:00 |
|
José Lorenzo Rodríguez
|
c67feb0629
|
Merge pull request #589 from shama/patch-substr-optimizations
substr() optimizations throughout core
|
2012-03-28 13:23:16 -07:00 |
|
Kyle Robinson Young
|
e2a46f76c7
|
substr() optimizations
|
2012-03-28 13:07:26 -07:00 |
|
ADmad
|
47558e8db5
|
Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723
This reverts commit 96f73d6392, reversing
changes made to 9d017c2b5c.
Conflicts:
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
|
2012-03-29 01:33:21 +05:30 |
|
ADmad
|
349c1755d8
|
Merge pull request #588 from shama/patch-controller-optimization
Controller $name set optimization
|
2012-03-28 12:09:40 -07:00 |
|
Kyle Robinson Young
|
33ab634aba
|
Controller $name set optimization
|
2012-03-28 11:37:27 -07:00 |
|
Kyle Robinson Young
|
4370bf280a
|
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
Fixes #2602
|
2012-03-28 10:46:31 -07:00 |
|
Rachman Chavik
|
6fa30db504
|
CakeEmail can use theme when rendering template
|
2012-03-28 22:01:30 +07:00 |
|
Kyle Robinson Young
|
319d154aee
|
Default to loginRedirect, if set, on authError in AuthComponent
Implements #2390
Based on the patch written by @dereuromark
|
2012-03-27 22:51:47 -07:00 |
|
Kyle Robinson Young
|
c700fedbf8
|
Update test suite header version to 2.2
Conflicts:
lib/Cake/TestSuite/templates/header.php
|
2012-03-27 19:52:58 -04:00 |
|
Mark Story
|
0443fe1507
|
Merge pull request #584 from shama/patch-inpath-test
Add test/doc for reverse Folder::inPath()
|
2012-03-27 16:50:38 -07:00 |
|
Kyle Robinson Young
|
deb5a57cb9
|
Add test/doc for reverse Folder::inPath()
|
2012-03-27 11:55:13 -07:00 |
|
Jose Lorenzo Rodriguez
|
4f6f041730
|
Using same serialization strategy for request object in cached views, this prevents some failing tests in environments
with different charsets
|
2012-03-27 00:57:15 -04:30 |
|
mark_story
|
c1531d3faa
|
Fix a few small code standards issues.
|
2012-03-26 23:04:32 -04:00 |
|
mark_story
|
95d4549c9b
|
Docs + coding standards.
|
2012-03-26 22:57:50 -04:00 |
|
mark_story
|
c087576f20
|
Port changes done to Set into Hash
See #2722
|
2012-03-26 22:39:13 -04:00 |
|
mark_story
|
6e0e15682f
|
Remove duplication where possible.
|
2012-03-26 22:33:46 -04:00 |
|
mark_story
|
66eabe462a
|
Copy Set::expand into Hash class.
|
2012-03-26 22:32:58 -04:00 |
|
mark_story
|
c7a9f3412f
|
Add compatibility for 2.1.
Set always needs to be loaded, as that's how 2.1 worked.
|
2012-03-26 22:32:57 -04:00 |
|
mark_story
|
a76a926ac1
|
Fix more uses of Set -> Hash
|
2012-03-26 22:32:57 -04:00 |
|
mark_story
|
9015d78017
|
Port most recent changes in Set to Hash.
See [68eeee80d8] and
[af575027da]
|
2012-03-26 22:32:56 -04:00 |
|
mark_story
|
e55927c007
|
Update the doc links.
|
2012-03-26 22:32:56 -04:00 |
|
mark_story
|
ed32e0b39b
|
Update another usage.
|
2012-03-26 22:32:56 -04:00 |
|
mark_story
|
17bfbbb9df
|
Port over Set to Hash usage.
|
2012-03-26 22:32:55 -04:00 |
|
mark_story
|
0ef9adba93
|
Move and rename pushDiff onto Hash.
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
|
2012-03-26 22:32:54 -04:00 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04:00 |
|
mark_story
|
29048b3bb7
|
Update to use Hash.
Update CakeSession & Configure to use Hash.
|
2012-03-26 22:25:41 -04:00 |
|
mark_story
|
8becc4c985
|
Fix misnamed method calls.
|
2012-03-26 22:25:40 -04:00 |
|