civicrm-core.git
4 years agoMerge pull request #17717 from colemanw/jsComments
Seamus Lee [Tue, 30 Jun 2020 20:45:02 +0000 (06:45 +1000)]
Merge pull request #17717 from colemanw/jsComments

Fix CRM_Utils_JS::dedupeClosures to ignore comments

4 years agoFix CRM_Utils_JS::dedupeClosures to ignore comments
Coleman Watts [Tue, 30 Jun 2020 15:40:26 +0000 (11:40 -0400)]
Fix CRM_Utils_JS::dedupeClosures to ignore comments

This runs stripComments BEFORE dedupeClosures so that comments don't interfere with the deduping.
Also fixes stripComments to remove the line break as well as the comment line.

4 years agoMerge pull request #17714 from colemanw/jsDocblocks
Seamus Lee [Tue, 30 Jun 2020 01:41:19 +0000 (11:41 +1000)]
Merge pull request #17714 from colemanw/jsDocblocks

NFC cleanup docblocks in CRM_Utils_JS

4 years agoMerge pull request #17715 from civicrm/5.27
Seamus Lee [Tue, 30 Jun 2020 01:28:03 +0000 (11:28 +1000)]
Merge pull request #17715 from civicrm/5.27

5.27

4 years agoMerge pull request #17713 from MegaphoneJon/multi-record-import-fix-527
colemanw [Tue, 30 Jun 2020 00:46:42 +0000 (20:46 -0400)]
Merge pull request #17713 from MegaphoneJon/multi-record-import-fix-527

Multi record import screen fix

4 years agoNFC cleanup docblocks in CRM_Utils_JS
Coleman Watts [Tue, 30 Jun 2020 00:22:58 +0000 (20:22 -0400)]
NFC cleanup docblocks in CRM_Utils_JS

4 years agoMerge pull request #17712 from civicrm/5.27
Seamus Lee [Tue, 30 Jun 2020 00:19:43 +0000 (10:19 +1000)]
Merge pull request #17712 from civicrm/5.27

5.27

4 years agoMerge pull request #17711 from colemanw/useStrict
Seamus Lee [Mon, 29 Jun 2020 23:04:08 +0000 (09:04 +1000)]
Merge pull request #17711 from colemanw/useStrict

CRM_Utils_JS - also dedupe 'use strict' directive when deduping closures

4 years agoMulti record import screen fix
Jon Goldberg [Thu, 25 Jun 2020 16:26:02 +0000 (12:26 -0400)]
Multi record import screen fix

4 years agoMerge pull request #17676 from eileenmcnaughton/ct
Seamus Lee [Mon, 29 Jun 2020 22:31:51 +0000 (08:31 +1000)]
Merge pull request #17676 from eileenmcnaughton/ct

[REF] Cleanup function for retrieving contact types.

4 years agoMerge pull request #17250 from eileenmcnaughton/act_search
Seamus Lee [Mon, 29 Jun 2020 22:27:38 +0000 (08:27 +1000)]
Merge pull request #17250 from eileenmcnaughton/act_search

Remove slow join from activity search

4 years agoMerge pull request #17710 from kcristiano/5.27-api4-joomla-install
Seamus Lee [Mon, 29 Jun 2020 22:09:50 +0000 (08:09 +1000)]
Merge pull request #17710 from kcristiano/5.27-api4-joomla-install

dev/joomla/#28 5.27 Upgrade fails

4 years agoCRM_Utils_JS - also dedupe 'use strict' directive when deduping closures
Coleman Watts [Mon, 29 Jun 2020 21:50:22 +0000 (17:50 -0400)]
CRM_Utils_JS - also dedupe 'use strict' directive when deduping closures

4 years agodev/joomla/#28 5.27 Upgrade fails
Kevin Cristiano [Mon, 29 Jun 2020 11:53:36 +0000 (07:53 -0400)]
dev/joomla/#28 5.27 Upgrade fails

Failure is due to 'Undefined class constant 'POST_SELECT_QUERY'  see https://lab.civicrm.org/dev/joomla/-/issues/28

