civicrm-core.git
5 years agoMerge pull request #13853 from agh1/5.12.0-releasenotes
Tim Otten [Wed, 3 Apr 2019 22:12:27 +0000 (15:12 -0700)]
Merge pull request #13853 from agh1/5.12.0-releasenotes

5.12.0 release notes

5 years agoUpdate 5.12.0.md
Tim Otten [Wed, 3 Apr 2019 21:53:26 +0000 (14:53 -0700)]
Update 5.12.0.md

5 years ago5.12.0 release notes: final edits
Andrew Hunt [Wed, 3 Apr 2019 21:42:56 +0000 (17:42 -0400)]
5.12.0 release notes: final edits

5 years ago5.12.0 release notes: late changes
Andrew Hunt [Wed, 3 Apr 2019 19:59:02 +0000 (15:59 -0400)]
5.12.0 release notes: late changes

5 years ago5.12.0 release notes: bulk of work
Alice Frumin [Tue, 19 Mar 2019 18:45:13 +0000 (14:45 -0400)]
5.12.0 release notes: bulk of work

5 years ago5.12.0 release notes: contributors
Alice Frumin [Tue, 19 Mar 2019 18:15:34 +0000 (14:15 -0400)]
5.12.0 release notes: contributors

5 years ago5.12.0 release notes: reorganizing
Alice Frumin [Tue, 19 Mar 2019 17:57:20 +0000 (13:57 -0400)]
5.12.0 release notes: reorganizing

5 years agoMerge pull request #13939 from eileenmcnaughton/website
Eileen McNaughton [Tue, 2 Apr 2019 20:36:36 +0000 (09:36 +1300)]
Merge pull request #13939 from eileenmcnaughton/website

dev/core/issues/842, Fixed code to update website rather delete

5 years agodev/core/issues/842, Fixed code to update website rather delete
Pradeep Nayak [Mon, 1 Apr 2019 20:40:19 +0000 (21:40 +0100)]
dev/core/issues/842, Fixed code to update website rather delete

5 years agoMerge pull request #13903 from agh1/userdashcontrib-5-12
Eileen McNaughton [Wed, 27 Mar 2019 20:12:44 +0000 (09:12 +1300)]
Merge pull request #13903 from agh1/userdashcontrib-5-12

Intra-RC regression: User dashboard: show most recent contributions, not earliest

5 years agoUser dash: adjust test to make sure contributions are chronological
Andrew Hunt [Wed, 27 Mar 2019 17:31:37 +0000 (13:31 -0400)]
User dash: adjust test to make sure contributions are chronological

5 years agoUser dash: show most recent contributions, not earliest
Andrew Hunt [Wed, 27 Mar 2019 15:43:34 +0000 (11:43 -0400)]
User dash: show most recent contributions, not earliest

5 years agoMerge pull request #13893 from colemanw/dev/core#821
Seamus Lee [Wed, 27 Mar 2019 00:42:19 +0000 (11:42 +1100)]
Merge pull request #13893 from colemanw/dev/core#821

[Regression] dev/core#821 - Fix entityRef filter value selection

5 years agodev/core#821 - Fix entityRef filter value selection
Coleman Watts [Tue, 26 Mar 2019 14:16:11 +0000 (10:16 -0400)]
dev/core#821 - Fix entityRef filter value selection

5 years agoMerge pull request #13881 from jitendrapurohit/core-812-rc
Eileen McNaughton [Fri, 22 Mar 2019 12:37:00 +0000 (01:37 +1300)]
Merge pull request #13881 from jitendrapurohit/core-812-rc

dev/core#812 - Fix null display of contribution row on …

5 years agodev/core#812 - RC equivalent for null display of contribution row on contact summary...
Jitendra Purohit [Fri, 22 Mar 2019 09:54:47 +0000 (15:24 +0530)]
dev/core#812 - RC equivalent for null display of contribution row on contact summary page

5 years agoMerge pull request #13876 from colemanw/menuRestore
Eileen McNaughton [Fri, 22 Mar 2019 00:18:11 +0000 (13:18 +1300)]
Merge pull request #13876 from colemanw/menuRestore

