mark_story
9b313f86e4
Add tests for #7034
...
These tests ensure that redirect() is never called which ensures the
Location header is never set. Ajax requests when no loginElement is
defined should get an empty response with a 403 status code.
2015-07-16 23:00:20 -04:00
adam1010
1922a18d07
Ajax requests not properly returning 403
...
When an AJAX request is made to a page that's not authorized, an infinite redirect loop to /status:403/exit:1 is triggered. This bug has existed at least since CakePHP v2.3.0. The main use case is when a user's session has expired and they try to use an authenticated feature as a logged-out user.
2015-07-16 22:47:13 -04:00
mark_story
0d0d1e15f9
Merge branch '2.6' into 2.7
2015-07-15 21:24:35 -04:00
mark_story
8717352f15
Update version number to 2.6.9
2015-07-15 21:22:16 -04:00
Mark Story
a322813182
Merge pull request #7006 from cakephp/2.7-caketext
...
Backport utf8 fix for CakeText::tokenize().
2015-07-13 11:26:27 -04:00
Mark Scherer
d98e7d8d27
Fix tests.
2015-07-13 08:37:11 +02:00
Mark Scherer
2eea245491
Backport utf fix for CakeText::tokenize().
2015-07-13 08:23:05 +02:00
mark_story
e07b64f4e3
Update version number to 2.7.0
2015-07-11 21:34:20 -04:00
mark_story
47378427e3
Merge branch '2.6' into 2.7
2015-07-11 21:25:26 -04:00
José Lorenzo Rodríguez
a5209dc20e
Merge pull request #6996 from cakephp/issue-6992
...
Add missing parameter to rawQuery()
2015-07-11 12:38:16 +02:00
mark_story
65c1745349
Add missing parameter to rawQuery()
...
Previously bound parameters were put in the incorrect position.
Refs #6992
2015-07-10 12:56:49 -04:00
José Lorenzo Rodríguez
77ee00e8db
Merge pull request #6988 from ravage84/2.6-windows
...
Capitalize Windows, the OS
2015-07-09 16:06:18 +02:00
Marc Würth
4a131bdcbf
Capitalize Windows, the OS
2015-07-09 15:54:03 +02:00
mark_story
d451f5235e
Merge branch '2.6' into 2.7
2015-07-08 09:35:22 -04:00
Anne
b4b10e75ac
Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like:
...
- Method _toString is not implemented for translated
2015-07-08 09:35:06 -04:00
Mark Story
1beb8ae98e
Merge pull request #6973 from annuh/6972-Documentation-for-some-translation-methods-is-incorrect
...
Added return types in PHP documenation in basics.php, since it raises…
2015-07-08 09:34:26 -04:00
Anne
64951a3e7e
Added return types in PHP documenation in basics.php, since it raises warning in ie. PHPStorm, like:
...
- Method _toString is not implemented for translated
2015-07-08 11:23:29 +02:00
Mark Story
97656d8edb
Merge pull request #6965 from dy-dx/backport-csv-mapping
...
Don't map text/plain to csv. Backport from 3.0. Refs #1696
2015-07-07 22:07:02 -04:00
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
