civicrm-core.git
4 years agoCleanup customField prepareCreate function
Coleman Watts [Mon, 6 Apr 2020 15:36:37 +0000 (11:36 -0400)]
Cleanup customField prepareCreate function

4 years agoMerge pull request #16901 from eileenmcnaughton/settings
Matthew Wire [Mon, 6 Apr 2020 09:24:30 +0000 (10:24 +0100)]
Merge pull request #16901 from eileenmcnaughton/settings

Fix bug on handling 'is_required'

4 years agoMerge pull request #16953 from jitendrapurohit/core-1685
Seamus Lee [Mon, 6 Apr 2020 06:38:07 +0000 (16:38 +1000)]
Merge pull request #16953 from jitendrapurohit/core-1685

dev/core#1685 - Search builder returns DB error on Group => Empty filter

4 years agoMerge pull request #16623 from mattwire/tokenvalues
Eileen McNaughton [Mon, 6 Apr 2020 05:29:00 +0000 (17:29 +1200)]
Merge pull request #16623 from mattwire/tokenvalues

Fix values passed to tokenValues hook

4 years agoMerge pull request #16989 from colemanw/seeingDouble
colemanw [Mon, 6 Apr 2020 01:13:43 +0000 (21:13 -0400)]
Merge pull request #16989 from colemanw/seeingDouble

[REF] Cleanup custom field handling... twice

4 years agoMerge pull request #16984 from colemanw/ufGroupCleanup
colemanw [Mon, 6 Apr 2020 01:05:34 +0000 (21:05 -0400)]
Merge pull request #16984 from colemanw/ufGroupCleanup

Cleanup custom field handling in ufGroup BAO

4 years agoMerge pull request #16990 from colemanw/multi-cleanup4
Seamus Lee [Mon, 6 Apr 2020 00:16:30 +0000 (10:16 +1000)]
Merge pull request #16990 from colemanw/multi-cleanup4

[REF] Cleanup CustomField BAO to use its own isSerialized function

4 years agoMerge pull request #16988 from civicrm/5.25
Seamus Lee [Mon, 6 Apr 2020 00:14:22 +0000 (10:14 +1000)]
Merge pull request #16988 from civicrm/5.25

5.25

4 years agoMerge pull request #16991 from pradpnayak/customFieldDefaults
colemanw [Sun, 5 Apr 2020 23:39:13 +0000 (19:39 -0400)]
Merge pull request #16991 from pradpnayak/customFieldDefaults

Fix multiselect/checkbox custom field defaults on contribution online form

4 years agoMerge pull request #16981 from colemanw/fixCustom
colemanw [Sun, 5 Apr 2020 23:37:29 +0000 (19:37 -0400)]
Merge pull request #16981 from colemanw/fixCustom

Fix multiselect/checkbox custom field defaults on registration profile

4 years agoFix multiselect/checkbox custom field defaults on contribution online form
Pradeep Nayak [Sun, 5 Apr 2020 21:42:14 +0000 (22:42 +0100)]
Fix multiselect/checkbox custom field defaults on contribution online form

4 years agoCleanup CustomField BAO to use its own isSerialized function rather than guesswork
Coleman Watts [Sun, 5 Apr 2020 20:43:48 +0000 (16:43 -0400)]
Cleanup CustomField BAO to use its own isSerialized function rather than guesswork

4 years agoCleanup custom field handling... twice
Coleman Watts [Sun, 5 Apr 2020 20:25:37 +0000 (16:25 -0400)]
Cleanup custom field handling... twice

4 years agoMerge pull request #16978 from seamuslee001/5.25
Seamus Lee [Sun, 5 Apr 2020 20:17:23 +0000 (06:17 +1000)]
Merge pull request #16978 from seamuslee001/5.25

Add release-notes/5.24.1

4 years agoFix values passed to tokenValues hook
Matthew Wire [Mon, 24 Feb 2020 15:30:16 +0000 (15:30 +0000)]
Fix values passed to tokenValues hook

4 years agoCleanup custom field handling in ufGroup BAO
Coleman Watts [Sun, 5 Apr 2020 14:54:44 +0000 (10:54 -0400)]
Cleanup custom field handling in ufGroup BAO