dev/core#814 Fix menu restore link

5 years agoFix menu restore link
Coleman Watts [Thu, 21 Mar 2019 16:32:56 +0000 (12:32 -0400)]
Fix menu restore link

5 years ago5.12.0 release notes: added boilerplate
Andrew Hunt [Mon, 18 Mar 2019 17:57:16 +0000 (13:57 -0400)]
5.12.0 release notes: added boilerplate

5 years ago5.12.0 release notes: raw from script
Andrew Hunt [Mon, 18 Mar 2019 17:46:49 +0000 (13:46 -0400)]
5.12.0 release notes: raw from script

5 years agoMerge pull request #13825 from mlutfy/dev801-5-12
Eileen McNaughton [Fri, 15 Mar 2019 20:53:40 +0000 (09:53 +1300)]
Merge pull request #13825 from mlutfy/dev801-5-12

dev/core#801 Fix from email on PDF Letters, such as Thank You Letters.

5 years agoMerge pull request #13820 from colemanw/dev/core#790
Eileen McNaughton [Fri, 15 Mar 2019 20:40:55 +0000 (09:40 +1300)]
Merge pull request #13820 from colemanw/dev/core#790

dev/core#790 - Exclue menubar on frontend pages

5 years agoMerge pull request #13796 from eileenmcnaughton/exceptions
Eileen McNaughton [Thu, 14 Mar 2019 23:36:38 +0000 (12:36 +1300)]
Merge pull request #13796 from eileenmcnaughton/exceptions

dev/core#659 Catch payment processor exceptions, log, hide, do not return 500 error

5 years agodev/core#801 Fix from email on PDF Letters, such as Thank You Letters.
Mathieu Lutfy [Thu, 14 Mar 2019 16:47:31 +0000 (12:47 -0400)]
dev/core#801 Fix from email on PDF Letters, such as Thank You Letters.

5 years agoCatch payment processor exceptions, log, hide, do not return 500 error
eileen [Sat, 9 Mar 2019 01:41:47 +0000 (14:41 +1300)]
Catch payment processor exceptions, log, hide, do not return 500 error

5 years agodev/core#790 - Exclue menubar on frontend pages
Coleman Watts [Thu, 14 Mar 2019 16:38:35 +0000 (12:38 -0400)]
dev/core#790 - Exclue menubar on frontend pages

5 years agoMerge pull request #13801 from eileenmcnaughton/5.12
Seamus Lee [Wed, 13 Mar 2019 21:14:43 +0000 (08:14 +1100)]
Merge pull request #13801 from eileenmcnaughton/5.12

Fix unrelased regression where activity date relative filters are ingnored in the rc

5 years agoMerge pull request #13808 from totten/5.12-wp-e2e
Eileen McNaughton [Wed, 13 Mar 2019 19:12:14 +0000 (08:12 +1300)]
Merge pull request #13808 from totten/5.12-wp-e2e

