mark_story
|
554d5794ce
|
Merge branch 'master' into 2.3
|
2012-12-19 21:18:52 -05:00 |
|
mark_story
|
d70730d722
|
Fix issues with TreeBehavior and nested deletes.
Fixes #3481
|
2012-12-19 20:48:51 -05:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
ceeram
|
4611c987db
|
Merge pull request #959 from ceeram/phpcsw
Make phpcs pass
|
2012-11-19 15:10:47 -08:00 |
|
mark_story
|
a7f192c606
|
Merge branch 'master' into 2.3
|
2012-11-14 21:50:29 -05:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
euromark
|
b7e75a6399
|
more whitespace coding standards
|
2012-11-14 12:36:55 +01:00 |
|
euromark
|
354069d229
|
cascade false for recover
|
2012-11-13 21:12:46 +01:00 |
|
euromark
|
22f65f7cb5
|
asserting that tree behavior generates valid sql in recover
|
2012-11-13 11:18:17 +01:00 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
mark_story
|
1aea9ac0c9
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
|
2012-10-15 21:46:49 -04:00 |
|
ADmad
|
5de492fb25
|
Allow saving new records with pre specified primary key value with treebehavior.
|
2012-10-11 01:03:49 +05:30 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
dogmatic69
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
mark_story
|
e59555a66f
|
Merge branch 'master' into 2.3
|
2012-08-03 22:45:56 -04:00 |
|
David Thalmann
|
78de6e276a
|
Removed inline method calls in curly braced string concat's.
|
2012-07-22 03:40:49 +03: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 |
|
euromark
|
4fe1ab1bf6
|
missing app uses statements
|
2012-07-21 13:34:33 +02:00 |
|
mark_story
|
a63dd9ee9d
|
Fix incorrect formatting in TreeBehavior.
Fixes #3045
|
2012-07-17 21:06:41 -04:00 |
|
mark_story
|
a7c79e5da2
|
Fix warnings when deleting records that do not exist.
Fixes #3037
|
2012-07-14 15:54:07 -04:00 |
|
mark_story
|
55c4ad3c1c
|
Fix coding standards errors.
Also remove count() calls in TreeBehavior.
|
2012-05-31 21:20:11 -04:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
Jelle Henkens
|
dbd826f794
|
Removing extra space in the extract() calls
|
2012-05-13 10:37:50 +01:00 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04: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
|
544930f882
|
Skip validation when recovering trees.
Fixes #2663
|
2012-03-16 21:57:20 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
9a6ad7e1e2
|
Fixing most coding standard issues in Model/
|
2012-03-04 21:51:50 -05:00 |
|
euromark
|
45112088a1
|
type hinting models
|
2012-02-25 19:46:06 -05:00 |
|
dogmatic69
|
c02912261b
|
setting recursive to -1
|
2012-02-23 11:36:44 +00:00 |
|
dogmatic69
|
74a84c96f1
|
optimization of tree behavior as per ticket #2600
|
2012-02-23 00:56:20 +00:00 |
|
Majna
|
0cd9a93e9e
|
Remove unused variables and statements.
|
2012-02-17 21:10:43 +01:00 |
|
Ceeram
|
2a9e6771c3
|
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
|
2012-01-19 23:26:43 +01:00 |
|
ADmad
|
248a2d3f26
|
Adding missing Model::create() when using Model::save() in a loop. Fixing some code formatting. Fixes #848
|
2011-12-18 03:55:14 +05:30 |
|
Kyle Robinson Young
|
51f9837db4
|
Code standards formatting
|
2011-12-15 22:52:07 -08:00 |
|
Kyle Robinson Young
|
8197f87dbc
|
Spelling and grammar fixes
|
2011-12-01 21:58:09 -08:00 |
|
mark_story
|
992a1554e1
|
Fix incorrect alias/name usage.
Fixes #2317
|
2011-11-29 20:44:30 -05:00 |
|
Renan Gonçalves
|
229bf8e984
|
Keeping BC on short syntax for Acl and Tree behavior.
|
2011-10-16 12:06:41 +02:00 |
|
Renan Gonçalves
|
3a04bb4733
|
Dropping short syntax support for Behavior configuration.
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
|
2011-10-15 20:52:41 +02:00 |
|
Jose Lorenzo Rodriguez
|
d1a530f53b
|
Fixing all @link annotations in model class
|
2011-10-15 12:34:31 -04:30 |
|
Juan Basso
|
f5a54d00dd
|
Changed methods and attributes from private to protected.
|
2011-08-20 00:43:34 -04:00 |
|
Juan Basso
|
620a65b2fc
|
Merge branch '2.0' into 2.0-api-doc
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
|
2011-08-14 21:12:05 -04:00 |
|
Juan Basso
|
895c10af7b
|
Adjusted some types in @param, @return and @var.
|
2011-07-31 22:57:17 -04:00 |
|
Juan Basso
|
7604763888
|
Updated some file headers to include correct license and copyright.
|
2011-07-31 19:14:36 -04:00 |
|
ADmad
|
9577fb0ca2
|
Fixed TreeBehavior::childCount(). Closes #1833
|
2011-07-31 12:39:52 +05:30 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Juan Basso
|
39b4032820
|
Fixed some API doc in model.
|
2011-07-30 18:38:57 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
ADmad
|
4c042ae133
|
Adding proper visibility keywords for class functions
|
2011-05-29 03:31:34 +05:30 |
|
Jose Lorenzo Rodriguez
|
d83555cc52
|
Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
|
2011-05-04 01:10:23 -04:30 |
|
José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
07e43bb0f8
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
|
2010-12-15 01:13:05 -04:30 |
|
José Lorenzo Rodríguez
|
d311cf237b
|
Moving behaviors
|
2010-12-05 23:50:05 -04:30 |
|