4 years agoFix multiselect/checkbox custom field defaults on registration profile
Coleman Watts [Sun, 5 Apr 2020 14:05:21 +0000 (10:05 -0400)]
Fix multiselect/checkbox custom field defaults on registration profile

The CRM_Core_BAO_UFGroup::setProfileDefaults() function expects each field to be an array,
but this function was just passing it the number 1. So it did not have enough field metadata
to correctly format each value.

4 years agoMerge pull request #16980 from eileenmcnaughton/ex2
colemanw [Sun, 5 Apr 2020 12:51:37 +0000 (08:51 -0400)]
Merge pull request #16980 from eileenmcnaughton/ex2

[REF] Call makeCSVTable function directly from writeRows

4 years agoMerge pull request #16979 from eileenmcnaughton/cw
Eileen McNaughton [Sun, 5 Apr 2020 05:29:41 +0000 (17:29 +1200)]
Merge pull request #16979 from eileenmcnaughton/cw

Use isSerialized function rather guessing from html_type

4 years agoCall makeCSVTable function directly from writeRows
eileen [Mon, 25 Nov 2019 04:57:39 +0000 (17:57 +1300)]
Call makeCSVTable function directly from writeRows

4 years agoMerge pull request #16966 from demeritcowboy/add-nlbe
Eileen McNaughton [Sun, 5 Apr 2020 03:58:48 +0000 (15:58 +1200)]
Merge pull request #16966 from demeritcowboy/add-nlbe

dev/translation#4 - Add nl_BE language

4 years agoMerge pull request #16970 from colemanw/multi-cleanup2
Eileen McNaughton [Sun, 5 Apr 2020 02:30:22 +0000 (14:30 +1200)]
Merge pull request #16970 from colemanw/multi-cleanup2

[REF] CustomGroup - cleanup handling of serialized fields in old function

4 years agoUse isSerialized function rather guessing from html_type
Coleman Watts [Fri, 3 Apr 2020 14:38:28 +0000 (10:38 -0400)]
Use isSerialized function rather guessing from html_type

4 years agoAdd release-notes/5.24.1
Tim Otten [Sun, 5 Apr 2020 00:50:45 +0000 (17:50 -0700)]
Add release-notes/5.24.1

4 years agoMerge pull request #16975 from colemanw/multi-cleanup3
colemanw [Sat, 4 Apr 2020 13:37:46 +0000 (09:37 -0400)]
Merge pull request #16975 from colemanw/multi-cleanup3

[REF] CustomField - Remove pointless caching and move form variable to form class

4 years agoMerge pull request #16973 from eileenmcnaughton/pan
Seamus Lee [Sat, 4 Apr 2020 03:48:25 +0000 (14:48 +1100)]
Merge pull request #16973 from eileenmcnaughton/pan

Capitalise PAN truncation

4 years agoMerge pull request #16974 from civicrm/5.25
Eileen McNaughton [Sat, 4 Apr 2020 01:29:28 +0000 (14:29 +1300)]
Merge pull request #16974 from civicrm/5.25

5.25

4 years agoCustomField - Remove pointless caching and move form variable to form class
Coleman Watts [Fri, 3 Apr 2020 14:44:39 +0000 (10:44 -0400)]
CustomField - Remove pointless caching and move form variable to form class

4 years agoCustomGroup - Use isSerialized function rather than html_type
Coleman Watts [Fri, 3 Apr 2020 23:57:52 +0000 (19:57 -0400)]
CustomGroup - Use isSerialized function rather than html_type

4 years agoMerge pull request #16971 from totten/5.25-seqcredit
Seamus Lee [Fri, 3 Apr 2020 23:49:28 +0000 (10:49 +1100)]
Merge pull request #16971 from totten/5.25-seqcredit

dev/financial#84 - Fix upgrade failure. Thin-out activation logic for `sequentialcreditnotes`.

4 years agoCapitalise PAN truncation
eileen [Fri, 3 Apr 2020 22:48:29 +0000 (11:48 +1300)]
Capitalise PAN truncation

From chat translation channel:

"Pan truncation" should be written "PAN truncation" for Truncation of the primary account number (credit card number). Now it's obvious to translate!