(ops#878) (Fast)ArrayDecorator - Emit expected exception when using WP and strict PSR-16

5 years ago(Fast)ArrayDecorator - Emit expected exception when using WP and strict PSR-16
Tim Otten [Wed, 13 Mar 2019 05:15:20 +0000 (22:15 -0700)]
(Fast)ArrayDecorator - Emit expected exception when using WP and strict PSR-16

Suppose someone calls `ArrayDecorator::get()` or `FastArrayDecorator::get()`
with an invalid key (e.g.  passing `float` or an `array` instead of a
`string`).  This patch improves error-reporting for that scenario.

This is primarily about fixing multiple test failures in `E2E_Cache_ArrayDecoratorTest` reported on `wp-demo`. These
generally look like

```
1) E2E_Cache_ArrayDecoratorTest::testGetInvalidKeys with data set #1 (true)
array_key_exists(): The first argument should be either a string or an integer

/Users/totten/bknix/build/wpmaster/wp-content/plugins/civicrm/civicrm/CRM/Utils/Cache/ArrayDecorator.php:102
/Users/totten/bknix/build/wpmaster/wp-content/plugins/civicrm/civicrm/packages/Cache/IntegrationTests/LegacySimpleCacheTest.php:409
/Users/totten/bknix/civicrm-buildkit/extern/phpunit5/phpunit5.phar:598
```

Before
------

The ArrayDecorator first checks its front cache (`array_key_exists`) to see if the key is defined.  In the `wp-demo`
environment, this produces a warning and causes the test to fail.

The condition *is* erroneous, but PSR-16 specifies that the error should be reported as exception.

After
-----

The condition is reported as the expected exception. The test passes on `wp-demo`.

Comment
-------

This brings the code in `(Fast)ArrayDecorator.php` into alignment with most of the other `CRM/Utils/Cache/*.php`
drivers; in most drivers, it is typical to validate the key at the start of most functions.

5 years agoFix relative dates when searching on activity_date_time
eileen [Tue, 12 Mar 2019 00:39:51 +0000 (13:39 +1300)]
Fix relative dates when searching on activity_date_time

In testing I found that there is an unreleased regression relating to our date conversion
on activity_date_time in activity search. This fixes and adds tests. (regression was it
was being ignored).

Note that the option value is capitalised which makes the capitalisation slightly odd but
I think accepting that is the least bad option

5 years agoFormatting cleanup
eileen [Tue, 12 Mar 2019 00:11:15 +0000 (13:11 +1300)]
Formatting cleanup

5 years agoSet version to 5.12.beta1
CiviCRM [Thu, 7 Mar 2019 01:26:52 +0000 (01:26 +0000)]
Set version to 5.12.beta1

5 years agoMerge pull request #13777 from seamuslee001/master
Tim Otten [Thu, 7 Mar 2019 01:23:50 +0000 (17:23 -0800)]
Merge pull request #13777 from seamuslee001/master

Merge forward 5.11 => master

5 years agoMerge in 5.11
Seamus Lee [Thu, 7 Mar 2019 01:12:52 +0000 (12:12 +1100)]
Merge in 5.11

5 years agoMerge pull request #13594 from agh1/5.11.0-releasenotes
Tim Otten [Thu, 7 Mar 2019 00:23:36 +0000 (16:23 -0800)]
Merge pull request #13594 from agh1/5.11.0-releasenotes

5.11.0 release notes

5 years ago5.11.0 release notes: late changes
Andrew Hunt [Wed, 6 Mar 2019 22:54:30 +0000 (17:54 -0500)]
5.11.0 release notes: late changes

5 years agoSet version to 5.11.0
CiviCRM [Wed, 6 Mar 2019 22:11:50 +0000 (22:11 +0000)]
Set version to 5.11.0

5 years agoMerge pull request #13773 from eileenmcnaughton/5.11-
Seamus Lee [Wed, 6 Mar 2019 21:58:17 +0000 (08:58 +1100)]
Merge pull request #13773 from eileenmcnaughton/5.11-

dev/core#745 Further on_hold fix - it has been suggested the value might be an array like ['']

5 years ago5.11.0 release notes: bulk of work from Alice
Alice Frumin [Wed, 6 Mar 2019 21:49:48 +0000 (16:49 -0500)]
5.11.0 release notes: bulk of work from Alice

* moving things to misc

* organizing prs

* linking to gitlab issues

* first stab

* more release notes

* more release notes progress

* annotating

* cleaning up

* updating contributers

5 years ago5.11.0 release notes: added boilerplate
Andrew Hunt [Thu, 14 Feb 2019 15:48:50 +0000 (10:48 -0500)]
5.11.0 release notes: added boilerplate

5 years ago5.11.0 release notes: raw from script
Andrew Hunt [Thu, 14 Feb 2019 15:46:36 +0000 (10:46 -0500)]
5.11.0 release notes: raw from script

5 years agoMerge pull request #13770 from eileenmcnaughton/mcrypt
colemanw [Wed, 6 Mar 2019 21:36:05 +0000 (16:36 -0500)]
Merge pull request #13770 from eileenmcnaughton/mcrypt

Remove mcrypt system status check

5 years agoMerge pull request #13766 from eileenmcnaughton/api_between
Eileen McNaughton [Wed, 6 Mar 2019 20:05:35 +0000 (09:05 +1300)]
Merge pull request #13766 from eileenmcnaughton/api_between

Fix api bug whereby 0 & '0' are not accepted as range parameters for BETWEEN

5 years agoMerge pull request #13283 from aydun/token_note_fix
Seamus Lee [Wed, 6 Mar 2019 19:54:38 +0000 (06:54 +1100)]
Merge pull request #13283 from aydun/token_note_fix

Render Note field tokens correctly - they are already HTML.

5 years agoMerge pull request #13776 from lcdservices/dev-core-644
Seamus Lee [Wed, 6 Mar 2019 19:53:38 +0000 (06:53 +1100)]
Merge pull request #13776 from lcdservices/dev-core-644

dev/core#644 fix from address before calling hook

5 years agodev/core#644 fix from address before calling hook
Brian Shaughnessy [Wed, 6 Mar 2019 17:34:28 +0000 (12:34 -0500)]
dev/core#644 fix from address before calling hook

5 years agoMerge pull request #13756 from eileenmcnaughton/payment_try2
Monish Deb [Wed, 6 Mar 2019 09:03:16 +0000 (14:33 +0530)]
Merge pull request #13756 from eileenmcnaughton/payment_try2

[REF] separate financial handling & component transitioning in Payment.create

5 years agoFurther on_hold fix - it has been suggested the value might be an array like ['']
eileen [Wed, 6 Mar 2019 03:38:03 +0000 (16:38 +1300)]
Further on_hold fix - it has been suggested the value might be an array like ['']

This would filter that out

5 years agoMerge pull request #13754 from eileenmcnaughton/5.11-
Seamus Lee [Wed, 6 Mar 2019 03:32:48 +0000 (14:32 +1100)]
Merge pull request #13754 from eileenmcnaughton/5.11-

dev/core#745 do not filter on 'on_hold' if it is an empty string

5 years agoMerge pull request #13771 from mattwire/typo
Eileen McNaughton [Wed, 6 Mar 2019 01:11:46 +0000 (14:11 +1300)]
Merge pull request #13771 from mattwire/typo

Fix typo in comments

5 years agoMerge pull request #13769 from eileenmcnaughton/matt
Eileen McNaughton [Wed, 6 Mar 2019 01:11:12 +0000 (14:11 +1300)]
Merge pull request #13769 from eileenmcnaughton/matt

Removes redundant IF

5 years agoTypo in comments
Matthew Wire (MJW Consulting) [Tue, 5 Mar 2019 23:25:43 +0000 (23:25 +0000)]
Typo in comments

5 years agoMerge pull request #13758 from eileenmcnaughton/no_load
Eileen McNaughton [Tue, 5 Mar 2019 23:20:28 +0000 (12:20 +1300)]
Merge pull request #13758 from eileenmcnaughton/no_load

Do not load membership contribution as updateMembershipBasedOnCompletionOfContribution loads it within the function

5 years agoRemove mcrypt system status check
eileen [Tue, 5 Mar 2019 23:18:38 +0000 (12:18 +1300)]
Remove mcrypt system status check

Php 7.2 doesn't support this & it is being deprecated so having this here causes
sites to try to install it - creating a migration problem they wouldn't otherwise have

The situation here is unresolved but this check doesn't solve more confusion than it creates

5 years agoRemoves redundant IF
eileen [Tue, 5 Mar 2019 23:11:51 +0000 (12:11 +1300)]
Removes redundant IF

 self::getRelatedMemberships already filters out empty rows. I left removing this
IF for it's own PR due to the legibility issues in the whitespace change

5 years agoMerge pull request #13759 from eileenmcnaughton/matt
Eileen McNaughton [Tue, 5 Mar 2019 23:08:04 +0000 (12:08 +1300)]
Merge pull request #13759 from eileenmcnaughton/matt

[REF] towards cleanup of update membership code

5 years agoMerge pull request #13735 from eileenmcnaughton/query_extract
Eileen McNaughton [Tue, 5 Mar 2019 22:55:22 +0000 (11:55 +1300)]
Merge pull request #13735 from eileenmcnaughton/query_extract

Extract getSearchSQLParts function

5 years agoMerge pull request #13746 from eileenmcnaughton/activity_search
Seamus Lee [Tue, 5 Mar 2019 22:41:13 +0000 (09:41 +1100)]
Merge pull request #13746 from eileenmcnaughton/activity_search

Convert activity_date_time field to datepicker and add support for url input

5 years agoAdd enotice handling for weird s....'
eileen [Tue, 5 Mar 2019 21:30:33 +0000 (10:30 +1300)]
Add enotice handling for weird s....'

5 years agoFix related search classes to have the same signature
eileen [Mon, 4 Mar 2019 01:54:29 +0000 (14:54 +1300)]
Fix related search classes to have the same signature

5 years agoAdd form rule for chronological ordeR
eileen [Mon, 4 Mar 2019 00:47:35 +0000 (13:47 +1300)]
Add form rule for chronological ordeR

5 years agoFix group conversion to add relative key
eileen [Sun, 3 Mar 2019 22:09:16 +0000 (11:09 +1300)]
Fix group conversion to add relative key

Old format doesn't seem to have it

5 years agoAdd upgrade routine
eileen [Sun, 3 Mar 2019 20:09:50 +0000 (09:09 +1300)]
Add upgrade routine

5 years agoConvert activity_date_time field to datepicker and add support for url input
eileen [Sat, 2 Mar 2019 05:48:47 +0000 (18:48 +1300)]
Convert activity_date_time field to datepicker and add support for url input

This converts the form to being a metadata defined field & a date-picker field as well
as adding standardised url support for input.

The input format is
activity_date_time_high=20100101

I stripped out the complex and probably broken based on feedback  & not used in core
existing hard-coded url support.

Note that there are some outstanding items
1) the upgrade script item needs to be added - this includes dealing with renaming of the field
since I made it more consistent
2) I stripped out the check to ensure the high date is greater than the low date
- if we still want this we should re-add as a generic thing. My guess is it's a bit optional

