Ceeram
|
c9528b8446
|
Merge branch '2.1' into 2.2
|
2012-03-21 11:19:08 +01:00 |
|
Ceeram
|
0a94202fb6
|
fixing test of previous commit
|
2012-03-21 11:07:51 +01:00 |
|
Ceeram
|
4dfbfe9c8b
|
fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array
|
2012-03-21 10:38:04 +01:00 |
|
mark_story
|
01e035f726
|
Move logic to afterDelete.
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.
Fixes #2699
|
2012-03-20 22:36:48 -04:00 |
|
Mark Story
|
3abb7d966b
|
Merge pull request #569 from tPl0ch/2.2-datasource-close
Adding basic implementation of DataSource::close().
|
2012-03-20 18:06:00 -07:00 |
|
Mark Story
|
57babc87b0
|
Merge pull request #570 from dogmatic69/2111
Add regex option to String::highlight()
Fixes #2111
|
2012-03-20 17:39:54 -07:00 |
|
Mark Story
|
d1cc29f412
|
Merge pull request #575 from shama/patch-controller
Remove unused code and correct doc for modelClass
|
2012-03-20 16:14:25 -07:00 |
|
Kyle Robinson Young
|
db9c3e5bf3
|
Remove unused code and correct doc for modelClass
|
2012-03-20 14:44:14 -07:00 |
|
Ceeram
|
247f5522c6
|
add test for saveAll deep
|
2012-03-20 20:41:41 +01:00 |
|
José Lorenzo Rodríguez
|
705679079d
|
Merge pull request #574 from tPl0ch/2.2-model-write-test
Fixed ModelWrite test case.
|
2012-03-20 07:53:13 -07:00 |
|
Thomas Ploch
|
8ad65366dc
|
Fixed ModelWrite test. Removed undefined method calls to assertCount().
|
2012-03-20 15:06:26 +01:00 |
|
mark_story
|
714ec60507
|
Fix a few more standards errors.
|
2012-03-19 21:58:56 -04:00 |
|
mark_story
|
edd54e4ddf
|
Ignore the remaining errors.
They are just part of the test to compare objects + arrays.
No need to cause standards errors.
|
2012-03-19 21:38:51 -04:00 |
|
Ceeram
|
091ad53b80
|
ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type
|
2012-03-19 13:27:26 +01:00 |
|
Ceeram
|
c38419e33a
|
Fixing test, some 5.2 installs do not have function to read mime
|
2012-03-19 09:52:09 +01:00 |
|
mark_story
|
94b3839b2e
|
Fix a few more small issues.
|
2012-03-18 23:25:19 -04:00 |
|
mark_story
|
12efa3eb70
|
Remove duplication in the I18n test.
|
2012-03-18 22:29:16 -04:00 |
|
mark_story
|
2bbf38038d
|
Remove duplicated code in testsuite shell.
|
2012-03-18 21:57:15 -04:00 |
|
mark_story
|
67698248ca
|
Fix some coding standards errors.
|
2012-03-18 21:48:50 -04:00 |
|
mark_story
|
c58b61c17b
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
|
2012-03-18 21:26:45 -04:00 |
|
mark_story
|
dbb2dd44d7
|
Fix more coding standards.
|
2012-03-18 21:20:33 -04:00 |
|
Ceeram
|
4191e2e573
|
adding test to disprove ticket, closes #2691
|
2012-03-19 01:27:35 +01:00 |
|
Ceeram
|
e8993b52ff
|
add .travis.yml file
|
2012-03-19 00:30:57 +01:00 |
|
Ceeram
|
f176ae60b5
|
add .travis.yml file
|
2012-03-19 00:30:03 +01:00 |
|
mark_story
|
e33dc98124
|
Fix more coding style errors.
|
2012-03-18 18:52:35 -04:00 |
|
mark_story
|
480c1bbb54
|
Fix coding standards.
|
2012-03-18 18:06:10 -04:00 |
|
mark_story
|
7798914676
|
Fix most code standards errors in Case/TestSuite.
|
2012-03-18 17:31:53 -04:00 |
|
mark_story
|
fc234d82f1
|
Fix coding standards in Case/Model/Behavior.
|
2012-03-18 14:31:13 -04:00 |
|
mark_story
|
346e048371
|
Fix coding standards in Datasource tests.
|
2012-03-18 13:08:27 -04:00 |
|
mark_story
|
6f8e7f1bc5
|
Revert "Fix coding standards errors."
This reverts commit 3362100512 .
|
2012-03-18 12:29:39 -04:00 |
|
mark_story
|
3362100512
|
Fix coding standards errors.
|
2012-03-18 12:20:24 -04:00 |
|
Mark Story
|
a9e41455d8
|
Merge pull request #571 from tPl0ch/2.2-testsuite-debug
Added 'Enable Debug Output' link to CakeHtmlReporter.
|
2012-03-18 04:59:33 -07:00 |
|
Thomas Ploch
|
b28b25f642
|
Added 'Fixed whitespace.
|
2012-03-18 11:12:19 +01:00 |
|
Thomas Ploch
|
7cfcef54ed
|
Added 'Enable Debug Output' link to CakeHtmlReporter.
|
2012-03-18 11:10:12 +01:00 |
|
ADmad
|
0832e18e9e
|
Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682
|
2012-03-18 14:05:41 +05:30 |
|
ADmad
|
bdddc85946
|
Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats.
|
2012-03-18 13:43:21 +05:30 |
|
mark_story
|
1e403c6a7f
|
Fix more coding standards issues.
|
2012-03-17 23:53:13 -04:00 |
|
mark_story
|
fab9547ac9
|
Fix coding standard issues with fixtures.
|
2012-03-17 23:31:17 -04:00 |
|
mark_story
|
c54ac257f1
|
Fix getCrumbs() with no crumbs and first link.
Apply patch from 'Andy Hobbs' to fix issues with breadcrumbs, and
a starting breadcrumb.
Fixes #2689
|
2012-03-17 23:23:42 -04:00 |
|
mark_story
|
d0733ceb00
|
Fix most coding standards in Case/Network
|
2012-03-16 22:19:01 -04:00 |
|
mark_story
|
544930f882
|
Skip validation when recovering trees.
Fixes #2663
|
2012-03-16 21:57:20 -04:00 |
|
mark_story
|
8fdd57568b
|
Make method protected.
API changes should be minimized in bug fix releases.
Fix broken builds.
|
2012-03-16 21:46:07 -04:00 |
|
mark_story
|
381e5b10bc
|
Add tests for GH-558
|
2012-03-16 21:05:06 -04:00 |
|
Mark Story
|
6e4456fbd7
|
Merge pull request #558 from stefanozoffoli/patch-3
Prevent blackhole auth error for multi fields.
Fields with .1.0 should not blackhole.
|
2012-03-16 18:04:49 -07:00 |
|
mark_story
|
111db16ca6
|
Restore error handlers.
When switching error handlers, remember to pop off the stack.
|
2012-03-16 20:56:24 -04:00 |
|
Mark Story
|
fd824c1da5
|
Merge pull request #561 from tPl0ch/2.1-configure-error
Fixed resetting of ErrorHandlers when custom error handlers are set in core.php
|
2012-03-16 17:46:39 -07:00 |
|
dogmatic69
|
d3a44811ce
|
adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible
|
2012-03-16 21:20:27 +00:00 |
|
Thomas Ploch
|
a06eba7e24
|
Adding basic implementation of DataSource::close().
Since this method will be called in Destructor.
|
2012-03-16 21:08:48 +01:00 |
|
José Lorenzo Rodríguez
|
47a2c22af4
|
Merge pull request #567 from suzuki/2.2-cakeemail
Add charset() / headerCharset() methods to CakeEmail class
|
2012-03-16 08:23:18 -07:00 |
|
Norio Suzuki
|
358b84b577
|
Add charset() / headerCharset() methods to CakeEmail class
|
2012-03-16 12:54:30 +00:00 |
|