mark_story
|
2e8498e166
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
|
2011-12-11 22:51:40 -05:00 |
|
mark_story
|
495b7f279f
|
Adding test for #2345
|
2011-12-06 21:06:45 -05:00 |
|
mark_story
|
6d269ce25d
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
|
2011-12-03 13:45:28 -05:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
mark_story
|
fa0ec44dfd
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
|
2011-11-16 21:31:16 -05:00 |
|
Kyle Robinson Young
|
99793fd654
|
Test case compatibility skipUnless() to markTestSkipped()
|
2011-11-16 21:07:09 -05:00 |
|
Kyle Robinson Young
|
c97dca1570
|
Test case compatibility assertIsA() to assertInstanceOf()
|
2011-11-16 21:07:08 -05:00 |
|
Kyle Robinson Young
|
98f03dc6df
|
Replacing test case compatibility functions
|
2011-11-16 21:07:08 -05:00 |
|
Renan Gonçalves aka renan.saddam
|
1db915faec
|
Merge pull request #314 from challet/HttpSocket_handle_redirect
move 'redirect' to request, and allow to use int values as ttl
|
2011-11-15 03:09:15 -08:00 |
|
Clément Hallet
|
ecb88791c8
|
move 'redirect' to request, and allow to use int values as ttl
|
2011-11-13 17:45:33 +01:00 |
|
José Lorenzo Rodríguez
|
497ada8895
|
Merge pull request #311 from challet/HttpSocket_handle_redirect
optionnaly handles redirect before return the response
|
2011-11-09 09:42:52 -08:00 |
|
Clément Hallet
|
62ae6d57e9
|
optionnaly handles redirect before return the response
|
2011-11-08 18:55:58 +01:00 |
|
Juan Basso
|
fcd96bcc60
|
Using native methods to query in HttpSocket.
|
2011-10-29 15:40:41 -04:00 |
|
Jelle Henkens
|
7ba2f90b2a
|
Refactoring expectError() calls to PHPUnit annotations
|
2011-09-13 19:56:37 +01: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 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|