euromark
690f54ad9d
more corrections in order
2014-01-10 00:33:27 +01:00
euromark
3ff23c732f
unify and correct assert order
2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez
606362d519
Merge pull request #2636 from dereuromark/2.5-title-for-layout
...
Follow the deprecation note in the doc block of View class
2014-01-09 15:13:07 -08:00
euromark
97e43e5806
unify to expected
2014-01-09 16:52:21 +01:00
euromark
738b34c2d0
Correct assert param order
2014-01-09 16:50:27 +01:00
euromark
29e15386b2
Follow the deprecation note of 2.1 migration guide and switch to fetch(title)
...
correct assert order for test
2014-01-09 16:45:49 +01:00
Mark
db1e7c13fb
Merge pull request #2635 from bcrowe/hotfix-timeDocBlock
...
Simple docblock updates to CakeTime
2014-01-08 18:40:57 -08:00
Bryan Crowe
cd27012405
Simple docblock updates to CakeTime
2014-01-08 21:38:45 -05:00
Mark Story
9bf7513ba9
Merge pull request #2628 from pummra/patch-1
...
Add message to let user know that no controllers were generated.
2014-01-08 06:43:12 -08:00
mark_story
b20ca3f4e0
Fix errors with postgres tests.
2014-01-08 09:42:13 -05:00
pummra
5605ff48ab
Update ControllerTask.php
...
Removed $admin from message in regards to no controllers being baked in all() function
2014-01-08 12:23:03 +00:00
pummra
a981c7fa8c
Removed trailing whitespace.
2014-01-08 10:16:06 +00:00
pummra
0214ac403e
Update ControllerTask.php
...
Updated if statement for clarity and also fixed spelling mistake.
2014-01-08 10:10:40 +00:00
pummra
d41bb0b1b3
Update ControllerTask.php
...
Added an output message if no controllers are baked using the all() function.
2014-01-08 09:52:05 +00:00
Mark Story
7f2e0a29a4
Merge pull request #2624 from dereuromark/2.5-loggedin
...
2.5 loggedin
2014-01-07 11:27:39 -08:00
euromark
e3befe30df
deprecated loggedIn
2014-01-07 16:12:38 +01:00
mark_story
caf350c01f
Exclude lib/Cake/Test when building pear packages.
...
The core tests include a number of files that cause grief when the
cakephp pear package is installed via composer. Excluding the core tests
solves all of these problems and makes a smaller package which is nice.
Fixes #2620
2014-01-07 10:06:50 -05:00
Mark Story
cd9c135c88
Merge pull request #2601 from dereuromark/2.5-upgrade
...
2.5 upgrade
2014-01-07 06:43:10 -08:00
mark_story
312b2c3cd1
Merge branch 'translate-patch'
2014-01-06 21:21:25 -05:00
mark_story
3763350667
Add test for issue #2595
...
Fold conditions that did the same thing and add a test case.
Closes #2595
2014-01-06 21:21:13 -05:00
Mark Story
53c8b4ff05
Merge pull request #2612 from dereuromark/master-fixture
...
Clearer error message when fixture insertion fails.
2014-01-06 18:13:37 -08:00
euromark
ecfd64c082
adding test
2014-01-06 21:07:00 +01:00
euromark
865ca7acd6
wording
2014-01-06 20:43:30 +01:00
euromark
1201887ad1
Clearer error message
2014-01-06 20:42:17 +01:00
euromark
483cd13a26
rename method
2014-01-06 20:00:45 +01:00
ADmad
18255bdcf3
Fixed typo in var name.
2014-01-06 02:32:34 +05:30
mark_story
5fd8883691
Merge branch 'master' into 2.5
2014-01-05 15:45:09 -05:00
Mark Story
7e084da6e8
Merge pull request #2594 from dereuromark/2.5-error-handling
...
2.5 error handling
2014-01-05 08:00:39 -08:00
euromark
3e48d2e082
Add return early statements for redirecting in controllers.
2014-01-04 13:18:14 +01:00
euromark
71fb17e092
keep name as well
2014-01-03 16:33:02 +01:00
Raffaele
a4f138813b
Return value if value are 0
...
Save correctly if the value is 0, but after the find is returned as an empty string.
2014-01-03 15:46:09 +01:00
euromark
85337a5d15
correct templates
2014-01-03 13:28:45 +01:00
euromark
a02ab67521
unify exception and error handling.
2014-01-03 12:42:52 +01:00
ADmad
cfa104577f
Merge pull request #2593 from dereuromark/master-hotfix
...
Correct casing.
2014-01-03 03:41:11 -08:00
euromark
3d51bfee3b
Correct casing.
2014-01-03 04:09:19 +01:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Mark Story
4ae1feaf2d
Merge pull request #2571 from cuppett/patch-1
...
Must double quote the schema name in query
2013-12-30 08:18:22 -08:00
ADmad
f37eb9ad4b
Merge pull request #2572 from bcrowe/hotfix-controllerBlocks
...
Update some grammar in Controller
2013-12-29 21:30:01 -08:00
Bryan Crowe
49bb441cef
Update some grammar in Controller
2013-12-30 00:13:26 -05:00
mark_story
85d72443b6
Remove ext-mbstring dependency.
...
mbstring is not a hard dependency for 2.x. The Multibyte class can shim
up the missing extension.
Refs #2564
2013-12-29 23:49:17 -05:00
Mark Story
107f883223
Merge pull request #2570 from dereuromark/master-pkpass
...
Add missing pkpass mimetype
2013-12-29 20:36:08 -08:00
Stephen Cuppett
ed749fdc97
Must double quote the schema name in query
...
Schema names with reserved words such as "create" will fail this query without double quotes.
Attempted prepared statement with ? placeholder. This failed with the following CakePHP error:
Error: A Database connection using "Postgres" was missing or unable to connect.
The database server returned this error: SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "$1" LINE 1: SET search_path TO $1 ^
2013-12-29 21:43:56 -05:00
euromark
2f02d0c755
Add missing pkpass mimetype
2013-12-30 01:19:09 +01:00
Mark Story
b728bced73
Merge pull request #2564 from josegonzalez/master
...
Added composer.json for CakePHP 2.x
2013-12-28 16:08:03 -08:00
Jose Diaz-Gonzalez
c86f9ab3e5
Added composer.json for CakePHP 2.x
2013-12-28 18:24:22 -05:00
Mark Story
b682732c1e
Merge pull request #2557 from rchavik/2.4-save-tree-invalid-scope
...
2.4 save tree invalid scope
2013-12-27 07:17:52 -08:00
Rachman Chavik
c4f8289b53
Fix test by checking against an empty array instead of false
2013-12-27 12:37:39 +07:00
Rachman Chavik
c48afae2dc
Add test to prove issue when saving invalid tree data
2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7
Add tests for uncovered case of :0 replacements.
...
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
2013-12-24 13:13:05 -05:00
Mark Story
1cb7e4f0ff
Merge pull request #1635 from dereuromark/master-dom-ids
...
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
