mark_story
|
929bb5769e
|
Merge branch '1.3' into 2.0
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
|
2010-06-26 12:29:20 -04:00 |
|
Juan Basso
|
a94b9ee95b
|
Update various links. Closes #392
|
2010-05-18 22:15:13 -03:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
Mark Story
|
9ae8b737dc
|
Trimming trailing whitespace.
|
2010-04-17 13:05:26 -04:00 |
|
José Lorenzo Rodríguez
|
0300fc1c31
|
If connection is aborted, now MediaView returns false after stopping the transfer
|
2010-04-13 16:55:22 -04:30 |
|
José Lorenzo Rodríguez
|
940ce8b06e
|
Adding some test coverage on MediaView.
Now MediaView does not exit after successful render, closes #569
|
2010-04-13 16:44:14 -04:30 |
|