4 years agoMerge pull request #16969 from seamuslee001/master
Seamus Lee [Fri, 3 Apr 2020 23:05:14 +0000 (10:05 +1100)]
Merge pull request #16969 from seamuslee001/master

[REF] Update XML file to match updated title in DAO File

4 years agodev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.
Tim Otten [Fri, 3 Apr 2020 22:22:44 +0000 (15:22 -0700)]
dev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.

Steps to reproduce
------------------

* Create a site based on `wp-demo` with Civi 5.21
* Make a DB snapshot
* Update code to 5.24
* In the web UI, run the DB upgrade
    * Note: It's important to use the web UI. The problem does not reproduce in CLI.

Before
------

The upgrader freezes on "Upgrade DB to 5.24.alpha1". The `CiviCRM.log` includes:

```
Apr 03 14:41:50  [info] Running task: Upgrade DB to 5.24.alpha1: SQL

Apr 03 14:41:55  [info] Running task: Install sequential creditnote extension

Apr 03 14:42:14  [info] $CRM_Queue_ErrorPolicy_reportError = Array
(
    [is_error] => 1
    [is_continue] => 0
    [exception] => Error 1: Uncaught Error: Class 'CRM_Volunteer_Permission' not found in /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/tools/extensions/civivolunteer/volunteer.php:497
Stack trace:
0 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook.php(286): volunteer_civicrm_permission(Array)
1 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook/WordPress.php(139): CRM_Utils_Hook->runHooks(Array, 'civicrm_permiss...', 1, Array, NULL, NULL, NULL, NULL, NULL)
2 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/Civi/Core/CiviEventDispatcher.php(86): CRM_Utils_Hook_WordPress->invokeViaUF(1, Array, NULL, NULL, NULL, NULL, NULL, 'civicrm_permiss...')
3 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/vendor/symfony/event-dispatcher/EventDispatcher.php(184): Civi\Core\CiviEventDispatcher::delegateToUF(Object(Civi\Core\Event\GenericHookEvent), 'hook_civicrm_p
    [last_task_title] => Install sequential creditnote extension
)
```

After
-----

The upgrade completes. After installation, the `sequentialcreditnotes` extension is active.

4 years agoCustomGroup - cleanup handling of serialized fields in old function
Coleman Watts [Fri, 3 Apr 2020 21:28:34 +0000 (17:28 -0400)]
CustomGroup - cleanup handling of serialized fields in old function

Use new isSeralized method rather than looking at html_type to figure out how to handle the data

4 years ago[REF] Update XML file to match updated title in DAO File
Seamus Lee [Fri, 3 Apr 2020 20:43:26 +0000 (07:43 +1100)]
[REF] Update XML file to match updated title in DAO File

4 years agoMerge pull request #16965 from colemanw/isset
colemanw [Fri, 3 Apr 2020 19:41:13 +0000 (15:41 -0400)]
Merge pull request #16965 from colemanw/isset

Code cleanup - replace overcomplicated test for null with isset

4 years agoCode cleanup - replace overcomplicated test for null with isset
Coleman Watts [Fri, 3 Apr 2020 15:06:33 +0000 (11:06 -0400)]
Code cleanup - replace overcomplicated test for null with isset

4 years agoMerge pull request #16964 from GuillaumeSorel/patch-1
Mathieu Lu [Fri, 3 Apr 2020 14:55:09 +0000 (10:55 -0400)]
Merge pull request #16964 from GuillaumeSorel/patch-1

Update FinancialTrxn.php

4 years agoUpdate FinancialTrxn.php
Guillaume Sorel [Fri, 3 Apr 2020 11:49:35 +0000 (13:49 +0200)]
Update FinancialTrxn.php

PAN is an acronym for Primary Account Number (credit card number) and writing it full in uppercase will make it more obvious for people to translate as I really wondered even with context what it meant.

4 years agoMerge pull request #16962 from civicrm/5.25
Seamus Lee [Fri, 3 Apr 2020 07:10:58 +0000 (18:10 +1100)]
Merge pull request #16962 from civicrm/5.25

5.25

4 years agoMerge pull request #16961 from MegaphoneJon/core-1688-525
Seamus Lee [Fri, 3 Apr 2020 00:54:34 +0000 (11:54 +1100)]
Merge pull request #16961 from MegaphoneJon/core-1688-525

