Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
db3034eb
Unverified
Commit
db3034eb
authored
5 years ago
by
Eileen McNaughton
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #14457 from civicrm/5.14
5.14
parents
880fd744
44fc33b9
Branches
dependabot/composer/phpoffice/phpspreadsheet-1.29.9
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
release-notes/5.14.0.md
+41
-32
41 additions, 32 deletions
release-notes/5.14.0.md
tests/phpunit/E2E/Core/AssetBuilderTest.php
+5
-1
5 additions, 1 deletion
tests/phpunit/E2E/Core/AssetBuilderTest.php
with
46 additions
and
33 deletions
release-notes/5.14.0.md
+
41
−
32
View file @
db3034eb
...
...
@@ -116,7 +116,7 @@ Released June 5, 2019
-
**
CQ: Switch core forms to be Entity Forms (continues
[
dev/core#818
](
https://lab.civicrm.org/dev/core/issues/818
)
:
[
13887
](
https://github.com/civicrm/civicrm-core/pull/13887
)
)
)
**
[
13887
](
https://github.com/civicrm/civicrm-core/pull/13887
)
)
**
The group settings form now relies upon a standard entity form for the most
part, with most fields defined by metadata. This removes boilerplate code
...
...
@@ -134,7 +134,7 @@ Released June 5, 2019
entity forms. It standardizes the way in which the payment processor is
loaded in the 3 forms that update subscriptions.
-
**
Call Payment.create from
p
ayment.cancel
-
**
Call Payment.create from
P
ayment.cancel
(
[
13689
](
https://github.com/civicrm/civicrm-core/pull/13689
)
)
**
This change improves the Payment.create API by adding handling for negative
...
...
@@ -235,7 +235,7 @@ Released June 5, 2019
Screens => Search Preferences" instead of "Administer => System Settings =>
Miscellaneous".
-
**
f
ix getAddressColumns() to respect tableAlias
-
**
F
ix getAddressColumns() to respect tableAlias
(
[
14014
](
https://github.com/civicrm/civicrm-core/pull/14014
)
)
**
Fixes
`CRM_Report_Form::getAddressColumns()`
function so that it no longer
...
...
@@ -257,6 +257,11 @@ Released June 5, 2019
-
**
Validate queue_id is a positive integer before passing to the BAO
(
[
14355
](
https://github.com/civicrm/civicrm-core/pull/14355
)
)
**
-
**
Fixes issue where contact's display name did not show on membership edit
If there was no registered email address
(
[
dev/core#1000
](
https://lab.civicrm.org/dev/core/issues/1000
)
:
[
14438
](
https://github.com/civicrm/civicrm-core/pull/14438
)
)
**
### CiviCase
-
**
Case activity query performs poorly on large databases
...
...
@@ -283,42 +288,44 @@ Released June 5, 2019
This fixes a recent regression where recurring payments would fail to be
recorded in CiviCRM if the contribution was set to notify the legacy IPN URL.
-
**
Create contribution before taking payment, per contribution page workflow
(
[
13837
](
https://github.com/civicrm/civicrm-core/pull/13837
)
)
**
-
**
Fix checksum failure when editing recuring contributions
(
[
14407
](
https://github.com/civicrm/civicrm-core/pull/14407
)
)
**
Fixes a fatal error where checksum users were not able to cancel or update
recurring contributions.
Makes it so the Contribution is created before the payment processor is
called, so there is always a contribution record even if payment fails.
-
**Fix error when exporting soft credits ([dev/core#1015](https://lab.civicrm.org/dev/core/issues/1015): [14453](https://github.com/civicrm/civicrm-core/pull/14453))**
### CiviEvent
-
**
Event Cart:
p
ass the contactID to fix payment on Stripe
-
**
Event Cart:
P
ass the contactID to fix payment on Stripe
(
[
14173
](
https://github.com/civicrm/civicrm-core/pull/14173
)
)
**
Fixes a bug where a user could not complete an Event Registration using Event
Cart and the Stripe payment processor.
-
**
Event Cart:
f
ix sending of email receipts
-
**
Event Cart:
F
ix sending of email receipts
(
[
14170
](
https://github.com/civicrm/civicrm-core/pull/14170
)
)
**
Fixes fatal error being thrown when an email receipt was sent from an Event
Cart registration.
-
**
Event Cart:
h
onor the allow_same_participant_emails setting
-
**
Event Cart:
H
onor the allow_same_participant_emails setting
(
[
14174
](
https://github.com/civicrm/civicrm-core/pull/14174
)
)
**
Ensures the Event Cart Checkout process honors the "allow participants with
the same email address".
-
**
Event Cart:
f
ix start_date formatting in line items during checkout
-
**
Event Cart:
F
ix start_date formatting in line items during checkout
(
[
14169
](
https://github.com/civicrm/civicrm-core/pull/14169
)
)
**
Ensures start dates are formatted according to the site's localization
preference during the Event Cart checkout process.
-
**
CRM-18570
When creating a new event using a template the new event screen is
-
**
When creating a new event using a template
,
the new event screen is
taking the default values directly from the custom fields, and not from what's
saved in the event template.
(
[
dev/core#553
](
https://lab.civicrm.org/dev/core/issues/553
)
:
(
[
CRM-18570
](
https://issues.civicrm.org/jira/browse/CRM-18570
)
,
[
dev/core#553
](
https://lab.civicrm.org/dev/core/issues/553
)
:
[
14063
](
https://github.com/civicrm/civicrm-core/pull/14063
)
)
**
### CiviMail
...
...
@@ -389,7 +396,7 @@ Released June 5, 2019
## <a name="misc"></a>Miscellany
-
**
Bump
php
version to match core requirements
-
**
Bump
PHP
version to match core requirements
(
[
567
](
https://github.com/civicrm/civicrm-drupal/pull/567
)
)
**
-
**
CiviUnitTestCase - Extract traits to facilitate extension testing
...
...
@@ -406,7 +413,9 @@ Released June 5, 2019
(continues
[
dev/core#560
](
https://lab.civicrm.org/dev/core/issues/560
)
:
[
14143
](
https://github.com/civicrm/civicrm-core/pull/14143
)
)
**
-
**
[REF] Add unit tests on contribution recur trxn_id, contribution recur
-
**Fix E2E_Core_AssetBuilderTest on WordPress ([14212](https://github.com/civicrm/civicrm-core/pull/14212/))**
-
**
(REF) Add unit tests on contribution recur trxn_id, contribution recur
processor id (preparation for
[
dev/core#830
](
https://lab.civicrm.org/dev/core/issues/830
)
:
[
14119
](
https://github.com/civicrm/civicrm-core/pull/14119
)
)
**
...
...
@@ -429,40 +438,40 @@ Released June 5, 2019
-
**
(NFC) Add in unit test checking that E2E test returns sensible contac…
(
[
14076
](
https://github.com/civicrm/civicrm-core/pull/14076
)
)
**
-
**
NFC Whitespace formatting for formButtons.tpl
-
**
(
NFC
)
Whitespace formatting for formButtons.tpl
(
[
14107
](
https://github.com/civicrm/civicrm-core/pull/14107
)
)
**
-
**
(NFC) Expand unit test to show off double protocol error
(
[
14141
](
https://github.com/civicrm/civicrm-core/pull/14141
)
)
**
-
**
[
REF
] m
ove gathering of location info to relevant function (towards
-
**
(
REF
) M
ove gathering of location info to relevant function (towards
dev/core#723) (
[
14142
](
https://github.com/civicrm/civicrm-core/pull/14142
)
)
**
-
**
[
REF
]
Move the qfbug handling to it's own function (towards dev/core#723)
-
**
(
REF
)
Move the qfbug handling to it's own function (towards dev/core#723)
(
[
14140
](
https://github.com/civicrm/civicrm-core/pull/14140
)
)
**
-
**
[
REF
]
Use events for CMS resource loading
-
**
(
REF
)
Use events for CMS resource loading
(
[
14131
](
https://github.com/civicrm/civicrm-core/pull/14131
)
)
**
-
**
[
REF
] e
xtract getConflicts function
-
**
(
REF
) E
xtract getConflicts function
(
[
14148
](
https://github.com/civicrm/civicrm-core/pull/14148
)
)
**
-
**
[
REF
]
Extract get cfields function
-
**
(
REF
)
Extract get cfields function
(
[
14151
](
https://github.com/civicrm/civicrm-core/pull/14151
)
)
**
-
**
[
REF
]
Use variable for menubar height
-
**
(
REF
)
Use variable for menubar height
(
[
14122
](
https://github.com/civicrm/civicrm-core/pull/14122
)
)
**
-
**
[
REF
]
Clean up CRM_Contribute_Form_SearchTest
-
**
(
REF
)
Clean up CRM_Contribute_Form_SearchTest
(
[
14068
](
https://github.com/civicrm/civicrm-core/pull/14068
)
)
**
-
**
[
REF
]
Extract formatLocationBlock from import parsing
-
**
(
REF
)
Extract formatLocationBlock from import parsing
(
[
14040
](
https://github.com/civicrm/civicrm-core/pull/14040
)
)
**
-
**
[
REF
] f
unction extraction in dedupe code
-
**
(
REF
) F
unction extraction in dedupe code
(
[
14157
](
https://github.com/civicrm/civicrm-core/pull/14157
)
)
**
-
**
[
REF
]
cleanup input parameters on extracted function
-
**
(
REF
)
cleanup input parameters on extracted function
(
[
14050
](
https://github.com/civicrm/civicrm-core/pull/14050
)
)
**
-
**
(REF) Fix accepted params in CustomValueTable::setValues
...
...
@@ -474,25 +483,25 @@ Released June 5, 2019
-
**
(REF) Reduce redundant code in CRM_Utils_Type::validate
(
[
14011
](
https://github.com/civicrm/civicrm-core/pull/14011
)
)
**
-
**
REF Replace hardcoded IDs with pseudoconstants in activity form
-
**
(
REF
)
Replace hardcoded IDs with pseudoconstants in activity form
(
[
14108
](
https://github.com/civicrm/civicrm-core/pull/14108
)
)
**
-
**
(REF) Standardize UFField create function
(
[
14084
](
https://github.com/civicrm/civicrm-core/pull/14084
)
)
**
-
**
[
REF
] cal
ll formatLocationBlock from parent function.
-
**
(
REF
) Ca
ll formatLocationBlock from parent function.
(
[
14105
](
https://github.com/civicrm/civicrm-core/pull/14105
)
)
**
-
**
(REF; dev/core#873) MailingAB - Migrate "copy winner" logic from JS to PHP
(
[
14045
](
https://github.com/civicrm/civicrm-core/pull/14045
)
)
**
-
**
REF Don't pass activity object to addCaseActivityLinks
-
**
(
REF
)
Don't pass activity object to addCaseActivityLinks
(
[
14110
](
https://github.com/civicrm/civicrm-core/pull/14110
)
)
**
-
**
REF Use shared function to check inbound email permissions
-
**
(
REF
)
Use shared function to check inbound email permissions
(
[
14109
](
https://github.com/civicrm/civicrm-core/pull/14109
)
)
**
-
**
[
REF
]
Follow up tidy up on import fixes
-
**
(
REF
)
Follow up tidy up on import fixes
(
[
14117
](
https://github.com/civicrm/civicrm-core/pull/14117
)
)
**
-
**
Readability cleanup on EventIncome report (towards bringing it under
...
...
@@ -508,7 +517,7 @@ Released June 5, 2019
-
**
Update docblock for doPayment function
(
[
13844
](
https://github.com/civicrm/civicrm-core/pull/13844
)
)
**
-
**
[c
leanup
] r
emove CRM_Report_Form_Extended
-
**
(C
leanup
) R
emove CRM_Report_Form_Extended
(
[
14149
](
https://github.com/civicrm/civicrm-core/pull/14149
)
)
**
## <a name="credits"></a>Credits
...
...
This diff is collapsed.
Click to expand it.
tests/phpunit/E2E/Core/AssetBuilderTest.php
+
5
−
1
View file @
db3034eb
...
...
@@ -162,9 +162,13 @@ class AssetBuilderTest extends \CiviEndToEndTestCase {
public
function
testInvalid
()
{
\Civi
::
service
(
'asset_builder'
)
->
setCacheEnabled
(
FALSE
);
$url
=
\Civi
::
service
(
'asset_builder'
)
->
getUrl
(
'invalid.json'
);
// WordPress has different error reporting to Drupal so manually set to Drupal
$previousErrorReporting
=
error_reporting
(
1
);
$this
->
assertEmpty
(
file_get_contents
(
$url
));
$this
->
assertNotEmpty
(
preg_grep
(
';HTTP/
1.1
404;'
,
$http_response_header
),
$this
->
assertNotEmpty
(
preg_grep
(
';HTTP/
\d+.\d+
404;'
,
$http_response_header
),
'Expect to find HTTP 404. Found: '
.
json_encode
(
preg_grep
(
';^HTTP;'
,
$http_response_header
)));
// Now Reset Error Reporting.
error_reporting
(
$previousErrorReporting
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment