mark_story
7613e720e7
Fix PHPCS errors.
2015-07-07 22:06:47 -04:00
mark_story
59a18e7709
Merge branch '2.6' into 2.7
2015-07-07 22:05:56 -04:00
Chris Kim
94fbc6e5f2
Don't map text/plain to csv. Backport from 3.0. Refs #1696
...
Jquery sets accepts header similar to "text/plain, */*; q=0.01" by
default for xhr requests. Due to this RequestHandler used to set
extension to csv thereby causing View class to look for views under
non-existent csv folders.
2015-07-07 15:19:45 -04:00
mark_story
4102961cb5
Add tests for #6879
...
I wasn't able to reproduce the issue the reporter had, but we have more
robust tests now.
2015-07-06 22:43:52 -04:00
Mark Story
5b31eff00c
Merge pull request #6947 from hiromi2424/2.6-fix-deep-validation
...
#6935 Fix deep saving for hasMany could not handle validation errors correctly
2015-07-06 21:18:38 -04:00
hiromi2424
deb62c8887
#6935 Fix deep saving for hasMany could not handle validation errors correctly
2015-07-04 06:10:58 +00:00
mark_story
c037e04ace
Update version number to 2.6.8
2015-06-29 22:35:55 -04:00
mark_story
b9e617997e
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-06-26 22:39:54 -04:00
mark_story
cbd45f702d
Make FlashComponent/FlashHelper more backwards compatible.
...
Merge branch 'issue-6874' into 2.7.
Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
97c5463387
Fix failing tests.
...
FlashHelper uses `Message` not flash now. This is more backwards
compatible with 2.x
Refs #6874
2015-06-26 22:04:00 -04:00
Mark Story
5eb27c7546
Merge pull request #6454 from cakephp/2.7-composer-requirement
...
Update requirements to what we actually test.
2015-06-26 21:47:37 -04:00
mark_story
e651d15df5
Add tests for less greedy field parsing in SQLite.
...
Refs #6887
2015-06-25 22:21:38 -04:00
Lawrence Barsanti
0b28c2e839
Added negative lookahead
...
It is possible to have multiple occurrences of 'as' in a field name.
Use the last occurrence of 'as' when extracting field name.
Tested with following examples:
"WeldCheck"."weld_id"
count(*) as WeldCheck__num_measurements
count(case decision when 2 then 1 else null end) as
WeldCheck__num_failures
avg(cast (WeldMeasurement.surface_indentation as bigint)) as
WeldCheck__avg_indentation
avg(cast (WeldMeasurement.circle_diameter as bigint)) as
WeldCheck__avg_diameter
2015-06-25 22:21:38 -04:00
mark_story
ae2ea1ea6c
Merge branch '2.6' into 2.7
2015-06-25 21:50:47 -04:00
Highstrike
a9d77d26f0
fix failing tests
...
fixing...
2015-06-25 13:40:50 +03:00
José Lorenzo Rodríguez
74c0e81f1d
Merge pull request #6886 from cakephp/issue-6877
...
Fix greedy regex operators in Postgres driver.
2015-06-25 08:10:22 +02:00
mark_story
2f616a9e0c
Fix greedy regex operators in Postgres driver.
...
`*` is greedy in regex, and needs to be escaped so that SQL operators
don't cause invalid SQL conditions to be created.
Refs #6877
2015-06-24 23:39:26 -04:00
Mark Story
ab2f4c2cd5
Merge pull request #6884 from cakephp/2.7-shell
...
Backport param() access.
2015-06-24 21:45:09 -04:00
Mark Scherer
1c56c723f5
Backport param() access.
2015-06-25 00:52:33 +02:00
Highstrike
8257100f54
How about this?
2015-06-24 15:46:48 +03:00
Highstrike
ef1fc7dfef
PHPCS
2015-06-24 15:18:57 +03:00
Highstrike
833c747b41
Test append PR to Issue
...
This commit fixes #6874
2015-06-24 14:18:14 +03:00
Highstrike
7cdf19363d
Tab instead of space
...
IDE preference
2015-06-24 14:09:32 +03:00
Highstrike
58983f717a
2.7.0-RC Auth doesn't use the new Flash component
...
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Story
0841c04351
Merge pull request #6853 from cakephp/2.6-template
...
Cleanup method calls.
2015-06-22 10:53:32 -04:00
Mark Scherer
fc57e43a5b
Adjust tests.
2015-06-21 12:13:09 +02:00
mark_story
bf82c95d64
Fix Debugger error output in CLI when Debugger is used as the error handler.
...
Merge changes from #6803 into 2.6.
2015-06-20 22:26:40 -04:00
Humberto Pereira
77150eb6f6
fixed tests cases to print html
2015-06-20 22:19:08 -04:00
Humberto Pereira
26630991a6
CakeShells should not print html in case of a error
2015-06-20 22:19:07 -04:00
Mark Scherer
6e5381a4e3
Cleanup method calls.
2015-06-20 23:27:32 +02:00
mark_story
26b3713bd6
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-06-20 10:03:24 -04:00
mark_story
664ba53c89
Merge branch '2.6' into 2.7
2015-06-20 10:03:14 -04:00
Mark Story
3495ea1bb1
Merge pull request #6849 from cakephp/2.6-template
...
Consolidate template whitespace
2015-06-20 10:01:47 -04:00
Mark Scherer
1d03d5bd59
Consolidate template whitespace
2015-06-20 05:10:35 +02:00
mark_story
705f44e30a
Fix regression where attributes were created with no whitespace.
2015-06-19 22:00:27 -04:00
Mark Story
6ba9d9e8fa
Merge pull request #6830 from cakephp/2.6-templates
...
Remove overhead whitespace in templates.
2015-06-17 08:06:43 -04:00
Mark Story
c7b0d035a4
Merge pull request #6831 from cakephp/2.7-notblank
...
Use strict check
2015-06-17 08:05:00 -04:00
Mark Scherer
4025f2fb22
add cast for clarification and to allow int 0.
2015-06-17 12:38:06 +02:00
Mark Scherer
1b81323462
Use strict check
2015-06-17 12:06:56 +02:00
Mark Scherer
7dedf7f86d
Refactor cleanly.
2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c
img tag needs manual space
2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be
Remove overhead whitespace in templates.
2015-06-17 11:04:04 +02:00
José Lorenzo Rodríguez
8ecda6ba3f
Merge pull request #6821 from cakephp/2.6-radio
...
Allow deep options for radio() just as for select().
2015-06-16 20:41:25 +02:00
mark_story
2d0374e465
Remove 5.2.
...
A bunch of tests fail and its not worth the candle to fix them as 5.2 is
pretty old and dangerous to use.
2015-06-16 09:56:42 -04:00
Mark Scherer
ccac3b3e06
Allow deep options for radio() just as for select().
2015-06-16 13:23:51 +02:00
Mark Story
65b64e0348
Merge pull request #6816 from cakephp/2.6-fix-validation-multiple
...
Fix Validation::multiple() regarding 0 value.
2015-06-15 12:20:13 -04:00
mark_story
97be9b9696
Fix PHPCS errors.
2015-06-15 12:19:20 -04:00
Mark Scherer
86c358f3f9
Fix Validation::multiple() regarding 0 value.
2015-06-15 16:35:27 +02:00
Mark Story
32fe09835b
Merge pull request #6809 from ravage84/2.7-code-coverage
...
Explicit definition of the code coverage
2015-06-15 10:13:12 -04:00
mark_story
c3080873b9
Update version number to 2.7.0-RC
2015-06-14 22:50:05 -04:00