core#1688 - false positive on missing custom field check

4 years agocore#1688 - false positive on missing custom field check
Jon Goldberg [Thu, 2 Apr 2020 18:07:33 +0000 (14:07 -0400)]
core#1688 - false positive on missing custom field check

4 years agoadd nl_BE language
demeritcowboy [Thu, 2 Apr 2020 21:59:21 +0000 (17:59 -0400)]
add nl_BE language

4 years agoMerge pull request #16700 from christianwach/lab-1635
Matthew Wire [Thu, 2 Apr 2020 17:36:44 +0000 (18:36 +0100)]
Merge pull request #16700 from christianwach/lab-1635

Fix WordPress support for Get UF Locale

4 years agodev/core#1685 - Search builder returns DB error on Group => Empty condition
Jitendra Purohit [Thu, 2 Apr 2020 07:17:23 +0000 (12:47 +0530)]
dev/core#1685 - Search builder returns DB error on Group => Empty condition

4 years agoSet version to 5.26.alpha1
CiviCRM [Thu, 2 Apr 2020 05:33:20 +0000 (05:33 +0000)]
Set version to 5.26.alpha1

4 years agoSet version to 5.25.beta1
CiviCRM [Thu, 2 Apr 2020 05:26:58 +0000 (05:26 +0000)]
Set version to 5.25.beta1

4 years agoMerge pull request #16753 from agh1/consolidated-php-version
Tim Otten [Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)]
Merge pull request #16753 from agh1/consolidated-php-version

dev/core#1528 - Consolidate to single constant for minimum PHP version

4 years agoCRM_Report_DAO_ReportInstance - Update checksum
Tim Otten [Thu, 2 Apr 2020 04:21:07 +0000 (21:21 -0700)]
CRM_Report_DAO_ReportInstance - Update checksum

4 years agoMerge pull request #16948 from eileenmcnaughton/email4
Tim Otten [Thu, 2 Apr 2020 04:14:16 +0000 (21:14 -0700)]
Merge pull request #16948 from eileenmcnaughton/email4

[REF] move buildQuickForm function to the trait

4 years agoMerge pull request #16951 from colemanw/dirtyMoney
Tim Otten [Thu, 2 Apr 2020 04:11:58 +0000 (21:11 -0700)]
Merge pull request #16951 from colemanw/dirtyMoney

Revert "APIv4 - Fix contribution create"

4 years agoRevert "APIv4 - Fix contribution create"
Coleman Watts [Thu, 2 Apr 2020 01:21:10 +0000 (21:21 -0400)]
Revert "APIv4 - Fix contribution create"

This reverts commit 2f97c5641cceec44c02585c2d1d212bda1c6228e.
It should no longer be needed due to the improvement made in 243320eda23195985815ceb65ec7ee9079ae3014.

4 years agoMerge pull request #16950 from eileenmcnaughton/clean_money
Seamus Lee [Thu, 2 Apr 2020 00:40:14 +0000 (11:40 +1100)]
Merge pull request #16950 from eileenmcnaughton/clean_money

Remove  deprecated cleaning  of money in  the  BAO layer

4 years agoRemove deprecated cleaning of money in the BAO layer
eileen [Wed, 1 Apr 2020 23:01:00 +0000 (12:01 +1300)]
Remove  deprecated cleaning  of money in  the  BAO layer

Any code that  passed dirty money  to the Contribution::create BAO will  have been seeing
deprecation notices  for  some time.  The  supported method is via the  api & v3 api does  the cleaning
whereas  v4 expects it to be pre-cleaned  - perhaps it's time to remove  this & leave it to  the
calling code

4 years agoMerge pull request #16947 from colemanw/groupByFunctions
Eileen McNaughton [Wed, 1 Apr 2020 22:57:04 +0000 (11:57 +1300)]
Merge pull request #16947 from colemanw/groupByFunctions

APIv4 - Support GROUP BY and aggregate functions

4 years agoMerge pull request #16943 from jitendrapurohit/core-1682
Eileen McNaughton [Wed, 1 Apr 2020 22:33:31 +0000 (11:33 +1300)]
Merge pull request #16943 from jitendrapurohit/core-1682

dev/core#1682 - Invalid currency  on sending offline membership receipt.

