Commit graph

14901 commits

Author SHA1 Message Date
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01: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
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
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
ab510d1700 Add settings array to connection parameters that executes SET statements once connected 2013-03-07 23:45:42 +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
Jad Bitar
f1b815a9bb Add scope to email logging. 2013-03-01 22:24:02 -05:00
Henrik Gemal
f46e00c7d9 Adding Kalaallisut locale
From pull request 1163

Fixes #3634

Signed-off-by: mark_story <mark@mark-story.com>

Conflicts:
	lib/Cake/I18n/L10n.php
2013-03-01 22:02:42 -05:00
mark_story
474210d007 Properly initialize variable.
Fixes #3658
2013-03-01 13:42:39 -05:00
mark_story
7d84960b72 Remove appending to $errors on success/failure.
Logging boolean values offers no real value, and just balloons memory
consumption. While removing this may cause userland problems having it does as
well.

Fixes #3657
2013-03-01 13:41:10 -05:00
Mark Story
75539ce56c Merge pull request #1160 from remidewitte/feature/schema-update-default
Keep default=false for boolean columns
2013-03-01 10:05:43 -08:00
Mark Story
e664f8669b Merge pull request #1147 from shama/dev-shell-uses
Lazy load models in shells
2013-03-01 10:04:58 -08:00
Rémi Dewitte
9ecbdf4971 better with strict comparison 2013-03-01 15:51:15 +01:00
Rémi Dewitte
e2e5dfb91e Keep default=false for boolean columns 2013-03-01 15:43:14 +01:00
Renan Gonçalves
fd72f894ad Expanding year range based on the provided value.
This solves issues where editing a record with a year outside the year range would leave the year selection empty, as now it will expand to accomodate the value.
2013-03-01 13:45:55 +01:00
Kyle Robinson Young
85862bbb9f Lazy load models in shells. 2013-02-28 20:30:06 -08:00
mark_story
1d529c1dd2 Add type hints in SchemaShell.
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -05:00
mark_story
00edc594bf Fix failing test. 2013-02-28 21:31:09 -05:00
mark_story
92d215df4d Merge branch 'pr-cli' into 2.4
From pull request 1142
2013-02-28 21:23:03 -05:00
mark_story
15d01bf901 Fix tests for cli runner. 2013-02-28 21:22:01 -05:00
Mark
8d3cd6e8fd Merge pull request #1155 from dereuromark/master-test-404
proper response and response code for test.php with debug 0 (404 instead of 200)
2013-02-27 00:35:13 -08:00