5 years agoFix api bug whereby 0 & '0' are not accepted as range parameters for BETWEEN
eileen [Tue, 5 Mar 2019 00:21:36 +0000 (13:21 +1300)]
Fix api bug whereby 0 & '0' are not accepted as range parameters for BETWEEN

In other news I'm not thrilled about the 0 casting to a string here but that is for another time

5 years agoCall getSearchSQLParts to get the desired part instead of sql wrangling
eileen [Tue, 5 Mar 2019 00:05:16 +0000 (13:05 +1300)]
Call getSearchSQLParts to get the desired part instead of sql wrangling

5 years agoExtract getSearchSQLParts function
eileen [Thu, 28 Feb 2019 22:49:46 +0000 (11:49 +1300)]
Extract getSearchSQLParts function

5 years agoMerge pull request #13720 from eileenmcnaughton/extract_2
Eileen McNaughton [Mon, 4 Mar 2019 23:32:29 +0000 (12:32 +1300)]
Merge pull request #13720 from eileenmcnaughton/extract_2

Speed up contribution results by removing join on civicrm_financial_type table when rendering search results.

5 years agoMerge pull request #13765 from seamuslee001/test_empty_on_hold
Eileen McNaughton [Mon, 4 Mar 2019 23:31:53 +0000 (12:31 +1300)]
Merge pull request #13765 from seamuslee001/test_empty_on_hold