4 years agoMerge pull request #16919 from jaapjansma/dev-1674
Tim Otten [Wed, 1 Apr 2020 22:06:31 +0000 (15:06 -0700)]
Merge pull request #16919 from jaapjansma/dev-1674

dev/core#1674: fix rebuilding of container on every request

4 years ago(REF) CRM_Api4_Services - Cleanup extra comment/try/catch
Tim Otten [Wed, 1 Apr 2020 22:03:33 +0000 (15:03 -0700)]
(REF) CRM_Api4_Services - Cleanup extra comment/try/catch

4 years ago[REF] move buildQuickForm function to the trait
eileen [Tue, 31 Mar 2020 22:19:44 +0000 (11:19 +1300)]
[REF] move buildQuickForm function to the trait

Note that Contact had an extra assign. It seems likely the  extra  assign  is not required  but it
would not be a bad thing on the others

4 years agoMerge pull request #16940 from eileenmcnaughton/email4
colemanw [Wed, 1 Apr 2020 21:51:26 +0000 (17:51 -0400)]
Merge pull request #16940 from eileenmcnaughton/email4

[REF] Move properties to Trait

4 years agoAPIv4 - Fix contribution create
Coleman Watts [Wed, 1 Apr 2020 21:26:32 +0000 (17:26 -0400)]
APIv4 - Fix contribution create

4 years agoAPIv4 - Add SQL expression handling and aggregate functions
Coleman Watts [Tue, 31 Mar 2020 21:33:19 +0000 (17:33 -0400)]
APIv4 - Add SQL expression handling and aggregate functions

Adds a series of SqlExpression classes to parse and validate sql expressions used in SELECT, GROUP BY and ORDER BY clauses.
The framework can handle most sql functions, but this first commit adds support for the aggregate functions AVG, COUNT, MAX, MIN & SUM

4 years agoMerge pull request #16941 from jitendrapurohit/16845-followup
Eileen McNaughton [Wed, 1 Apr 2020 21:33:16 +0000 (10:33 +1300)]
Merge pull request #16941 from jitendrapurohit/16845-followup

Follow up PR for #16845 - Fix form error when  variable is NULL

4 years agoMerge pull request #16945 from lcdservices/dev-core-1683
Eileen McNaughton [Wed, 1 Apr 2020 21:24:33 +0000 (10:24 +1300)]
Merge pull request #16945 from lcdservices/dev-core-1683

fixes dev/core#1683 set profile frontend title

4 years agoApi4SelectQuery - add more metadata to apiFieldSpec
Coleman Watts [Mon, 30 Mar 2020 16:22:43 +0000 (12:22 -0400)]
Api4SelectQuery - add more metadata to apiFieldSpec

4 years agoAPIv4 - Add rudimentary support for groupBy
Coleman Watts [Sat, 21 Mar 2020 23:48:24 +0000 (19:48 -0400)]
APIv4 - Add rudimentary support for groupBy

4 years agoMerge pull request #16946 from civicrm/5.24
Seamus Lee [Wed, 1 Apr 2020 21:06:01 +0000 (08:06 +1100)]
Merge pull request #16946 from civicrm/5.24

5.24

4 years agoMerge pull request #16944 from alifrumin/5.24-rn
Seamus Lee [Wed, 1 Apr 2020 20:40:40 +0000 (07:40 +1100)]
Merge pull request #16944 from alifrumin/5.24-rn

[NFC] adding late changes to release notes for 5.24

4 years agofixes dev/core#1683 set profile frontend title
Brian Shaughnessy [Wed, 1 Apr 2020 18:52:10 +0000 (14:52 -0400)]
fixes dev/core#1683 set profile frontend title

4 years agolate changes to release notes
Alice Frumin [Wed, 1 Apr 2020 15:37:42 +0000 (11:37 -0400)]
late changes to release notes

4 years agodev/core#1682 - Invalid currency on sending offline membership receipt.
Jitendra Purohit [Wed, 1 Apr 2020 11:32:30 +0000 (17:02 +0530)]
dev/core#1682 - Invalid currency  on sending offline membership receipt.

4 years agoFollow up PR for #16845 - Fix form error when variable is NULL
Jitendra Purohit [Wed, 1 Apr 2020 10:50:08 +0000 (16:20 +0530)]
Follow up PR for #16845 - Fix form error when  variable is NULL