4 years agoMerge pull request #17708 from demeritcowboy/temp-workaround-case-sort
Seamus Lee [Mon, 29 Jun 2020 05:34:51 +0000 (15:34 +1000)]
Merge pull request #17708 from demeritcowboy/temp-workaround-case-sort

dev/core#1844 - Temporary workaround to avoid all PR's failing tests

4 years agoMerge pull request #17677 from seamuslee001/dev_core_1833
Eileen McNaughton [Mon, 29 Jun 2020 04:13:33 +0000 (16:13 +1200)]
Merge pull request #17677 from seamuslee001/dev_core_1833

dev/core#1833 Change default value of participant_listing_id to NULL …

4 years agoRemove slow join from activity search
eileen [Thu, 7 May 2020 04:41:14 +0000 (16:41 +1200)]
Remove slow join from activity search

This removes the unindexed join from activity search. The join is used to apply component
permission filtering and to retrieve the activity_type - however, this latter is still rendered
by the pseudoconstant handling

4 years agotemporary workaround to avoid all PR's failing tests
demeritcowboy [Mon, 29 Jun 2020 03:09:26 +0000 (23:09 -0400)]
temporary workaround to avoid all PR's failing tests

4 years agoMerge pull request #17704 from colemanw/api4Count
Eileen McNaughton [Mon, 29 Jun 2020 02:46:44 +0000 (14:46 +1200)]
Merge pull request #17704 from colemanw/api4Count

APIv4 - Improve row_count to work with HAVING, GROUP BY, and SELECT

4 years agoMerge pull request #17412 from bhahumanists/remove-summary-row
Seamus Lee [Mon, 29 Jun 2020 02:02:28 +0000 (12:02 +1000)]
Merge pull request #17412 from bhahumanists/remove-summary-row

Remove summary row from charts, when rollup used

4 years agoRemove summary row from charts, when rollup used
Andrew West [Wed, 27 May 2020 15:07:06 +0000 (16:07 +0100)]
Remove summary row from charts, when rollup used

Issue: https://lab.civicrm.org/dev/report/-/issues/40

4 years agoMerge pull request #17687 from mattwire/cancelSubscriptionSelfService
Seamus Lee [Sun, 28 Jun 2020 22:33:37 +0000 (08:33 +1000)]
Merge pull request #17687 from mattwire/cancelSubscriptionSelfService

Add selfService flag to cancelSubscription getText so we can display different text for each case

4 years agoAPIv4 - Improve row_count to work with HAVING, GROUP BY, and SELECT
Coleman Watts [Fri, 26 Jun 2020 06:22:27 +0000 (02:22 -0400)]
APIv4 - Improve row_count to work with HAVING, GROUP BY, and SELECT

This changes the meaning of $result->count(), to give a total count of filtered items, ignoring limit and offset.
For DAO queries, you must select 'row_count' to trigger this behavior, as it requires a seperate query.

4 years agoREF - Divorce API4SelectQuery from base class SelectQuery
Coleman Watts [Thu, 25 Jun 2020 19:18:54 +0000 (15:18 -0400)]
REF - Divorce API4SelectQuery from base class SelectQuery

These two classes had grown apart to the point they share almost nothing in common,
and the link was more confusing than helpful.

4 years agoMerge pull request #17389 from seamuslee001/dev_core_1776
Eileen McNaughton [Sat, 27 Jun 2020 07:35:38 +0000 (19:35 +1200)]
Merge pull request #17389 from seamuslee001/dev_core_1776

dev/core#1776 Ensure that all fee financial item transaction date is …

4 years agoMerge pull request #16956 from jitendrapurohit/core-890
Eileen McNaughton [Sat, 27 Jun 2020 07:08:16 +0000 (19:08 +1200)]
Merge pull request #16956 from jitendrapurohit/core-890

dev/core#890 - Multiple line item shown on view contribution if parti…

4 years agoAdd selfService flag to cancelSubscription getText so we can display different text...
Matthew Wire [Wed, 24 Jun 2020 15:27:42 +0000 (16:27 +0100)]
Add selfService flag to cancelSubscription getText so we can display different text for each case

