Jorge González
|
7418be04d3
|
fixing translation domain to cake_dev
|
2012-07-25 19:20:30 +01:00 |
|
mark_story
|
7d74f3e598
|
Increase context depth in error messages.
Fixes #3063
|
2012-07-24 23:39:48 -04:00 |
|
mark_story
|
70c714d600
|
Fix incorrect context being used for excerpt.
Fixes #3064
|
2012-07-24 23:37:37 -04:00 |
|
Mark Story
|
88c3a047ea
|
Merge pull request #735 from dereuromark/2.3-doctype-unified
2.3 doctype unified
|
2012-07-24 09:40:42 -07:00 |
|
euromark
|
2a553dcfd1
|
unified doctype for browser related layout templates
|
2012-07-24 18:06:39 +02:00 |
|
Jorge González
|
f9f380d401
|
using annotations for catching exceptions in tests
|
2012-07-24 14:09:48 +01:00 |
|
Jorge González
|
d7f93f5bcf
|
adding a related message to the enableCrypto InvalidArgumentException
|
2012-07-24 14:08:54 +01:00 |
|
mark_story
|
162d3bcb29
|
Fix whitespace errors.
|
2012-07-23 22:44:05 -04:00 |
|
mark_story
|
66b296527f
|
Add type check to prevent errors related to Hash::get()
Fixes #3041
|
2012-07-23 22:33:58 -04:00 |
|
David Thalmann
|
f926ae7637
|
Clean up string concatenations and refactored some reused strings into variables.
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-07-23 22:30:28 -04:00 |
|
mark_story
|
35bf3097cd
|
Fixing missing imports in generated tests.
Fixes #3059
|
2012-07-23 21:25:55 -04:00 |
|
Jorge González
|
17db6f9d23
|
Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls
|
2012-07-23 22:24:10 +01:00 |
|
mark_story
|
2359fb7e2e
|
Simplify number formatting.
|
2012-07-22 21:28:49 -04:00 |
|
Heath Nail
|
434d3a7137
|
Add bcrypt support to Security::hash()
|
2012-07-22 21:15:00 -04:00 |
|
mark_story
|
ed19821168
|
Merge branch 'master' into 2.3
|
2012-07-22 21:01:28 -04:00 |
|
mark_story
|
e6ef218600
|
Fix associated translations being inserted.
Due to changes introduced in [1c0b6c076a]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
|
2012-07-22 20:59:24 -04:00 |
|
euromark
|
15cf55d444
|
different approach on the failing test
|
2012-07-22 03:59:59 +02:00 |
|
euromark
|
93957bc3e4
|
fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself
|
2012-07-22 03:55:13 +02:00 |
|
Mark Story
|
f77bebcc38
|
Merge pull request #730 from dereuromark/2.3-missing-app-uses
another correction for app uses
|
2012-07-21 18:50:52 -07:00 |
|
euromark
|
93eb8c2c58
|
another correction for app uses
|
2012-07-22 03:38:39 +02:00 |
|
mark_story
|
71507796c7
|
Add docs.
|
2012-07-21 21:35:45 -04:00 |
|
mark_story
|
6ce4a3a1ec
|
Add tests for contentDisposition flag.
Fixes #3042
|
2012-07-21 21:22:04 -04:00 |
|
Joey Jan
|
9deb966657
|
Add ability to disable content-disposition for email attachments.
This solves issues with outlook and text/calendar attachments.
Refs #3042
|
2012-07-21 21:01:45 -04:00 |
|
mark_story
|
468302b526
|
Merge branch 'master' into 2.3
|
2012-07-21 20:59:56 -04:00 |
|
mark_story
|
6286b43329
|
Make tests pass on windows.
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.
Refs #3055
|
2012-07-21 20:59:05 -04:00 |
|
mark_story
|
a27e171f0f
|
Invert default log configuration.
Windows only has 4 log levels instead of 8. This causes notice errors
when trying to use 'alert' and a few other levels.
Fixes #3055
|
2012-07-21 20:42:46 -04:00 |
|
mark_story
|
ab6fab6675
|
Add missing import.
|
2012-07-21 20:42:46 -04:00 |
|
David Thalmann
|
78de6e276a
|
Removed inline method calls in curly braced string concat's.
|
2012-07-22 03:40:49 +03:00 |
|
Mark Story
|
afab9f1e06
|
Merge pull request #727 from dereuromark/2.3-missing-app-uses-fix
correcting previously added app uses statements
|
2012-07-21 14:00:13 -07:00 |
|
Jorge González
|
f1250a3609
|
Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls
|
2012-07-21 20:49:46 +01:00 |
|
Jorge González
|
55c92065c6
|
adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010
|
2012-07-21 20:28:38 +01:00 |
|
David Thalmann
|
d9b5ec1a3a
|
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
|
2012-07-21 22:07:51 +03:00 |
|
euromark
|
01f1b0dadc
|
correcting previously added app uses statements
|
2012-07-21 20:29:49 +02:00 |
|
mark_story
|
2e71ef8f26
|
Add CakeSession Fixture
CakePHP should provide a fixture for the default session table name so
developers don't need to add the same fixture to each application.
Fixes #3054
|
2012-07-21 14:08:10 -04:00 |
|
Mark Story
|
f858ea3007
|
Merge pull request #726 from dereuromark/2.3-html-reporter-fix
only try to get comparison failure for the appropriate object
|
2012-07-21 07:02:34 -07:00 |
|
Mark Story
|
5019fa2276
|
Merge pull request #725 from dereuromark/2.3-missing-app-uses
2.3 missing app uses
|
2012-07-21 07:00:56 -07:00 |
|
euromark
|
6557e3bafe
|
only try to get comparison failure for the appropriate object
|
2012-07-21 15:23:54 +02:00 |
|
Jorge González
|
27a895d7d8
|
adding enableCrypto() method to CakeSocket class
|
2012-07-21 14:23:47 +01:00 |
|
euromark
|
4fe1ab1bf6
|
missing app uses statements
|
2012-07-21 13:34:33 +02:00 |
|
Simon East
|
1ea457e40e
|
Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9
|
2012-07-20 12:48:57 +10:00 |
|
José Lorenzo Rodríguez
|
a7865b5d1d
|
Removing some new by reference calls
|
2012-07-19 14:24:12 -05:30 |
|
José Lorenzo Rodríguez
|
2ccbf7819b
|
Merge pull request #723 from Jippi/improve-custom-pagination
Better custom find for pagination
|
2012-07-19 12:46:22 -07:00 |
|
Mark Story
|
f65b52bf11
|
Merge pull request #722 from uzyn/bugfix/url-validation
Fix URL validation to allow underscores in subdomain.
|
2012-07-19 12:40:30 -07:00 |
|
AD7six
|
c41ee9a5aa
|
remove debug statement that slipped through
Thanks to @jippi for pointing out this error, which originally came from
a diff provided by.. @jippi
|
2012-07-19 16:05:24 +02:00 |
|
Christian Winther
|
bce82a2322
|
Better custom find for pagination
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
|
2012-07-19 15:57:51 +02:00 |
|
U-Zyn Chua
|
e7c4064a69
|
Fix URL validation to allow underscores in subdomain.
|
2012-07-19 20:51:33 +08:00 |
|
mark_story
|
473d55f091
|
Allow 1 second of slip.
|
2012-07-18 22:22:57 -04:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
mark_story
|
7979ee5fa0
|
Remove test that is no longer needed for validation.
|
2012-07-17 23:18:25 -04:00 |
|
Mark Story
|
83cef3ef9a
|
Merge pull request #718 from dereuromark/2.3-fix-validation-error-message
2.3 fix validation error message
|
2012-07-17 19:57:16 -07:00 |
|