4 years agoMove properties to Trait
eileen [Tue, 31 Mar 2020 22:14:44 +0000 (11:14 +1300)]
Move properties to Trait

4 years agoMerge pull request #16935 from eileenmcnaughton/email_common
colemanw [Wed, 1 Apr 2020 09:37:32 +0000 (05:37 -0400)]
Merge pull request #16935 from eileenmcnaughton/email_common

[REF] Start transitioning EmailCommon class to a trait

4 years agodev/core#1674 - Update container cache when folder is removed or created
Tim Otten [Wed, 1 Apr 2020 08:00:07 +0000 (01:00 -0700)]
dev/core#1674 - Update container cache when folder is removed or created

Conceptually, you want to:

* (A) Keep the container cache when nothing has changed (regardless of whether that status-quo has an API4 subscriber folder).
* (B) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly created
* (C) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly removed

To test this out, I hacked `Civi\Core\Container::loadContainer()` to emit a debug message
to indicate if it is reusing the cache or updating. Then, I prepared two terminals for running alternate steps:

* In terminal 1, go back and forth with adding/removing folders/files like `Civi/Api4/Event/Subscriber`.
* In terminal 2, periodically run `cv ev 'echo "Hello\n";'` and note whether the cache is update.

In this way, we can see if a developer action (adding a file) leads to an automatic update in the cache.

I found that the previous commit fixed (A) and did (C), but it failed to
update per (B).  This commit should handle (A), (B), and (C).

4 years agoMerge pull request #16885 from demeritcowboy/test-getrelatedcases
Eileen McNaughton [Wed, 1 Apr 2020 03:54:28 +0000 (16:54 +1300)]
Merge pull request #16885 from demeritcowboy/test-getrelatedcases

[NFC/TEST] Resurrect unfinished test for getRelatedCases()

4 years agoMerge pull request #16921 from pradpnayak/newHook
Yashodha Chaku [Wed, 1 Apr 2020 03:18:37 +0000 (08:48 +0530)]
Merge pull request #16921 from pradpnayak/newHook

Add hook to alter display value or Custom field value

4 years agoMerge pull request #16938 from civicrm/5.24
Eileen McNaughton [Wed, 1 Apr 2020 02:33:11 +0000 (15:33 +1300)]
Merge pull request #16938 from civicrm/5.24

5.24

4 years agoMerge pull request #16937 from seamuslee001/5.24
Eileen McNaughton [Wed, 1 Apr 2020 02:32:53 +0000 (15:32 +1300)]
Merge pull request #16937 from seamuslee001/5.24

[REF] Fix handling of owner url parameter from Membership Dashboard

4 years ago[REF] Start transitioning EmailCommon class to a trait
eileen [Tue, 31 Mar 2020 21:08:20 +0000 (10:08 +1300)]
[REF] Start transitioning EmailCommon class to a trait

This is a really awful class - I've added a trait &  moved the calls from the various forms to that trait
so the code  on EmailCommon for buildForm is now only called once. I will follow up with more the same

4 years ago[REF] Fix handling of owner url parameter from Membership Dashboard
Seamus Lee [Wed, 1 Apr 2020 00:51:26 +0000 (11:51 +1100)]
[REF] Fix handling of owner url parameter from Membership Dashboard

4 years agoMerge pull request #16933 from eileenmcnaughton/member_search
Seamus Lee [Wed, 1 Apr 2020 00:45:40 +0000 (11:45 +1100)]
Merge pull request #16933 from eileenmcnaughton/member_search

dev/user-interface#14 Fix membership_status_id url handling (recent regression).

4 years agoMerge pull request #16930 from eileenmcnaughton/524
Seamus Lee [Wed, 1 Apr 2020 00:38:32 +0000 (11:38 +1100)]
Merge pull request #16930 from eileenmcnaughton/524

dev/core#1677 Fix multisite regression on domain membership types

4 years agoMerge pull request #16928 from eileenmcnaughton/email
colemanw [Tue, 31 Mar 2020 20:50:09 +0000 (16:50 -0400)]
Merge pull request #16928 from eileenmcnaughton/email