4 years agoMerge pull request #17697 from MegaphoneJon/multi-record-import-fix
Seamus Lee [Fri, 26 Jun 2020 02:11:18 +0000 (12:11 +1000)]
Merge pull request #17697 from MegaphoneJon/multi-record-import-fix

Multi record import screen fix

4 years agoMerge pull request #17688 from artfulrobot/artfulrobot-trxn-id-and-date
Eileen McNaughton [Thu, 25 Jun 2020 22:44:26 +0000 (10:44 +1200)]
Merge pull request #17688 from artfulrobot/artfulrobot-trxn-id-and-date

Payment.create should not set contribution date to today

4 years agoMulti record import screen fix
Jon Goldberg [Thu, 25 Jun 2020 16:26:02 +0000 (12:26 -0400)]
Multi record import screen fix

4 years agoMerge pull request #17664 from jitendrapurohit/core-1829
Mathieu Lu [Thu, 25 Jun 2020 12:15:23 +0000 (08:15 -0400)]
Merge pull request #17664 from jitendrapurohit/core-1829

dev/core#1829 - Custom Date field with format=yy displays calendar ic…

4 years agoMerge pull request #17689 from demeritcowboy/fintest-case-sensitive
Seamus Lee [Thu, 25 Jun 2020 08:17:22 +0000 (18:17 +1000)]
Merge pull request #17689 from demeritcowboy/fintest-case-sensitive

[Test framework] dev/wordpress#61 - Fix case-sensitive spelling in unit test

4 years agoMerge pull request #17691 from MegaphoneJon/core-1840
Seamus Lee [Thu, 25 Jun 2020 07:05:33 +0000 (17:05 +1000)]
Merge pull request #17691 from MegaphoneJon/core-1840

core#1840 - Can't add/change recipient on non-bulk SMS

4 years agoPayment.create should not set contribution date to today (PR 17688)
Rich Lott / Artful Robot [Wed, 24 Jun 2020 17:15:18 +0000 (18:15 +0100)]
Payment.create should not set contribution date to today (PR 17688)

4 years agoMerge pull request #17690 from colemanw/psr4
Seamus Lee [Thu, 25 Jun 2020 05:54:50 +0000 (15:54 +1000)]
Merge pull request #17690 from colemanw/psr4

Use psr-4 instead of psr-0 in Civi directory

4 years agoMerge pull request #17692 from colemanw/CONCAT
Eileen McNaughton [Thu, 25 Jun 2020 05:14:15 +0000 (17:14 +1200)]
Merge pull request #17692 from colemanw/CONCAT

APIv4 - Add more SQL functions

4 years agoAdd user-facing titles for sql functions
Coleman Watts [Wed, 24 Jun 2020 20:10:56 +0000 (16:10 -0400)]
Add user-facing titles for sql functions

4 years agoAPIv4 - Add more SQL functions
Coleman Watts [Mon, 20 Apr 2020 13:18:04 +0000 (09:18 -0400)]
APIv4 - Add more SQL functions

4 years agocore#1840 - Can't add/change recipient on non-bulk SMS
Jon Goldberg [Wed, 24 Jun 2020 22:13:43 +0000 (18:13 -0400)]
core#1840 - Can't add/change recipient on non-bulk SMS

4 years agoUse psr-4 instead of psr-0 in Civi directory
Coleman Watts [Wed, 24 Jun 2020 20:12:12 +0000 (16:12 -0400)]
Use psr-4 instead of psr-0 in Civi directory

This is a followup to #17105 which attempted the same thing but without success.
This finally gets classnames with underscores to work correctly in the Civi directory.

4 years agoMerge pull request #17686 from demeritcowboy/medium-index
colemanw [Wed, 24 Jun 2020 19:17:44 +0000 (15:17 -0400)]
Merge pull request #17686 from demeritcowboy/medium-index

dev/core#1634 - Remove database index on medium_id from civicrm_activity

4 years agofix case-sensitive spelling
demeritcowboy [Wed, 24 Jun 2020 17:57:49 +0000 (13:57 -0400)]
fix case-sensitive spelling

4 years agoremove index on medium_id
demeritcowboy [Wed, 24 Jun 2020 12:59:07 +0000 (08:59 -0400)]
remove index on medium_id

