 Jose Lorenzo Rodriguez
|
ef33e4e7da
Deriving the controller name out of the request object, if present
|
11 years ago |
|
Jose Lorenzo Rodriguez
|
53a081713d
Avoding if statements and using `=== null` as nano-optimization
|
11 years ago |
|
Jose Lorenzo Rodriguez
|
2a4b5ae06e
Moving viewPath setting code to setRequest()
|
11 years ago |
 Mark Story
|
d33c5e160d
Merge pull request #6408 from cakephp/master-time
|
11 years ago |
 Mark Scherer
|
41935cfbba
Simlify condition
|
11 years ago |
|
Mark Scherer
|
18c801d282
Add fix and tests for #6402
|
11 years ago |
|
José Lorenzo Rodríguez
|
f0f88bfdd9
Merge pull request #6405 from cakephp/issue-6271
|
11 years ago |
|
Mark Story
|
c5656c8dc9
Skip non array data in many() as well.
|
11 years ago |
|
Mark Story
|
29cfd3cb22
Don't marshall non-array data.
|
11 years ago |
|
Mark Story
|
11bc4bd688
Merge pull request #6403 from cakephp/fix-ssl-cert-file
|
11 years ago |
 Walther Lalk
|
093ab2ea5d
Correct path for cacert file
|
11 years ago |
|
Walther Lalk
|
7914ae1397
Test to fail if Cert file is unreadable
|
11 years ago |
|
Mark Story
|
acabf50ec9
Merge branch 'master' of github.com:cakephp/cakephp
|
11 years ago |
|
Mark Story
|
b0bf141260
Merge branch 'network-http-ssl' in to master
|
11 years ago |
|
Mark Story
|
476ac29702
Make SSL context fixes backwards compatible.
|
11 years ago |
|
Mark Story
|
e362481f80
Merge pull request #6391 from cakephp/issue-6387
|
11 years ago |
|
Mark Story
|
e98d0e19d8
Merge pull request #6389 from icaroscherma/patch-1
|
11 years ago |
|
Mark Story
|
c45abd4b1e
Merge pull request #6380 from cakephp/widgets
|
11 years ago |
|
Mark Story
|
958a720f0d
Merge pull request #6378 from cakephp/hotfix-ajax-redirecting
|
11 years ago |
|
Mark Scherer
|
f36cfc351e
Correct deprecation version.
|
11 years ago |
|
Mark Scherer
|
42d4f20a31
Remove unused var
|
11 years ago |
|
Mark Scherer
|
f576e68a57
Properly return the response object instead of dieing.
|
11 years ago |
 Eric GELOEN
|
f60632f569
[Network][Http] Fix ssl options
|
11 years ago |
 Ícaro R. Scherma
|
7c455ad837
Fixed space indents (Travis-CI warned me)
|
11 years ago |
|
Ícaro R. Scherma
|
aec7d189c2
Cloning $this instead of changing timezone directly
|
11 years ago |
|
Ícaro R. Scherma
|
f9a8a8923e
Merge pull request #1 from icaroscherma/patch-2
|
11 years ago |
|
Ícaro R. Scherma
|
fcf7408663
Update TimeTest.php, add testTimeAgoInWordsTimezone
|
11 years ago |
|
Mark Story
|
122d8e12de
Fix error when marshalling an existing association
|
11 years ago |
|
Ícaro R. Scherma
|
85dd5b4ac7
Update I18n/Time.php, fix timeAgoInWords(timezone)
|
11 years ago |
|
Mark Story
|
8a83521c46
Merge pull request #6382 from cakephp/hotfix-input-submit
|
11 years ago |