Try and add data set example where email_on_hold / on_hold is NULL in…

5 years ago[REF] towards cleanup of update membership code
eileen [Mon, 4 Mar 2019 04:11:20 +0000 (17:11 +1300)]
[REF] towards cleanup of update membership code

This PR limits itself to siphoning off how the memberships are fetched & having that function
- return as an array of arrays rather than an array of objects
- index the array by id rather than membership type

This is a step towards the changes in https://github.com/civicrm/civicrm-core/pull/12542

& it should allow a separation of concerns relating to the LOADING of memberships from the
processing.

I note that the PR I'm looking at changes what gets loaded & that should be it's own PR
but also that there is an extraneous if() here - I didn't alter that because
it is a big white space change & doing on it's own will make that easy to review

5 years agoEliminate unnecessary join to civicrm_financial_type table to improve performance
eileen [Thu, 28 Feb 2019 03:55:21 +0000 (16:55 +1300)]
Eliminate unnecessary join to civicrm_financial_type table to improve performance

Although this join is indexed it affects index choice, often causing the right index not to
be used and slowing performance. I got subtantial speed improvement by eliminating this join

5 years agoAdd hack for qill
eileen [Thu, 28 Feb 2019 05:06:14 +0000 (18:06 +1300)]
Add hack for qill