4 years agoMerge pull request #17685 from colemanw/entityMeta
Seamus Lee [Wed, 24 Jun 2020 06:02:11 +0000 (16:02 +1000)]
Merge pull request #17685 from colemanw/entityMeta

APIv4 - add meta-metadata to supplement #17527

4 years agoMerge pull request #17558 from seamuslee001/require_mysql_565
Eileen McNaughton [Wed, 24 Jun 2020 04:21:11 +0000 (16:21 +1200)]
Merge pull request #17558 from seamuslee001/require_mysql_565

dev/core#1681 Block sites from upgrading if on a MySQL version less t…

4 years agoAPIv4 - add meta-metadata to suppliment #17527
Coleman Watts [Wed, 24 Jun 2020 03:23:07 +0000 (23:23 -0400)]
APIv4 - add meta-metadata to suppliment #17527

4 years agoMerge pull request #17680 from seamuslee001/master
Eileen McNaughton [Wed, 24 Jun 2020 00:52:20 +0000 (12:52 +1200)]
Merge pull request #17680 from seamuslee001/master

Revert "dev/core#1603 remove places where taxAmount is rounded"

4 years agoMerge pull request #17621 from colemanw/sortOptions
Eileen McNaughton [Tue, 23 Jun 2020 23:13:59 +0000 (11:13 +1200)]
Merge pull request #17621 from colemanw/sortOptions

Sort options without relying on unavailable buildOptions param

4 years agoMerge pull request #17682 from colemanw/api4ExpJoin
Eileen McNaughton [Tue, 23 Jun 2020 23:13:01 +0000 (11:13 +1200)]
Merge pull request #17682 from colemanw/api4ExpJoin

APIv4 Explorer - UI support for join ON clause

4 years agoAPIv4 Explorer - Update pluralize fn to match CRM_Utils_String
Coleman Watts [Tue, 23 Jun 2020 14:54:18 +0000 (10:54 -0400)]
APIv4 Explorer - Update pluralize fn to match CRM_Utils_String

4 years agoAPIv4 Explorer - Support selectable fields from explicit joins
Coleman Watts [Tue, 23 Jun 2020 14:42:09 +0000 (10:42 -0400)]
APIv4 Explorer - Support selectable fields from explicit joins

4 years agoMerge pull request #17681 from demeritcowboy/customfieldoption-name-label
colemanw [Tue, 23 Jun 2020 12:47:26 +0000 (08:47 -0400)]
Merge pull request #17681 from demeritcowboy/customfieldoption-name-label

dev/core#1817 - Editing a custom field option value from the custom field admin screen changes the name field

4 years agoAPIv4 Explorer - UI support for join ON clause
Coleman Watts [Mon, 22 Jun 2020 20:04:51 +0000 (16:04 -0400)]
APIv4 Explorer - UI support for join ON clause

4 years agoMerge pull request #17667 from colemanw/taskIcons
Mathieu Lu [Mon, 22 Jun 2020 20:12:21 +0000 (16:12 -0400)]
Merge pull request #17667 from colemanw/taskIcons

Add icons to standalone contact tasks

4 years agodon't change name field when updating option value
demeritcowboy [Mon, 22 Jun 2020 18:18:55 +0000 (14:18 -0400)]
don't change name field when updating option value

4 years agoAdd icons to standalone contact tasks
Coleman Watts [Sat, 20 Jun 2020 01:00:53 +0000 (21:00 -0400)]
Add icons to standalone contact tasks

4 years agoMerge pull request #17666 from eileenmcnaughton/entity_log
Mathieu Lu [Mon, 22 Jun 2020 18:17:00 +0000 (14:17 -0400)]
Merge pull request #17666 from eileenmcnaughton/entity_log

Throw exception if id not passed into discard

4 years agoRevert "dev/core#1603 remove places where taxAmount is rounded"
Seamus Lee [Mon, 22 Jun 2020 11:42:54 +0000 (21:42 +1000)]
Revert "dev/core#1603 remove places where taxAmount is rounded"

This reverts commit 777d61015ae35bb60a08f779d9aa8cb8dc9df708.

