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
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
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 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
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 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 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
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
mark_story
947262e754
Fix PHPCS errors.
2015-06-14 21:56:48 -04:00
mark_story
ebb01f0fac
Merge branch '2.6' into 2.7
2015-06-14 21:52:53 -04:00
Marc Würth
f3099fefdf
Define code coverage explicitly
2015-06-15 00:56:09 +02:00
mark_story
56143c663e
Update doc blocks for CakePlugin::load().
...
Refs #5665
2015-06-11 22:17:18 -04:00
mark_story
c47196fe08
Merge branch '2.6' into 2.7
2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db
Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x
...
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
2015-06-07 15:45:16 -04:00
mark_story
0e6fcc02b8
Add/correct some tests for humanize.
...
The arguments for assertEquals() were backwards. While there are many
more flipped assertions I will change the others separately.
2015-06-05 10:31:29 -04:00
mark_story
239c83938f
Fix regression in camelize().
...
The input should not be lowercased before camelizing, as this can cause
inputs that were previously camelized to create incorrect results.
Refs #6735
2015-06-05 10:20:51 -04:00
mark_story
df0f2295c3
Fix issue with overlapping irregular inflections.
...
When irregular inflections overlap we should choose the longest match,
not the shortest.
Refs #6659
2015-06-02 23:09:29 -04:00
Mark Scherer
0524eb95ae
Documentation update
2015-06-01 16:14:15 +02:00
Mark Scherer
4ad001b9ca
Use options array.
2015-06-01 16:12:45 +02:00
Mark Scherer
670d93b6f6
Extract formatTreeList() from generateTreeList().
2015-06-01 12:36:20 +02:00
Mark Scherer
2a5cbb8037
Add missing static keyword.
2015-05-31 13:40:22 +02:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
mark_story
523597df43
Update version number to 2.6.7
2015-05-28 19:30:33 -04:00
mark_story
65691836be
Fix syntax errors in PHP <5.4
2015-05-28 17:39:52 -04:00
mark_story
b66c1ce53c
Update version number to 2.6.6
2015-05-28 09:50:27 -04:00
