Commit graph

15472 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
abe6511d78 Merge pull request #1169 from ADmad/2.4-auth-take-2
Implemented stateless login for Auth
2013-03-13 14:22:18 -07:00
Ceeram
dde0912d1e Throw exceptions only when datasource has wrong package, not check for instance of Datasource 2013-03-13 17:56:51 +01:00
pjskeptic
8ad9492114 Merge branch 'master' of github.com:psparrow/cakephp 2013-03-13 12:18:47 -04:00
pjskeptic
9b9cf3d165 Fixed code formatting. 2013-03-13 12:18:32 -04:00
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01:00
pjskeptic
1d7b797cd2 Merge branch 'master' of github.com:psparrow/cakephp
Conflicts:
	lib/Cake/Test/Case/TestSuite/CakeTestSuiteDispatcherTest.php
2013-03-13 10:15:40 -04:00
pjskeptic
294dff7a26 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-13 10:13:48 -04:00
Ceeram
2f79894852 improve docblock with possible values and default 2013-03-13 14:07:47 +01:00
José Lorenzo Rodríguez
b5bac5b80f Merge pull request #1175 from ceeram/2.4-xml-formatoutput
Add formatoutput option to Xml::fromArray
2013-03-13 05:42:54 -07:00
Ceeram
fc34d9fe7f Add formatoutput option to Xml::fromArray 2013-03-13 13:07:36 +01:00
pjskeptic
b17d8c9124 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-12 23:34:30 -04:00
pjskeptic
5038e7eb38 Fixed PHPUnit include bug.
Fixed vendor include path bug.
2013-03-12 22:02:55 -04:00
mark_story
3d4ebc038c Throw exceptions when non Datasource classes are used as Datasources.
Using models as datasources can cause segmentation faults. Guard against
that by checking types and raising exceptions early.

Fixes #3694
2013-03-12 21:59:45 -04:00
Rémi Dewitte
0875b84fa6 sprintf arguments mixed up 2013-03-12 17:29:26 +01:00
Ceeram
d986953449 add CONTRIBUTING.md 2013-03-12 14:57:42 +01:00
mark_story
026df62a1f Merge branch 'master' into 2.4 2013-03-12 09:41:37 -04:00
mark_story
73310f9bfd Fix dropTables being ignore in some cases.
When autoFixtures = false & dropTables = false, individually loaded
fixtures should not be dropped.

Fixes #3691
2013-03-12 09:34:20 -04:00
mark_story
f1da6b4cbc Disable the cache when running schema commands.
This prevents stale cached schema definitions from preventing updates.

Fixes #3690
2013-03-11 13:10:14 -04:00
euromark
ab1f81b9a6 Add missing App::uses to prevent fatal error 2013-03-11 12:59:44 +01:00
euromark
f633241775 fix spacing error 2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6 fix coding standards 2013-03-10 18:11:50 +01:00
ADmad
b7834a2b16 Implemented stateless login for Auth 2013-03-10 00:11:35 +05:30
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Mark Story
5f64b6c1cb Merge pull request #1172 from remidewitte/feature/datasource-settings
Add settings array to connection parameters that executes SET statements once connected
2013-03-09 09:35:59 -08:00
mark_story
0ba1aa6d38 Close the session out before erasing all the fixtures.
Not closing the session before closing fixtures results in fatal errors
when using database sessions.

Fixes #3683
2013-03-08 20:55:44 -05:00
Rémi Dewitte
a8f9cf787b $result instead of $r 2013-03-08 15:54:41 +01:00
Rémi Dewitte
5b5180f661 code style in FileLog and FileLogTest 2013-03-08 09:32:46 +01:00
Rémi Dewitte
ab510d1700 Add settings array to connection parameters that executes SET statements once connected 2013-03-07 23:45:42 +01:00
Rémi Dewitte
278700677a Add mask setting to FileLog 2013-03-07 21:40:06 +01:00
Mark
b105318bcc Merge pull request #1148 from dereuromark/2.4-currency
Top 6 world currencies - UTF-8
2013-03-06 15:29:59 -08:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
mark_story
3b7b322d41 Update API links. 2013-03-05 20:58:03 -05:00
Mark Story
69f416da1e Merge pull request #1165 from cakephp/master-year-range
Fix FormHelper year range for ranges outside of 1901-2038
2013-03-05 17:36:47 -08:00
euromark
a07c9f0c3c Fix FormHelper year range for ranges outside of 1901-2038 2013-03-05 22:11:23 +01:00
ADmad
028a0bc22b Merge pull request #1168 from ataylor32/fix-typos
Fix typos
2013-03-04 23:09:16 -08:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
mark_story
cfc10a7c68 Fix failing test and unskip tests in SchemaShell::create()
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
2013-03-04 22:37:48 -05:00
mark_story
4a0df83783 Fix failing tests.
When the app did not have the correct models, tests would fail.
2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Mark Story
c62c92c877 Merge pull request #1167 from aleho/2.4
SchemaShell: Implement "exclude" parameter

Fixes #3652
2013-03-04 18:15:05 -08:00
Alexander Hofbauer
c920209f58 SchemaShell: Implement "exclude" parameter
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652.
2013-03-04 22:37:44 +01:00
ceeram
6d821e8891 Merge pull request #1166 from ceeram/2.3-3442
add CAKE to the paths after handling parameters that depend on _isExtrac...
2013-03-04 06:39:50 -08:00
Ceeram
e2ebeefda0 add CAKE to the paths after handling parameters that depend on _isExtractingApp() return value, fixes LH-3442 2013-03-04 14:49:01 +01:00
mark_story
e3b870dbf7 Fix notice error for fixtures with imported tables.
Don't emit an error when a fixture has an imported table with no primary.

Fixes #3659
2013-03-03 20:59:09 -05:00
José Lorenzo Rodríguez
c1c9a9dfc4 Merge pull request #1164 from Phally/api-configure-read
Documentation link API for Configure::read()
2013-03-03 11:18:55 -08:00
Phally
83f6161d1d Fixes API parse error for link to Configure::read() in the book. 2013-03-03 20:10:09 +01:00
mark_story
48149cbb32 Update version number to 2.3.1 2013-03-02 22:23:11 -05:00
mark_story
9cffb0b4c1 Merge branch 'email-scope' into 2.4
Merge of GH-1137 into 2.4
2013-03-01 22:34:23 -05:00
mark_story
47526e8b4d Refactor code to not use extract()/compact() 2013-03-01 22:34:00 -05:00
Jad Bitar
8eb5ce410a Add scopes to Object::log() signature. 2013-03-01 22:25:10 -05:00