[REF] Remove fatal, fix some code comments

4 years agoMerge pull request #16932 from eileenmcnaughton/mailing_name
colemanw [Tue, 31 Mar 2020 15:43:28 +0000 (11:43 -0400)]
Merge pull request #16932 from eileenmcnaughton/mailing_name

dev/core#1656 Remove duplicate label

4 years agoMerge pull request #16929 from eileenmcnaughton/email2
colemanw [Tue, 31 Mar 2020 14:12:58 +0000 (10:12 -0400)]
Merge pull request #16929 from eileenmcnaughton/email2

[REF] extract code to getEmails

4 years agoMerge pull request #16927 from eileenmcnaughton/campaign
colemanw [Tue, 31 Mar 2020 14:09:46 +0000 (10:09 -0400)]
Merge pull request #16927 from eileenmcnaughton/campaign

[REF] Minor simplification - do not use variable variables

4 years agoMerge pull request #16868 from twomice/contribution_detail_pledge
Yashodha Chaku [Tue, 31 Mar 2020 10:23:14 +0000 (15:53 +0530)]
Merge pull request #16868 from twomice/contribution_detail_pledge

Add "pledge id" as column and filter in Contribution Detail report.

4 years agodev/user-interface#14 Fix membership_status_id url handling (recent regression).
eileen [Tue, 31 Mar 2020 08:31:44 +0000 (21:31 +1300)]
dev/user-interface#14 Fix membership_status_id url handling (recent regression).

The right fix here is to fix the xml to the  field setting it to export & adding a uniquename.

However, with our search focus moving on to the new search functionality in the pipeline & us having had
a hiatus on dealing with  search  code I think this more conservative change + a rc focus makes sense
at the  moment

4 years agoRemove duplicate label
eileen [Tue, 31 Mar 2020 07:25:15 +0000 (20:25 +1300)]
Remove duplicate label

4 years agoMerge pull request #16931 from civicrm/5.24
Eileen McNaughton [Tue, 31 Mar 2020 06:04:10 +0000 (19:04 +1300)]
Merge pull request #16931 from civicrm/5.24

5.24 to master

4 years agoMerge pull request #16926 from demeritcowboy/quickfix-case-addtimeline
Eileen McNaughton [Tue, 31 Mar 2020 05:57:54 +0000 (18:57 +1300)]
Merge pull request #16926 from demeritcowboy/quickfix-case-addtimeline

dev/core#1675 - Temporary regression fix for case add timeline

4 years agodev/core#1677 Fix multisite regression on domain membership types
eileen [Tue, 31 Mar 2020 05:12:33 +0000 (18:12 +1300)]
dev/core#1677 Fix multisite regression on domain membership types

Fixes a regression where membership types bleed between domains

4 years ago[REF] extract code to getEmails
eileen [Tue, 31 Mar 2020 04:51:01 +0000 (17:51 +1300)]
[REF] extract code to getEmails

4 years ago[REF] Remove fatal, fix some code comments
eileen [Tue, 31 Mar 2020 03:48:38 +0000 (16:48 +1300)]
[REF] Remove fatal, fix some code comments

4 years ago[REF] Minor simplification - do not use variable variables
eileen [Tue, 31 Mar 2020 03:38:23 +0000 (16:38 +1300)]
[REF] Minor simplification - do not use variable variables

This is a minor readabilty improvement because it's awful. Much more could be done....

4 years agotemp workaround for dev/core#1675
demeritcowboy [Mon, 30 Mar 2020 20:12:12 +0000 (16:12 -0400)]
temp workaround for dev/core#1675

4 years agoAdded unit test
Pradeep Nayak [Sun, 29 Mar 2020 19:57:39 +0000 (20:57 +0100)]
Added unit test

4 years agoAdd hook to alter display value or Custom field value
Pradeep Nayak [Thu, 11 Jul 2019 20:11:38 +0000 (21:11 +0100)]
Add hook to alter display value or Custom field value

4 years agoMerge pull request #16912 from eileenmcnaughton/conf_2
Matthew Wire [Mon, 30 Mar 2020 10:41:26 +0000 (11:41 +0100)]
Merge pull request #16912 from eileenmcnaughton/conf_2

[Test] Remove skip that seems no longer required