This is a very minor extension of an existing hack but we should de-hack at some point.

Before this the qill is broken on payment instrument & contribution page too

5 years agoUse generic pseudoconstant declaration methodology to add financial_type to pseudocon...
eileen [Thu, 28 Feb 2019 01:21:59 +0000 (14:21 +1300)]
Use generic pseudoconstant declaration methodology to add financial_type to pseudoconstants

Getting away from the hard-hack allows us to have more consistent metadata for generic fields

5 years agoMerge pull request #13751 from seamuslee001/upgrade_karma
Seamus Lee [Mon, 4 Mar 2019 21:35:32 +0000 (08:35 +1100)]
Merge pull request #13751 from seamuslee001/upgrade_karma

Upgrade Karma version to latest version

5 years agoTry and add data set eaxmple where email_on_hold / on_hold is NULL in the formValues
Seamus Lee [Mon, 4 Mar 2019 21:31:20 +0000 (08:31 +1100)]
Try and add data set eaxmple where email_on_hold / on_hold is NULL in the formValues

5 years agoMerge pull request #13664 from eileenmcnaughton/activity_perms
colemanw [Mon, 4 Mar 2019 20:38:13 +0000 (15:38 -0500)]
Merge pull request #13664 from eileenmcnaughton/activity_perms

Rationalise Activity api ACLs for consistency, to respect the hook & improve performance

5 years agoMerge pull request #13761 from yashodha/reports
Eileen McNaughton [Mon, 4 Mar 2019 20:12:01 +0000 (09:12 +1300)]
Merge pull request #13761 from yashodha/reports

report clean up - remove redundant code

5 years agoMerge pull request #13726 from avall-llovera/patch-1
Yashodha Chaku [Mon, 4 Mar 2019 13:35:04 +0000 (19:05 +0530)]
Merge pull request #13726 from avall-llovera/patch-1

dev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'

5 years agoreport clean up - remove redundant code
yashodha [Mon, 4 Mar 2019 11:44:29 +0000 (17:14 +0530)]
report clean up - remove redundant code

5 years agoMerge pull request #13760 from civicrm/5.11
Eileen McNaughton [Mon, 4 Mar 2019 06:51:22 +0000 (19:51 +1300)]
Merge pull request #13760 from civicrm/5.11

5.11

5 years agoMerge pull request #13653 from MegaphoneJon/reporting-8
Yashodha Chaku [Mon, 4 Mar 2019 06:33:42 +0000 (12:03 +0530)]
Merge pull request #13653 from MegaphoneJon/reporting-8

reporting#8 - add thank-you dates to Contribution Summary/Detail reports

5 years agoMerge pull request #13757 from eileenmcnaughton/payment_extract
Eileen McNaughton [Mon, 4 Mar 2019 06:12:53 +0000 (19:12 +1300)]
Merge pull request #13757 from eileenmcnaughton/payment_extract

