civicrm-core.git
3 years agoMerge pull request #17985 from demeritcowboy/sms-apiurl
Eileen McNaughton [Wed, 29 Jul 2020 05:24:26 +0000 (17:24 +1200)]
Merge pull request #17985 from demeritcowboy/sms-apiurl

dev/core#1909 - Avoid E_Notice on SMS provider form when no default url

3 years agoMerge pull request #17988 from eileenmcnaughton/cache_dup
Eileen McNaughton [Wed, 29 Jul 2020 04:31:20 +0000 (16:31 +1200)]
Merge pull request #17988 from eileenmcnaughton/cache_dup

Remove duplicate cache flush

3 years agoMerge pull request #17968 from eileenmcnaughton/cont_page
Seamus Lee [Wed, 29 Jul 2020 01:19:04 +0000 (11:19 +1000)]
Merge pull request #17968 from eileenmcnaughton/cont_page

[REF] Extract setUserContext on contribution form & cleanup on backend add membership form

3 years agoRemove duplicate cache flush
eileen [Wed, 29 Jul 2020 00:40:16 +0000 (12:40 +1200)]
Remove duplicate cache flush

As the comment points out CRM_ACL_BAO_Cache::resetCache is also called in CRM_Utils_System::flushCache
so we are running a query that is inclined to lock tables an extra time for no reason

3 years agoavoid notice when no default url
demeritcowboy [Tue, 28 Jul 2020 23:38:35 +0000 (19:38 -0400)]
avoid notice when no default url

3 years agoMerge pull request #17305 from mlutfy/core1755
Eileen McNaughton [Tue, 28 Jul 2020 23:05:32 +0000 (11:05 +1200)]
Merge pull request #17305 from mlutfy/core1755

dev/core#1755 Fix reCaptcha on Mailing Subscribe

3 years agoMerge pull request #17979 from eileenmcnaughton/is_email
Matthew Wire [Tue, 28 Jul 2020 14:01:21 +0000 (15:01 +0100)]
Merge pull request #17979 from eileenmcnaughton/is_email

[REF] Make explicit what we are doing with 'values' in this code

3 years ago[REF] Make explicit what we are doing with 'values' in this code
eileen [Mon, 27 Jul 2020 23:57:33 +0000 (11:57 +1200)]
[REF] Make explicit what we are doing with 'values' in this code

I've kept this really small so it can be verified by someone unfamiliar with this code.

Basically if you look you can see the only place 'values' is used is to determine if is_email_receipt is set.
That means everything else in  is unused & ergo we don't need to set it / can throw it away.

Obviously the next step is to extract all the code that determines  into a single place and say
goodbye to  altogether

3 years agoMerge pull request #17817 from colemanw/getChecksConfig
Eileen McNaughton [Mon, 27 Jul 2020 21:39:08 +0000 (09:39 +1200)]
Merge pull request #17817 from colemanw/getChecksConfig

Simplify caching of status checks

3 years agoMerge pull request #17920 from eileenmcnaughton/dupe
colemanw [Mon, 27 Jul 2020 21:31:52 +0000 (17:31 -0400)]
Merge pull request #17920 from eileenmcnaughton/dupe

[REF] Reduce interaction between dedupe code and createProfileContact

3 years agoMerge pull request #17977 from eileenmcnaughton/custom
Eileen McNaughton [Mon, 27 Jul 2020 19:40:43 +0000 (07:40 +1200)]
Merge pull request #17977 from eileenmcnaughton/custom

ensure custom field checkboxes are populated in profiles

3 years agoMerge pull request #17927 from monishdeb/core-785
Eileen McNaughton [Mon, 27 Jul 2020 19:36:28 +0000 (07:36 +1200)]
Merge pull request #17927 from monishdeb/core-785

dev/core#785 Differentiate smart group from regular group using icon in select2 field

3 years agoRevert "revert PR 13958"
Monish Deb [Thu, 23 Jul 2020 09:05:27 +0000 (14:35 +0530)]
Revert "revert PR 13958"