4 years agoMerge pull request #17679 from civicrm/5.27
Seamus Lee [Sun, 21 Jun 2020 22:34:10 +0000 (08:34 +1000)]
Merge pull request #17679 from civicrm/5.27

5.27

4 years agoMerge pull request #17668 from seamuslee001/intl_check
Eileen McNaughton [Sun, 21 Jun 2020 21:13:13 +0000 (09:13 +1200)]
Merge pull request #17668 from seamuslee001/intl_check

dev/translation#48 Add check for PHP-Intl Extension

4 years agoMerge pull request #17673 from seamuslee001/expandaccordion_error
Matthew Wire [Sun, 21 Jun 2020 11:29:14 +0000 (12:29 +0100)]
Merge pull request #17673 from seamuslee001/expandaccordion_error

[REF] Ensure that our custom error handler is called when jquery vali…

4 years agoMerge pull request #17678 from seamuslee001/master
Seamus Lee [Sun, 21 Jun 2020 08:27:20 +0000 (18:27 +1000)]
Merge pull request #17678 from seamuslee001/master

[REF] Fix javascript syntax error

4 years ago[REF] Fix javascript syntax error
Seamus Lee [Sun, 21 Jun 2020 06:51:08 +0000 (16:51 +1000)]
[REF] Fix javascript syntax error

4 years agodev/core#1833 Change default value of participant_listing_id to NULL from 0
Seamus Lee [Sun, 21 Jun 2020 06:43:21 +0000 (16:43 +1000)]
dev/core#1833 Change default value of participant_listing_id to NULL from 0

4 years agodev/translation#48 Add check for PHP-Intl Extension
Seamus Lee [Sat, 20 Jun 2020 03:30:29 +0000 (13:30 +1000)]
dev/translation#48 Add check for PHP-Intl Extension

4 years ago[REF] Cleanup function for retrieving contact types.
eileen [Sun, 21 Jun 2020 00:08:04 +0000 (12:08 +1200)]
[REF] Cleanup function for retrieving contact types.

This switches to using the apiv4 as part of trying to eliminate calls to executeQuery where the DAO is passed in
like

```
       = CRM_Core_DAO::executeQuery(, [],
        FALSE, 'CRM_Contact_DAO_ContactType'
      );
```

Note that this file seems to be the only place this is done.

Also note that I added tests first & the changes to the test highlight what is changed in the PR in the output - namely
- stricter type casting (courtesy apiv4)
- same keys present for all types

4 years agoMerge pull request #17674 from seamuslee001/contacttype_test_mysql8_ordering_issue
Seamus Lee [Sun, 21 Jun 2020 00:20:49 +0000 (10:20 +1000)]
Merge pull request #17674 from seamuslee001/contacttype_test_mysql8_ordering_issue

[NFC] Fix Unit test failure on MySQL 8 due to mysql ordering issue

4 years ago[NFC] Fix Unit test failure on MySQL 8 due to mysql ordering issue
Seamus Lee [Sat, 20 Jun 2020 22:55:29 +0000 (08:55 +1000)]
[NFC] Fix Unit test failure on MySQL 8 due to mysql ordering issue

4 years agoMerge pull request #17588 from artfulrobot/artfulrobot-property-bag-support-empty
Eileen McNaughton [Sat, 20 Jun 2020 22:54:40 +0000 (10:54 +1200)]
Merge pull request #17588 from artfulrobot/artfulrobot-property-bag-support-empty

Improve PropertyBag handling of offsetGet and custom properties; add …

4 years agoMerge pull request #17644 from eileenmcnaughton/export_fix_standalonne
Eileen McNaughton [Sat, 20 Jun 2020 22:02:54 +0000 (10:02 +1200)]
Merge pull request #17644 from eileenmcnaughton/export_fix_standalonne

Export fix

4 years agoMerge pull request #17672 from mattwire/onbehalfof
Eileen McNaughton [Sat, 20 Jun 2020 21:31:46 +0000 (09:31 +1200)]
Merge pull request #17672 from mattwire/onbehalfof

Fix validation of select2 fields in "On behalf of Organisation" block

4 years agoExport - further cleanup export class to remove unnecessary switch
Coleman Watts [Thu, 18 Jun 2020 20:08:47 +0000 (16:08 -0400)]
Export - further cleanup export class to remove unnecessary switch