[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstantt::contributionStatus

5 years agoMerge pull request #13755 from eileenmcnaughton/event_fix
Seamus Lee [Mon, 4 Mar 2019 05:19:00 +0000 (16:19 +1100)]
Merge pull request #13755 from eileenmcnaughton/event_fix

dev/core#766 fix loss of custom fields when creating an event from template

5 years ago[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstant::contributionS...
eileen [Mon, 4 Mar 2019 02:31:17 +0000 (15:31 +1300)]
[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstant::contributionStatus

This makes the function much more readable. I felt that the is_payment logic should go but
resisted & just commented

5 years agoDo not load membership contribution as updateMembershipBasedOnCompletionOfContributio...
eileen [Mon, 4 Mar 2019 03:42:54 +0000 (16:42 +1300)]
Do not load membership contribution as updateMembershipBasedOnCompletionOfContribution loads it within the function

5 years agoMerge pull request #13695 from eileenmcnaughton/extract_activity
Monish Deb [Mon, 4 Mar 2019 03:38:01 +0000 (09:08 +0530)]
Merge pull request #13695 from eileenmcnaughton/extract_activity

[ref] Extract activity payment creation

5 years ago[REF] separate financial handling & component transitioning in Payment.create
eileen [Mon, 4 Mar 2019 02:07:18 +0000 (15:07 +1300)]
[REF] separate financial handling & component transitioning in Payment.create

5 years agodev/core#766 fix loss of custom fields when creating an event from template
eileen [Mon, 4 Mar 2019 01:32:07 +0000 (14:32 +1300)]
dev/core#766 fix loss of custom fields when creating an event from template

5 years agodev/core#745 do not filter on 'on_hold' if it is an empty string
eileen [Mon, 4 Mar 2019 01:11:10 +0000 (14:11 +1300)]
dev/core#745 do not filter on 'on_hold' if it is an empty string

Although I couldn't replicate this apparently in groups created in an earlier version it could
be. We only care about number (0 or 1) or arrays (from the select widget)
so add an extra check

5 years agoMerge pull request #13753 from seamuslee001/event_form_class_fix
Seamus Lee [Mon, 4 Mar 2019 01:07:49 +0000 (12:07 +1100)]
Merge pull request #13753 from seamuslee001/event_form_class_fix

Fix Custom post outer div class on event registration form

5 years agoFix Custom post outer div class on event registration form
Seamus Lee [Sun, 3 Mar 2019 23:49:33 +0000 (10:49 +1100)]
Fix Custom post outer div class on event registration form

5 years agoMerge pull request #13741 from jitendrapurohit/core-770
Eileen McNaughton [Sun, 3 Mar 2019 19:49:12 +0000 (08:49 +1300)]
Merge pull request #13741 from jitendrapurohit/core-770

dev/core#770 - View Case Activity page displays disabled custom fields

5 years agoMerge pull request #13690 from eileenmcnaughton/cleanup_payment_create
Monish Deb [Sun, 3 Mar 2019 08:11:07 +0000 (13:41 +0530)]
Merge pull request #13690 from eileenmcnaughton/cleanup_payment_create

Clean up Payment.create function

5 years agoMerge pull request #13400 from mfb/format-resource-url
Seamus Lee [Sun, 3 Mar 2019 04:37:17 +0000 (15:37 +1100)]
Merge pull request #13400 from mfb/format-resource-url

fix broken logic in CRM_Utils_System_DrupalBase::formatResourceUrl()

5 years agoUpgrade Karma version to latest version
Seamus Lee [Sun, 3 Mar 2019 01:19:18 +0000 (12:19 +1100)]
Upgrade Karma version to latest version

5 years agoMerge pull request #13750 from seamuslee001/master
Seamus Lee [Sun, 3 Mar 2019 00:40:12 +0000 (11:40 +1100)]
Merge pull request #13750 from seamuslee001/master

5.11

5 years agoMerge in 5.11
Seamus Lee [Sun, 3 Mar 2019 00:39:19 +0000 (11:39 +1100)]
Merge in 5.11

5 years agoMerge pull request #13747 from eileenmcnaughton/merge_master
Seamus Lee [Sun, 3 Mar 2019 00:34:12 +0000 (11:34 +1100)]
Merge pull request #13747 from eileenmcnaughton/merge_master

merge 5.11 to master

5 years agoCRM/Contact - Fix fatal error on tag search
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search

This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.

5 years agoAdd upgrade routine to convert on_hold to an array for sites with
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.

with that set we get a select box which needs an array rather than a checkbox.

Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.

    // preferred communication method
    if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
      ->addSelect('email_on_hold',
        array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
    }
    else {
      ->add('advcheckbox', 'email_on_hold', ts('Email On Hold')