This reverts commit ba2ad46f76db57c8f9bea064e7ba4c5b5adefc83.

3 years agoMerge pull request #17974 from eileenmcnaughton/receipt
Matthew Wire [Mon, 27 Jul 2020 11:36:25 +0000 (12:36 +0100)]
Merge pull request #17974 from eileenmcnaughton/receipt

[REF] Minor code clean up

3 years agoensure custom field checkboxes are populated in profiles
Jamie McClelland [Tue, 9 Jun 2020 19:37:19 +0000 (15:37 -0400)]
ensure custom field checkboxes are populated in profiles

3 years agoMerge pull request #17976 from civicrm/5.28
Eileen McNaughton [Mon, 27 Jul 2020 09:58:50 +0000 (21:58 +1200)]
Merge pull request #17976 from civicrm/5.28

5.28 to master

3 years agoMerge pull request #17973 from seamuslee001/ref_profile_date_fields
Eileen McNaughton [Mon, 27 Jul 2020 09:58:19 +0000 (21:58 +1200)]
Merge pull request #17973 from seamuslee001/ref_profile_date_fields

[REF] Fix regression where adding any date based field onto a profile…

3 years ago[REF] Fix regression where adding any date based field onto a profile triggers an...
Seamus Lee [Mon, 27 Jul 2020 03:39:06 +0000 (13:39 +1000)]
[REF] Fix regression where adding any date based field onto a profile triggers an error date preferences not configured when previewing the profile

3 years ago[REF] Minor code clean up
eileen [Mon, 27 Jul 2020 03:55:44 +0000 (15:55 +1200)]
[REF] Minor code clean up

This just consolidates a little of the code used to determin if an email receipt should be sent.
It's clear that there is more code above that could be pulled into this & combined
with the isEmailReceipt function but I wanted to just offer up a small reviewable change unless
there is reviewer enthusiasm for more

3 years agoMerge pull request #17967 from eileenmcnaughton/grant
Seamus Lee [Mon, 27 Jul 2020 02:03:50 +0000 (12:03 +1000)]
Merge pull request #17967 from eileenmcnaughton/grant

[REF] Grant cleanup

3 years agoMerge pull request #17965 from seamuslee001/widget_test
Seamus Lee [Mon, 27 Jul 2020 01:54:57 +0000 (11:54 +1000)]
Merge pull request #17965 from seamuslee001/widget_test

[NFC] Add in a unit test of calling the contribution page widget endp…

3 years ago[REF] Extract setUserContext on contribution form & cleanup on backend add membership...
Matthew Wire [Sun, 10 May 2020 10:39:14 +0000 (11:39 +0100)]
[REF] Extract setUserContext on contribution form & cleanup on backend add membership form

3 years ago[REF] Grant cleanup
eileen [Mon, 27 Jul 2020 00:25:57 +0000 (12:25 +1200)]
[REF] Grant cleanup

This does a couple of things to cleanup the Grant BAO -
1) moves money handling back to the form layer
2) removes unnecessary date handling - the format that comes from the form layer
is now supported by the BAO.

I was looking to work on another but but then figured I needed a v4 api before
writing the tests and then realised we shouldn't do a v4 api before getting
rid of the legacy money handling.

It does occur to me it might make more sense to start moving to an
extension before doing any of the other steps

3 years ago[NFC] Add in a unit test of calling the contribution page widget endpoint and remove...
Seamus Lee [Sun, 26 Jul 2020 22:20:45 +0000 (08:20 +1000)]
[NFC] Add in a unit test of calling the contribution page widget endpoint and remove unneded file

3 years agoMerge pull request #17963 from civicrm/5.28
Seamus Lee [Sun, 26 Jul 2020 22:55:49 +0000 (08:55 +1000)]
Merge pull request #17963 from civicrm/5.28

5.28

3 years agoMerge pull request #17962 from seamuslee001/dev_core_1909_profile
Seamus Lee [Sun, 26 Jul 2020 22:49:17 +0000 (08:49 +1000)]
Merge pull request #17962 from seamuslee001/dev_core_1909_profile

