Mark Story
7fce97709a
Merge pull request #1516 from dmromanov/2.4-translations
...
Corrected translation string
2013-08-13 11:10:41 -07:00
mark_story
cb6ea82fea
Allow CakeEmail::template() to disable layout rendering.
...
Fix the code to act as documented. Sending template('view', null) should
disable layout rendering.
Fixes #3983
2013-08-13 14:01:33 -04:00
mark_story
3bdcf7b440
Use inner join instead of a left join.
...
In some database servers an INNER join performs better than a LEFT join.
Fixes #3979
2013-08-13 13:40:59 -04:00
dmromanov
64251b6bd6
Corrected translation string
2013-08-13 21:31:40 +04:00
k-halaburda
bb7ff48b01
Formatting issues
2013-08-13 14:03:20 +02:00
k-halaburda
8a8db72b7c
Formatting issues
2013-08-13 13:03:19 +02:00
k-halaburda
b5a8a6f946
Formatting issues
2013-08-13 13:02:33 +02:00
k-halaburda
1d9bce34d4
Formatting issues
2013-08-13 13:01:38 +02:00
k-halaburda
2235a0e677
Formatting issues
2013-08-13 13:00:12 +02:00
k-halaburda
50cf070727
Formatting issues
2013-08-13 12:59:30 +02:00
k-halaburda
a6efcae625
Deleted rows in ModelReadTest
2013-08-13 12:32:36 +02:00
euromark
759c24e660
correct doc blocks as per cs
2013-08-13 12:29:20 +02:00
fuga
245611424f
Apply ADmad's patch and update testConfig method according to a new specification.
2013-08-13 17:42:52 +09:00
k-halaburda
0c1dbded67
Added some test for related model afterFind callback
2013-08-13 10:19:48 +02:00
k-halaburda
bb13af683b
Added some test for related model afterFind callback
2013-08-13 10:19:20 +02:00
k-halaburda
83cca214a1
I'm a git noob ;/
2013-08-13 10:17:14 +02:00
Alexander Hofbauer
80e589f19d
Correctly encode confirm handlers
...
With encode set to false the onclick handler will be sent through
h() regardless, making links and postLinks work again.
2013-08-13 10:11:22 +02:00
k-halaburda
39b202a4a9
Added some tests to related models afterFind callback
2013-08-13 10:04:17 +02:00
k-halaburda
4c460c1c68
Some tabbing issues
2013-08-13 09:52:33 +02:00
k-halaburda
8e40a3a3d3
Added some tests for related models afterFind callback
2013-08-13 09:29:14 +02:00
mark_story
1c1701813b
Fix failing test from merge with 2.3
...
Fix a failed test from bad merge and remove nested conditions.
2013-08-12 14:47:43 -04:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
mark_story
6ce10b28c9
Update doc blocks.
2013-08-12 14:37:43 -04:00
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
Mark
37cefe9f4f
Merge pull request #1513 from dereuromark/2.4-return-early
...
2.4 return early
2013-08-12 10:27:50 -07:00
Frank de Graaf
a64c205c58
Merge pull request #1506 from oldskool/master
...
View file conventions. Fixes #3949 .
2013-08-12 10:20:46 -07:00
euromark
f3018cc532
refactor methods to avoid else block on returning early
2013-08-12 19:06:34 +02:00
Christian Winther
af1c2a1c51
Merge pull request #1511 from ankr/caketime_accuracy_about
...
Making CakeTime display 'about X ago' when time passed is lower than acc...
2013-08-12 09:23:46 -07:00
ankr
1cb41294b8
Making CakeTime display 'about X ago' when time passed is lower than accuracy
...
Removing unnecessary else
Also support 'about' times for future times
Make 'about' times translateable in all languages
2013-08-12 10:01:38 -04:00
euromark
7c856e6ab7
missing whitespace
2013-08-12 16:00:24 +02:00
Mark Story
ec8a3d531e
Merge pull request #1510 from dereuromark/2.4-controller-flash
...
2.4 controller flash
2013-08-12 06:50:54 -07:00
ADmad
b44e12b984
Merge pull request #1509 from ravage84/prepend-salt
...
Fixed statement about Security:hash's salt parameter
2013-08-12 04:48:54 -07:00
Marc Würth
7d4f229310
Fixed statement about Security:hash's salt parameter
...
Just nitpicking, but it prepends the salt, not appends it:
https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120
2013-08-12 12:52:34 +02:00
euromark
b09dc7213a
deprecate Controller::flash() and adjust some other deprecation messages.
2013-08-12 12:51:12 +02:00
fuga
303261e231
making the config method of email-transport-classes mergable into the current config value.
2013-08-12 10:28:17 +09:00
Jose Lorenzo Rodriguez
64b694011e
Update version number to 2.4.0-RC1
2013-08-12 00:42:55 +02:00
Jose Lorenzo Rodriguez
1bdcc58e31
Update version number to 2.3.9
2013-08-12 00:37:35 +02:00
José Lorenzo Rodríguez
789400ac44
Merge pull request #1409 from cdburgess/phone-validation-update
...
Phone validation update
2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez
890d4a9e2c
Merge pull request #1478 from aleho/2.4
...
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
José Lorenzo Rodríguez
3355544ab7
Merge pull request #1507 from ADmad/2.3-console-constants
...
Allow setting path constants in app/Console/cake.php as you can in webro...
2013-08-11 12:28:49 -07:00
ADmad
8150b89aba
Allow setting path constants in app/Console/cake.php as you can in webroot/index.php
2013-08-12 00:54:50 +05:30
José Lorenzo Rodríguez
42bb766d92
Merge pull request #1503 from tigrang/cake-response-multi-header
...
Cake response multi header. Fixes #3960
2013-08-11 12:19:26 -07:00
Mark Story
de479cfe8d
Merge pull request #1493 from dereuromark/2.4-cleanup
...
remove undocumented code and unnecessary in_array() checks + cleanup
2013-08-11 08:06:00 -07:00
Jan Dorsman
39a1d76d08
Updating some View files to follow convention
2013-08-11 11:46:35 +02:00
José Lorenzo Rodríguez
cdb05b8bbc
Merge pull request #1505 from jameswatts/feature/http-status-codes
...
Updated the handling of HTTP status codes in the response
2013-08-10 06:22:11 -07:00
James Watts
f76046625b
Updated doc block comment
2013-08-10 14:45:00 +02:00
James Watts
19afed0003
Updated unit test for HTTP status codes
2013-08-10 13:32:49 +02:00
James Watts
2ce2a2aaa9
Updated the handling of response status codes
...
Improved API integrity by blocking the ability to set invalid status codes according to the HTTP spec. This includes any non-numeric codes, or any code that is greater or less than 3 digits in length (100-999 being the accepted range).
2013-08-10 13:30:02 +02:00
Tigran Gabrielyan
f6e1c7ca3d
Improve code readability
2013-08-09 20:26:17 -07:00