4 years agoFix issues with select2 validation when it is part of hidden 'On behalf of organisati...
Matthew Wire [Sat, 20 Jun 2020 11:04:36 +0000 (12:04 +0100)]
Fix issues with select2 validation when it is part of hidden 'On behalf of organisation' block

4 years agoWhitespace cleanup
Matthew Wire [Sat, 20 Jun 2020 10:46:41 +0000 (11:46 +0100)]
Whitespace cleanup

4 years agoMerge pull request #17671 from seamuslee001/select2_error_message
Seamus Lee [Sat, 20 Jun 2020 14:28:15 +0000 (00:28 +1000)]
Merge pull request #17671 from seamuslee001/select2_error_message

[REF] Fix jquery error message display on select2 field validation

4 years ago[REF] Ensure that our custom error handler is called when jquery validates and expand...
Seamus Lee [Sat, 20 Jun 2020 11:54:31 +0000 (21:54 +1000)]
[REF] Ensure that our custom error handler is called when jquery validates and expand any collapsed accordions that are hiding required fields that haven't been filled in

4 years agoMerge pull request #17670 from seamuslee001/fix_allow_clear_radio
Matthew Wire [Sat, 20 Jun 2020 11:32:47 +0000 (12:32 +0100)]
Merge pull request #17670 from seamuslee001/fix_allow_clear_radio

[REF] Fix allowing users to clear values for raido custom fields when…

4 years agoMerge pull request #17665 from eileenmcnaughton/ct
Seamus Lee [Sat, 20 Jun 2020 11:02:31 +0000 (21:02 +1000)]
Merge pull request #17665 from eileenmcnaughton/ct

Fix master regression on inactive contact types

4 years ago[REF] Fix jquery error message display on select2 field validation
Seamus Lee [Sat, 20 Jun 2020 10:57:04 +0000 (20:57 +1000)]
[REF] Fix jquery error message display on select2 field validation

4 years ago[REF] Fix allowing users to clear values for raido custom fields when not required
Seamus Lee [Sat, 20 Jun 2020 10:11:47 +0000 (20:11 +1000)]
[REF] Fix allowing users to clear values for raido custom fields when not required

4 years agoMerge pull request #16488 from mattwire/quickform_requiredfields
Seamus Lee [Sat, 20 Jun 2020 09:52:56 +0000 (19:52 +1000)]
Merge pull request #16488 from mattwire/quickform_requiredfields

Pass required attribute for quickform fields through to form

4 years agoFix master regression on inactive contact types
eileen [Sat, 20 Jun 2020 00:45:16 +0000 (12:45 +1200)]
Fix master regression on inactive contact types

Removing the WHERE type.name = NULL here makes sense

https://github.com/civicrm/civicrm-core/commit/351e8d470a95e1a610280731706c816033fb79fa#diff-ae3cfb8afd3fe1ab8f471b3a069563cdL244

but a few lines later an extra condition is added - we need the WHERE there to prevent it being
added to the join clause.

Note that I did something a bit yuck with the static. I want to properly re-write the function
with consistent caching but after it's under testing, hence a quick fix

4 years agoMerge pull request #17615 from seamuslee001/phpunit7_new
Seamus Lee [Sat, 20 Jun 2020 03:54:46 +0000 (13:54 +1000)]
Merge pull request #17615 from seamuslee001/phpunit7_new

Use PHPUnit7 as the primary test runner for PHP versions >= 7.1 when using the phpunit script

4 years agodev/core#1681 Block sites from upgrading if on a MySQL version less than 5.6.5
Seamus Lee [Mon, 8 Jun 2020 22:28:56 +0000 (08:28 +1000)]
dev/core#1681 Block sites from upgrading if on a MySQL version less than 5.6.5

Add in details of proposed MySQL 5.6 drop as well

4 years agoMerge pull request #17642 from eileenmcnaughton/trxn
Seamus Lee [Sat, 20 Jun 2020 01:54:44 +0000 (11:54 +1000)]
Merge pull request #17642 from eileenmcnaughton/trxn