dev/core#1909 Fix E-notice when adding a field on a profile

3 years agoMerge pull request #17964 from seamuslee001/dev_core_1909_paymentprocessor
Seamus Lee [Sun, 26 Jul 2020 22:28:35 +0000 (08:28 +1000)]
Merge pull request #17964 from seamuslee001/dev_core_1909_paymentprocessor

dev/core#1909 Fix e-notice when adding a payment processor

3 years agodev/core#1909 Fix e-notice when adding a payment processor
Seamus Lee [Sun, 26 Jul 2020 21:21:42 +0000 (07:21 +1000)]
dev/core#1909 Fix e-notice when adding a payment processor

3 years agoMerge pull request #17960 from demeritcowboy/contribution-default
Seamus Lee [Sun, 26 Jul 2020 21:18:38 +0000 (07:18 +1000)]
Merge pull request #17960 from demeritcowboy/contribution-default

dev/core#1911 - Default not being set for fixed contribution amounts or any price field that is not type text

3 years agodev/core#1909 Fix E-notice when adding a field on a profile
Seamus Lee [Sun, 26 Jul 2020 21:06:03 +0000 (07:06 +1000)]
dev/core#1909 Fix E-notice when adding a field on a profile

3 years agoMerge pull request #17959 from demeritcowboy/file-case-notice
Seamus Lee [Sun, 26 Jul 2020 21:01:22 +0000 (07:01 +1000)]
Merge pull request #17959 from demeritcowboy/file-case-notice

dev/core#1909 - E_NOTICE opening file-on-case

3 years agoMerge pull request #17941 from eileenmcnaughton/fieldspec
Seamus Lee [Sun, 26 Jul 2020 20:56:58 +0000 (06:56 +1000)]
Merge pull request #17941 from eileenmcnaughton/fieldspec

[Ref] Simplify field reference

3 years agodefault not being set for price fields
demeritcowboy [Sun, 26 Jul 2020 14:12:15 +0000 (10:12 -0400)]
default not being set for price fields

3 years agoE_NOTICE opening file-on-case
demeritcowboy [Sat, 25 Jul 2020 15:28:11 +0000 (11:28 -0400)]
E_NOTICE opening file-on-case

3 years agoMerge pull request #17957 from demeritcowboy/combine-createcase
Seamus Lee [Sat, 25 Jul 2020 20:27:35 +0000 (06:27 +1000)]
Merge pull request #17957 from demeritcowboy/combine-createcase

[Test framework] - Combine triplicate createCase functions

3 years agoMerge pull request #17932 from seamuslee001/ref_radio
Seamus Lee [Sat, 25 Jul 2020 20:26:53 +0000 (06:26 +1000)]
Merge pull request #17932 from seamuslee001/ref_radio

[REF] Refactor to use the standard CRM_Core_Form::addRadio function f…

3 years agocombine duplicate functions
demeritcowboy [Sat, 25 Jul 2020 15:41:35 +0000 (11:41 -0400)]
combine duplicate functions

3 years agoMerge pull request #17948 from seamuslee001/mail_mime_upgrade
Seamus Lee [Sat, 25 Jul 2020 08:00:39 +0000 (18:00 +1000)]
Merge pull request #17948 from seamuslee001/mail_mime_upgrade

Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer

3 years agoMerge pull request #17938 from seamuslee001/ref_fix_financial_account
Eileen McNaughton [Sat, 25 Jul 2020 06:34:30 +0000 (18:34 +1200)]
Merge pull request #17938 from seamuslee001/ref_fix_financial_account

[REF] Fix the default to_financial_account_id for generated transactions

3 years agoMerge pull request #17955 from colemanw/superstar
Eileen McNaughton [Sat, 25 Jul 2020 06:25:32 +0000 (18:25 +1200)]
Merge pull request #17955 from colemanw/superstar

APIv4 - Add keyword to select all custom fields

3 years agoUpgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer
Seamus Lee [Fri, 24 Jul 2020 22:41:32 +0000 (08:41 +1000)]
Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer

