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
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
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
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
James Watts
19afed0003
Updated unit test for HTTP status codes
2013-08-10 13:32:49 +02:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
euromark
e7e5f46916
prevent rtrim to remove whitespace from test
2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
ADmad
faa4262969
Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
...
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783
Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
...
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Mark Story
054668f149
Merge pull request #1194 from dereuromark/2.4-file-improvements
...
Allow creating of missing tmp directories in debug (development) mode
2013-08-07 09:52:07 -07:00
euromark
f5859ca719
allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files
2013-08-07 13:24:45 +02:00
ADmad
339cd00fec
Merge pull request #1482 from ADmad/2.4-l10n
...
L10n cleanup
2013-08-07 00:42:09 -07:00
Mark Story
dc15c78710
Merge pull request #1483 from tigrang/debugger-fix
...
Added case for `unknown` type.
Fixes #3966
2013-08-06 19:39:13 -07:00
mark_story
9efad54e31
Fix missing expiry times on cookies.
...
When writing multiple cookies in a single request with the default
expiry time, cookies after the first should continue to have the default
expiry time used.
Fixes #3965
2013-08-06 22:01:13 -04:00
Juan Basso
330f8d168d
Merge pull request #1228 from jrbasso/2.4-router-parse
...
Supoprt query parameters on Router::parse.
2013-08-06 18:57:37 -07:00
Tigran Gabrielyan
2150e8dce5
Added case for unknown
type. Fixes #3966
2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52
Merge pull request #1426 from dereuromark/2.4-currency-fraction
...
Fix currency output for fraction values.
Fixes #1329
2013-08-06 18:19:01 -07:00
euromark
ad6fcd43d7
Fix currency output for fraction values using fractionExponent option.
2013-08-07 00:36:37 +02:00
ADmad
18cd3729e4
Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default.
...
Cleaned up L10n::_setLanguage(). Removed unused L10n::$found
2013-08-07 03:37:26 +05:30
Tigran Gabrielyan
34d848d0ca
Fixed order of assert params
2013-08-06 12:59:36 -07:00
U-Zyn Chua
3559aa35af
Removed a stray tab.
2013-08-06 17:13:53 +08:00
Tigran Gabrielyan
a6e3bb37a6
Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself
...
Added ability to send multiple values with the same type of header in CakeResponse
2013-08-06 01:35:45 -07:00
Alexander Hofbauer
8601e0078a
Implement a Helper method to generate confirm() links
...
This allows for overriding the default behavior of showing
confirm()-dialogs in Html and Form helpers.
2013-08-06 10:04:44 +02:00
José Lorenzo Rodríguez
a54c92fc0f
Merge pull request #1475 from cakephp/feature/2.4-mock-app-model
...
Make mocking random models easier
2013-08-05 00:22:53 -07:00
ADmad
04fb1eb614
Added more tests to db related tests group
2013-08-04 23:38:30 +05:30
ADmad
f68701d647
Created new test group for all db related tests
2013-08-04 21:23:45 +05:30
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
AD7six
ff856b7ebb
bark if the model doesn't exist
...
Getting the following warning:
ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments
Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
2013-08-03 16:00:34 +00:00
AD7six
35b4ac0286
make it possible to run this test on its own
...
Without setting up paths to the test_app - two of the tests will fail
Verify/demonstrate how to mock a model without a model existing
2013-08-03 16:00:04 +00:00
Juan Basso
cda1a1e6c9
Added test for relative path using app asset configuration
2013-08-03 11:04:52 -04:00
Juan Basso
db6d0a748b
Fix for relative protocol on assets
2013-08-03 10:36:19 -04:00
Juan Basso
316c6582ea
Fixed pathPrefix for css and script methods
2013-08-03 10:36:19 -04:00
Christian Winther
cd44c2afae
Merge pull request #1472 from ADmad/bugfix/3948
...
Fixed bug when using multi model fieldList and whitelists for all models...
2013-08-03 05:56:22 -07:00
Andy Dawson
f34388c53a
Merge pull request #1471 from cakephp/feature/2.4-pretty-print
...
pretty print json and xml responses in debug mode
2013-08-03 01:35:56 -07:00
euromark
a5531f7419
fix casing
2013-08-03 04:32:39 +02:00
euromark
6c1e60953b
fix cs
2013-08-03 03:02:52 +02:00
mark_story
b3860b3992
Fix clearing files in multiple groups.
...
When using multiple groups on a cache config, clearing was not working
properly. Clearing un-used cache configs also failed when the
directories did not exist.
Fixes #3930
2013-08-02 17:56:27 -04:00
ADmad
473e4f991f
Fixed bug when using multi model fieldList and whitelists for all models are not provided.
...
Fixes #3948
2013-08-03 02:49:41 +05:30
mark_story
8209a298f7
Make CakeRoute::persistParams() more tolerant
...
Subclasses and instances may not always define persist options.
CakeRoute should be accepting of these differences.
Fixes #3957
2013-08-02 13:28:58 -04:00
AD7six
1643e10c74
pretty print json and xml responses in debug mode
2013-08-02 15:17:24 +00:00
U-Zyn Chua
585ac157c0
CS fix.
2013-08-02 18:19:13 +08:00
Christian Winther
227f9aaa88
Merge pull request #1440 from Phally/master-postgres-fails
...
Adds order to the test models to make the results more predictable.
2013-08-01 02:38:33 -07:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
ADmad
b7cee8ff57
Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
...
Fixes #3874
2013-07-31 17:24:36 +05:30
Mark Story
4c7bc11a08
Merge pull request #1461 from thegallagher/master
...
Required fields not recognised by FormHelper when only using ModelValidator::add()
2013-07-29 18:33:28 -07:00