[REF] Extract getTestTrxnID

4 years agoMerge pull request #17654 from eileenmcnaughton/cancel
Seamus Lee [Sat, 20 Jun 2020 01:53:39 +0000 (11:53 +1000)]
Merge pull request #17654 from eileenmcnaughton/cancel

Fix A.net to retrieve processor id from property bag

4 years ago[REF] Use PHPUnit7
Seamus Lee [Mon, 15 Jun 2020 00:31:52 +0000 (10:31 +1000)]
[REF] Use PHPUnit7

Fix tap printer

4 years agoMerge pull request #17663 from seamuslee001/prep_phpunit7
Eileen McNaughton [Sat, 20 Jun 2020 01:29:54 +0000 (13:29 +1200)]
Merge pull request #17663 from seamuslee001/prep_phpunit7

[NFC] Fix tests in prepartion for phpunit7

4 years agoThrow exception if id not passed into discard
eileen [Sat, 20 Jun 2020 01:13:13 +0000 (13:13 +1200)]
Throw exception if id not passed into discard

https://lab.civicrm.org/dev/drupal/-/issues/123 - may not be related but this seems a good precaution

4 years agodev/core#1829 - Custom Date field with format=yy displays calendar icon that doesn...
Jitendra Purohit [Fri, 19 Jun 2020 10:34:49 +0000 (16:04 +0530)]
dev/core#1829 - Custom Date field with format=yy displays calendar icon that doesn't work

4 years ago[NFC] Fix tests in prepartion for phpunit7
Seamus Lee [Fri, 19 Jun 2020 06:16:53 +0000 (16:16 +1000)]
[NFC] Fix tests in prepartion for phpunit7

4 years agoMerge pull request #17660 from seamuslee001/fixflexmailer
Seamus Lee [Fri, 19 Jun 2020 10:03:16 +0000 (20:03 +1000)]
Merge pull request #17660 from seamuslee001/fixflexmailer

[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix

4 years agoMerge pull request #17662 from seamuslee001/master
Seamus Lee [Fri, 19 Jun 2020 10:00:04 +0000 (20:00 +1000)]
Merge pull request #17662 from seamuslee001/master

Revert "[NFC] Fix tests in prepartion for phpunit7"

4 years agoRevert "[NFC] Fix tests in prepartion for phpunit7"
Seamus Lee [Fri, 19 Jun 2020 09:59:03 +0000 (19:59 +1000)]
Revert "[NFC] Fix tests in prepartion for phpunit7"

This reverts commit 11a56cfe5f918a54284b7614a9489d53c9c41208.

4 years agoMerge pull request #17661 from seamuslee001/prep_phpunit7
Seamus Lee [Fri, 19 Jun 2020 09:58:14 +0000 (19:58 +1000)]
Merge pull request #17661 from seamuslee001/prep_phpunit7

[NFC] Fix tests in preparation for phpunit7

4 years ago[NFC] Fix tests in prepartion for phpunit7
Seamus Lee [Fri, 19 Jun 2020 06:16:53 +0000 (16:16 +1000)]
[NFC] Fix tests in prepartion for phpunit7

4 years ago[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix
Seamus Lee [Fri, 19 Jun 2020 07:41:59 +0000 (17:41 +1000)]
[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix

4 years agoMerge pull request #17608 from seamuslee001/dev_translation_48
Seamus Lee [Fri, 19 Jun 2020 04:09:45 +0000 (14:09 +1000)]
Merge pull request #17608 from seamuslee001/dev_translation_48

dev/translation#48 Implement Brick/Money to better handle money values

4 years agoMerge pull request #17612 from eileenmcnaughton/format
Seamus Lee [Fri, 19 Jun 2020 02:05:59 +0000 (12:05 +1000)]
Merge pull request #17612 from eileenmcnaughton/format

[NFC] Remove instances where html is passed to crmMoney

4 years agodev/translation#48 Implement Brick/Money to better handle currecny values
Seamus Lee [Sun, 14 Jun 2020 04:24:36 +0000 (14:24 +1000)]
dev/translation#48 Implement Brick/Money to better handle currecny values

Added in test case as per Eileen comment so we know we can handle large floats