3 years agoMerge pull request #17946 from seamuslee001/ref_dompdf_upgrade
Eileen McNaughton [Sat, 25 Jul 2020 06:14:23 +0000 (18:14 +1200)]
Merge pull request #17946 from seamuslee001/ref_dompdf_upgrade

[REF] Upgrade dompdf version to be more compatible with PHP7.4

3 years agoAPIv4 - Add keyword to select all custom fields
Coleman Watts [Sat, 25 Jul 2020 01:44:13 +0000 (21:44 -0400)]
APIv4 - Add keyword to select all custom fields

3 years agoMerge pull request #17939 from eileenmcnaughton/ex_meta
Seamus Lee [Sat, 25 Jul 2020 00:50:42 +0000 (10:50 +1000)]
Merge pull request #17939 from eileenmcnaughton/ex_meta

[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements

3 years agoMerge pull request #17914 from demeritcowboy/invisible-messages
Eileen McNaughton [Sat, 25 Jul 2020 00:45:34 +0000 (12:45 +1200)]
Merge pull request #17914 from demeritcowboy/invisible-messages

dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes

3 years agoMerge pull request #17953 from civicrm/5.28
Eileen McNaughton [Sat, 25 Jul 2020 00:40:46 +0000 (12:40 +1200)]
Merge pull request #17953 from civicrm/5.28

5.28 to master

3 years agoMerge pull request #17947 from agh1/dev-core-1899-5-28
Eileen McNaughton [Sat, 25 Jul 2020 00:40:20 +0000 (12:40 +1200)]
Merge pull request #17947 from agh1/dev-core-1899-5-28

dev/core#1899 specify display mode for action links with icons

3 years agoMerge pull request #17949 from eileenmcnaughton/export_im
Eileen McNaughton [Fri, 24 Jul 2020 23:54:22 +0000 (11:54 +1200)]
Merge pull request #17949 from eileenmcnaughton/export_im

[REF] Remove unnecessary complexity on im export

3 years ago[REF] Remove unnecessary complexity on im export
eileen [Fri, 24 Jul 2020 22:54:20 +0000 (10:54 +1200)]
[REF] Remove unnecessary complexity on im export

This just removes a couple of lines that were already marked as being likely unhelpful. Because the impact of
these lines is tested the test needs tweaking too - but it only affects the name of the fields in the temp
table and in internal php keys

3 years agodev/core#1899 specify display mode for action links with icons
Andrew Hunt [Fri, 24 Jul 2020 00:46:27 +0000 (20:46 -0400)]
dev/core#1899 specify display mode for action links with icons

3 years ago[REF] Upgrade dompdf version to be more compatible with PHP7.4
Seamus Lee [Fri, 24 Jul 2020 21:50:26 +0000 (07:50 +1000)]
[REF] Upgrade dompdf version to be more compatible with PHP7.4

3 years agoMerge pull request #17945 from colemanw/commentCleanup
Seamus Lee [Fri, 24 Jul 2020 21:40:08 +0000 (07:40 +1000)]
Merge pull request #17945 from colemanw/commentCleanup

NFC - Docblock cleanup

3 years agoMerge pull request #17944 from colemanw/caseCheck
colemanw [Fri, 24 Jul 2020 19:13:20 +0000 (15:13 -0400)]
Merge pull request #17944 from colemanw/caseCheck

CRM_Utils_Check_Component_Case - Guard against post-upgrade crash

3 years agoNFC - Expand CRM-* comments with full @see annotations
Coleman Watts [Fri, 24 Jul 2020 19:10:29 +0000 (15:10 -0400)]
NFC - Expand CRM-* comments with full @see annotations

3 years agoNFC - Fix @return annotation in CRM_Utils_Check_Component_*
Coleman Watts [Fri, 24 Jul 2020 18:23:16 +0000 (14:23 -0400)]
NFC - Fix @return annotation in CRM_Utils_Check_Component_*

3 years agoCRM_Utils_Check_Component_Case - Guard against post-upgrade crash
Coleman Watts [Fri, 24 Jul 2020 17:45:18 +0000 (13:45 -0400)]
CRM_Utils_Check_Component_Case - Guard against post-upgrade crash

3 years agoMerge pull request #17940 from eileenmcnaughton/abort
colemanw [Fri, 24 Jul 2020 13:36:35 +0000 (09:36 -0400)]
Merge pull request #17940 from eileenmcnaughton/abort

Remove error checking by-pass in tests

3 years agoMerge pull request #17936 from eileenmcnaughton/cache
colemanw [Fri, 24 Jul 2020 12:59:04 +0000 (08:59 -0400)]
Merge pull request #17936 from eileenmcnaughton/cache

Remove extraneous opportunistic cache flush.

3 years ago[Ref] Simplify field reference
eileen [Fri, 24 Jul 2020 07:35:01 +0000 (19:35 +1200)]
[Ref] Simplify field reference

3 years agoRemove error checking by-pass in tests
eileen [Fri, 24 Jul 2020 07:01:13 +0000 (19:01 +1200)]
Remove error checking by-pass in tests

3 years ago[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements
eileen [Fri, 24 Jul 2020 06:50:23 +0000 (18:50 +1200)]
[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements

3 years ago[REF] Fix the default to_financial_account_id for generated transactions
Seamus Lee [Fri, 24 Jul 2020 05:42:05 +0000 (15:42 +1000)]
[REF] Fix the default to_financial_account_id for generated transactions

3 years agoRemove extraneous opportunistic cache flush.
eileen [Thu, 23 Jul 2020 03:57:48 +0000 (15:57 +1200)]
Remove extraneous opportunistic cache flush.

The opportunistic cache flush is already called by contact create and then again by each of the places
where the contact might be added to a group so this is just extraneous

3 years ago[REF] Refactor to use the standard CRM_Core_Form::addRadio function for a number...
Seamus Lee [Fri, 24 Jul 2020 00:12:37 +0000 (10:12 +1000)]
[REF] Refactor to use the standard CRM_Core_Form::addRadio function for a number of radio elements

3 years agoMerge pull request #17930 from twomice/1902_contrib_source_profile
Eileen McNaughton [Fri, 24 Jul 2020 00:05:22 +0000 (12:05 +1200)]
Merge pull request #17930 from twomice/1902_contrib_source_profile

dev/core#1902: "Contribution Source" profile field has no effect

3 years agoMerge pull request #17928 from colemanw/groupContactCleanup
Eileen McNaughton [Thu, 23 Jul 2020 23:01:53 +0000 (11:01 +1200)]
Merge pull request #17928 from colemanw/groupContactCleanup

[REF] GroupContact BAO - Minor code cleanup

3 years agoMerge pull request #17931 from civicrm/5.28
Eileen McNaughton [Thu, 23 Jul 2020 22:45:30 +0000 (10:45 +1200)]
Merge pull request #17931 from civicrm/5.28

5.28 to master

3 years agoMerge pull request #17929 from demeritcowboy/required-not-5.28
Eileen McNaughton [Thu, 23 Jul 2020 22:42:12 +0000 (10:42 +1200)]
Merge pull request #17929 from demeritcowboy/required-not-5.28

dev/core#1903 - Avoid E_WARNING and remove code

3 years agodev/core#1902: "Contribution Source" profile field has no effect on new contribution.
Allen Shaw [Thu, 23 Jul 2020 22:19:39 +0000 (17:19 -0500)]
dev/core#1902: "Contribution Source" profile field has no effect on new contribution.

3 years agoavoid E_WARNING and remove code
demeritcowboy [Thu, 23 Jul 2020 20:26:11 +0000 (16:26 -0400)]
avoid E_WARNING and remove code

3 years agoGroupContact BAO - Minor code cleanup
Coleman Watts [Thu, 23 Jul 2020 16:23:11 +0000 (12:23 -0400)]
GroupContact BAO - Minor code cleanup

3 years agoMerge pull request #17922 from eileenmcnaughton/group_contact
colemanw [Thu, 23 Jul 2020 16:18:26 +0000 (12:18 -0400)]
Merge pull request #17922 from eileenmcnaughton/group_contact

[REF] Minor function signuture cleanup

3 years agoMerge pull request #17921 from eileenmcnaughton/format
colemanw [Thu, 23 Jul 2020 13:05:41 +0000 (09:05 -0400)]
Merge pull request #17921 from eileenmcnaughton/format

[REF] Do not pass variable by reference

3 years ago[REF] Reduce interaction between dedupe code and createProfileContact
eileen [Thu, 23 Jul 2020 03:39:55 +0000 (15:39 +1200)]
[REF] Reduce interaction between dedupe code and createProfileContact

Ideally we want to simply call apiv4 from the deduper. However, it seems to take a bit of analysis to determine
if anything is done in there that might have some impact. This takes one step in that direction.  I copied the full function over
and then remove all the parts that are unreachable due to the passed in params or meaningless due to us not having Billing
fields. I think the Profile hooks are overkill - the merge hooks and contact hooks are being run and no profile is being submitted

3 years agoMerge pull request #17926 from civicrm/5.28
Eileen McNaughton [Thu, 23 Jul 2020 08:41:38 +0000 (20:41 +1200)]
Merge pull request #17926 from civicrm/5.28

5.28

3 years ago[REF] Minor function signuturre cleanup
eileen [Thu, 23 Jul 2020 04:06:23 +0000 (16:06 +1200)]
[REF] Minor function signuturre cleanup

 is never altered so it is unnecessary to pass by reference. visibility is just
used to set ignorePermissions

3 years agoMerge pull request #17925 from seamuslee001/5.28
Seamus Lee [Thu, 23 Jul 2020 06:44:09 +0000 (16:44 +1000)]
Merge pull request #17925 from seamuslee001/5.28

Add release-notes/5.27.3

3 years agoAdd release-notes/5.27.3
Tim Otten [Thu, 23 Jul 2020 04:53:40 +0000 (21:53 -0700)]
Add release-notes/5.27.3

3 years agoMerge pull request #17918 from mlutfy/docUpdates
Eileen McNaughton [Thu, 23 Jul 2020 04:20:45 +0000 (16:20 +1200)]
Merge pull request #17918 from mlutfy/docUpdates

[NFC] Update a few doc/wiki links in code comments

3 years ago[REF] Do not pass variable by reference
eileen [Thu, 23 Jul 2020 03:52:55 +0000 (15:52 +1200)]
[REF] Do not pass variable by reference

This variable is not altered in the function so does not need to be passed by reference

3 years agoMerge pull request #17916 from colemanw/domainCache
Seamus Lee [Thu, 23 Jul 2020 02:43:35 +0000 (12:43 +1000)]
Merge pull request #17916 from colemanw/domainCache

Improve caching of current domain

3 years agoMerge pull request #17778 from totten/master-setup-validate
Seamus Lee [Wed, 22 Jul 2020 21:49:10 +0000 (07:49 +1000)]
Merge pull request #17778 from totten/master-setup-validate

Setup UI - Validate that at least one "Component" is enabled

3 years agoMerge pull request #17911 from agh1/memberdetailreportautorenew
Seamus Lee [Wed, 22 Jul 2020 21:12:27 +0000 (07:12 +1000)]
Merge pull request #17911 from agh1/memberdetailreportautorenew

Member detail report: nest "in" options in parentheses

3 years agoUpdate a few doc/wiki links in code comments
Mathieu Lutfy [Wed, 22 Jul 2020 20:14:49 +0000 (16:14 -0400)]
Update a few doc/wiki links in code comments

3 years agoSimplify caching of status checks and fixes missing domain_id condition
Coleman Watts [Mon, 13 Jul 2020 18:26:46 +0000 (14:26 -0400)]
Simplify caching of status checks and fixes missing domain_id condition

Fixes a few apparent problems:
- domain_id was ommitted causing unexpected results
- Civi::cache was being read but never written to
- Object caching did not persist in memory across different check classes
- If we did write to Civi::cache there is no mechanism for clearing that cache when data changes

Solution: use simple array cache in Civi::$statics

3 years agoAPIv3 - If requesting current domain, read from cache
Coleman Watts [Wed, 22 Jul 2020 14:20:26 +0000 (10:20 -0400)]
APIv3 - If requesting current domain, read from cache

3 years agoUse sensible caching for current domain
Coleman Watts [Thu, 18 Jun 2020 16:21:54 +0000 (12:21 -0400)]
Use sensible caching for current domain

3 years agoMerge pull request #17917 from christianwach/lab-core-1901
colemanw [Wed, 22 Jul 2020 15:41:55 +0000 (11:41 -0400)]
Merge pull request #17917 from christianwach/lab-core-1901

Fix sticky table header on "Find Activities" page

3 years agoFix sticky table header on "Find Activities" page
Christian Wach [Wed, 22 Jul 2020 15:03:05 +0000 (16:03 +0100)]
Fix sticky table header on "Find Activities" page

3 years agoavoid messages not being shown
demeritcowboy [Wed, 22 Jul 2020 04:21:14 +0000 (00:21 -0400)]
avoid messages not being shown

3 years agoMember detail report: nest "in" options in parentheses
Andrew Hunt [Wed, 22 Jul 2020 01:49:20 +0000 (21:49 -0400)]
Member detail report: nest "in" options in parentheses

3 years agoMerge pull request #17908 from civicrm/5.28
Seamus Lee [Wed, 22 Jul 2020 00:26:56 +0000 (10:26 +1000)]
Merge pull request #17908 from civicrm/5.28

5.28

3 years agoMerge branch 'master' into 5.28
Seamus Lee [Wed, 22 Jul 2020 00:25:58 +0000 (10:25 +1000)]
Merge branch 'master' into 5.28

3 years agoMerge pull request #17906 from seamuslee001/lab_core_1846
Seamus Lee [Wed, 22 Jul 2020 00:13:27 +0000 (10:13 +1000)]
Merge pull request #17906 from seamuslee001/lab_core_1846

dev/core#1846 Make DAO upgrade safe

3 years agoFix failing settingTest and mark setting.fill as deprecated
Coleman Watts [Fri, 3 Jul 2020 16:20:04 +0000 (12:20 -0400)]
Fix failing settingTest and mark setting.fill as deprecated

The settingTest class was being too aggressive about creating and deleting domains,
this teaches it to not delete pre-existing domains.
Also marks an old unused api function deprecated.

3 years agoAdd upgrade-safe DAO::getSupportedFields method
Coleman Watts [Wed, 1 Jul 2020 17:25:31 +0000 (13:25 -0400)]
Add upgrade-safe DAO::getSupportedFields method

Switches api v3 and v4 to use that method so they are upgrade-safe by default.

3 years agoMerge pull request #17903 from eileenmcnaughton/format
Seamus Lee [Tue, 21 Jul 2020 22:23:45 +0000 (08:23 +1000)]
Merge pull request #17903 from eileenmcnaughton/format

[REF] remove unnecessary variable variables

3 years agoMerge pull request #17901 from demeritcowboy/outputhandler2
Seamus Lee [Tue, 21 Jul 2020 22:12:08 +0000 (08:12 +1000)]
Merge pull request #17901 from demeritcowboy/outputhandler2

dev/core#1855 - Allow different output formats for CiviReport results and untangle code

3 years agoMerge pull request #17650 from colemanw/getMultilingual
Seamus Lee [Tue, 21 Jul 2020 22:07:17 +0000 (08:07 +1000)]
Merge pull request #17650 from colemanw/getMultilingual

[REF] - Add helper function for the repetitive task of fetching multilingual

3 years agoMerge pull request #17905 from MegaphoneJon/fix-dummy-processor
Seamus Lee [Tue, 21 Jul 2020 20:31:44 +0000 (06:31 +1000)]
Merge pull request #17905 from MegaphoneJon/fix-dummy-processor

[unreleased regression] Dummy processor now is ID 7 on buildkit sites