civicrm-core.git
6 years agodev/core#165 - Fix case activity breadcrumb
Coleman Watts [Thu, 7 Jun 2018 18:39:08 +0000 (14:39 -0400)]
dev/core#165 - Fix case activity breadcrumb

When opening a case activity (without popups) this will correctly set the breadcrumb.

6 years agoMerge pull request #12272 from eileenmcnaughton/export_house
Monish Deb [Thu, 7 Jun 2018 04:36:16 +0000 (10:06 +0530)]
Merge pull request #12272 from eileenmcnaughton/export_house

Towards fixing household merge export, extract function, add test, fix prev

6 years agoSet version to 5.4.alpha1
CiviCRM [Thu, 7 Jun 2018 03:50:24 +0000 (03:50 +0000)]
Set version to 5.4.alpha1

6 years agoSet version to 5.3.beta1
CiviCRM [Thu, 7 Jun 2018 03:40:49 +0000 (03:40 +0000)]
Set version to 5.3.beta1

6 years agoMerge pull request #12275 from JMAConsulting/dev_mail_11-1
Eileen McNaughton [Wed, 6 Jun 2018 20:15:11 +0000 (08:15 +1200)]
Merge pull request #12275 from JMAConsulting/dev_mail_11-1

dev/mail#11 add CRM_Mailing_BAO_MailingJob::del()

6 years agoMerge pull request #12193 from eileenmcnaughton/dedupe
Monish Deb [Wed, 6 Jun 2018 19:10:27 +0000 (00:40 +0530)]
Merge pull request #12193 from eileenmcnaughton/dedupe

Fix non-display of conflicts after batch dedupe from dedupe screen

6 years agodev/mail#11 add CRM_Mailing_BAO_MailingJob::del()
deb.monish [Wed, 6 Jun 2018 14:53:30 +0000 (20:23 +0530)]
dev/mail#11 add CRM_Mailing_BAO_MailingJob::del()

6 years agoMerge pull request #12274 from civicrm/5.2
Eileen McNaughton [Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)]
Merge pull request #12274 from civicrm/5.2

5.2 to master

6 years agoMerge pull request #12273 from eileenmcnaughton/notices
Eileen McNaughton [Wed, 6 Jun 2018 13:09:23 +0000 (01:09 +1200)]
Merge pull request #12273 from eileenmcnaughton/notices

dev/core#158 group contacts list and export limits results to 500 records

6 years agoFix e-notices on export coming from https://github.com/civicrm/civicrm-core/pull...
eileen [Wed, 6 Jun 2018 12:44:13 +0000 (00:44 +1200)]
Fix e-notices on export coming from https://github.com/civicrm/civicrm-core/pull/12110/files

6 years agoTowards fixing household merge export, extract function, add test, fix prev
eileen [Wed, 6 Jun 2018 11:58:03 +0000 (23:58 +1200)]
Towards fixing household merge export, extract function, add test, fix prev

6 years agoMerge pull request #12266 from jitendrapurohit/core-154
Eileen McNaughton [Wed, 6 Jun 2018 08:38:23 +0000 (20:38 +1200)]
Merge pull request #12266 from jitendrapurohit/core-154

dev/core#154 - Can't edit related records when current employer has a…

6 years agoMerge pull request #10630 from tschuettler/CRM-CRM-20841
Eileen McNaughton [Wed, 6 Jun 2018 06:53:58 +0000 (18:53 +1200)]
Merge pull request #10630 from tschuettler/CRM-CRM-20841

CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature merge…

6 years agoMerge pull request #12269 from civicrm/5.2
Eileen McNaughton [Wed, 6 Jun 2018 06:13:07 +0000 (18:13 +1200)]
Merge pull request #12269 from civicrm/5.2

5.2.0 merge to master

6 years ago5.2.0 release notes (#12100)
Andrew Hunt [Wed, 6 Jun 2018 06:12:32 +0000 (02:12 -0400)]
5.2.0 release notes (#12100)

* 5.2.0 release notes: raw from script

* 5.2.0 release notes: added boilerplate

* 5.2.0 release notes: first pass of release notes

* 5.2.0 release notes: updated contributors

* 5.2.0 release notes: final edits

* 5.2.0 release notes: update with late RC changes

* Add release notes for 5.1.2

* release-notes - Update 5.1.2

* Fix typo in release-notes for 5.1.2

6 years agodev/core#154 - Can't edit related records when current employer has a pending membership
Jitendra Purohit [Tue, 5 Jun 2018 10:47:11 +0000 (16:17 +0530)]
dev/core#154 - Can't edit related records when current employer has a pending membership

check for pending status instead of pay later

6 years agoMerge pull request #12259 from seamuslee001/dev_core_163
Eileen McNaughton [Wed, 6 Jun 2018 01:37:50 +0000 (13:37 +1200)]
Merge pull request #12259 from seamuslee001/dev_core_163

dev/core#163 Fix issue where disabling a group would block access to …

6 years agoMerge pull request #12267 from colemanw/dev/core/#152
Eileen McNaughton [Tue, 5 Jun 2018 19:51:45 +0000 (07:51 +1200)]
Merge pull request #12267 from colemanw/dev/core/#152

dev/core/#152 - AdvMulti-Select cleanup

6 years agoMerge pull request #12265 from agileware/Accessibility-Issue-9
Monish Deb [Tue, 5 Jun 2018 13:21:57 +0000 (18:51 +0530)]
Merge pull request #12265 from agileware/Accessibility-Issue-9

Accessibility #9: Regression - js error due to alertDismissal setting fixed.

6 years agodev/core/#152 - AdvMulti-Select cleanup
Coleman Watts [Tue, 5 Jun 2018 13:17:31 +0000 (09:17 -0400)]
dev/core/#152 - AdvMulti-Select cleanup

6 years agoAccessibility #9: Regression - js error due to alertDismissal setting fixed.
Alok Patel [Tue, 5 Jun 2018 11:04:07 +0000 (16:34 +0530)]
Accessibility #9: Regression - js error due to alertDismissal setting fixed.

6 years agoMerge pull request #12264 from civicrm/5.2
Eileen McNaughton [Tue, 5 Jun 2018 10:21:00 +0000 (22:21 +1200)]
Merge pull request #12264 from civicrm/5.2

5.2 merge to maste

6 years agoMerge pull request #12262 from JMAConsulting/dev_mail_13-rc
Eileen McNaughton [Tue, 5 Jun 2018 10:20:33 +0000 (22:20 +1200)]
Merge pull request #12262 from JMAConsulting/dev_mail_13-rc

dev/mail#13 - All members should not be excluded from Smart unsubscribe group

6 years agoMerge pull request #12255 from hosseinamin/master
Eileen McNaughton [Tue, 5 Jun 2018 10:20:14 +0000 (22:20 +1200)]
Merge pull request #12255 from hosseinamin/master

fix related to issue dev/core#127, in depth overlap of filter related contacts

6 years agoMerge pull request #10341 from colemanw/CRM-20565
Monish Deb [Tue, 5 Jun 2018 08:54:30 +0000 (14:24 +0530)]
Merge pull request #10341 from colemanw/CRM-20565

CRM-20565 - Improve ajax dedupe lookups on contact add form

6 years agoMerge pull request #12257 from eileenmcnaughton/relationship_type
Monish Deb [Tue, 5 Jun 2018 08:52:47 +0000 (14:22 +0530)]
Merge pull request #12257 from eileenmcnaughton/relationship_type

Fix unreleased regression - fatal when editing relationship type Employer

6 years agoFix code style - use elseif
lslade [Mon, 4 Jun 2018 15:02:00 +0000 (11:02 -0400)]
Fix code style - use elseif

6 years agoFix for dev/mail#13 - All members should not be excluded from Smart unsubscribe group.
lslade [Fri, 1 Jun 2018 16:40:04 +0000 (12:40 -0400)]
Fix for dev/mail#13 - All members should not be excluded from Smart unsubscribe group.

6 years agodev/mail#13 : Added unit test
deb.monish [Tue, 5 Jun 2018 07:42:44 +0000 (13:12 +0530)]
dev/mail#13 : Added unit test

6 years agoTidy up comments
eileen [Tue, 29 May 2018 02:40:29 +0000 (14:40 +1200)]
Tidy up comments

6 years agoMake getWhereString function sane by not appending a limit clause
eileen [Tue, 29 May 2018 02:13:53 +0000 (14:13 +1200)]
Make getWhereString function sane by not appending a limit clause

6 years agoFix display of conflicts on duplicate screen.
eileen [Thu, 24 May 2018 04:44:07 +0000 (16:44 +1200)]
Fix display of conflicts on duplicate screen.

There are 2 bulk dedupe scenarios
1) dedupe selected
2) dedupe all

In the case of the former, but not the latter, the display to which contacts
are redirected should be filted by 'selected'

Currently the selected filter is being applied whenever conflicts is true, resulting in an
empty form in the latter case.

This fix disambiguates the 2 concepts & attempts to rationalise & clarify related parameters in the flow.

6 years agoMerge pull request #12258 from eileenmcnaughton/alpha
Seamus Lee [Tue, 5 Jun 2018 07:07:12 +0000 (17:07 +1000)]
Merge pull request #12258 from eileenmcnaughton/alpha

Add 'Alphanumeric' rule type

6 years agoMerge pull request #12238 from colemanw/dev/core/#152
Eileen McNaughton [Tue, 5 Jun 2018 05:57:21 +0000 (17:57 +1200)]
Merge pull request #12238 from colemanw/dev/core/#152

dev/core/#152 - Remove AdvMulti-Select custom field type

6 years agoMerge pull request #12243 from eileenmcnaughton/custom_group
Seamus Lee [Tue, 5 Jun 2018 05:54:14 +0000 (15:54 +1000)]
Merge pull request #12243 from eileenmcnaughton/custom_group

Fix enotice when updating a custom group with is_multiple = 1

6 years agodev/core#163 Fix issue where disabling a group would block access to any mailing...
Seamus Lee [Tue, 5 Jun 2018 05:35:32 +0000 (15:35 +1000)]
dev/core#163 Fix issue where disabling a group would block access to any mailing reports that group was used for

6 years agoAdd 'Alphanumeric' rule type
Sean Madsen [Tue, 24 Apr 2018 20:38:23 +0000 (16:38 -0400)]
Add 'Alphanumeric' rule type

This type is now available when reading GET parameters with
`CRM_Utils_Request::retrieve()` and it offers improved security over the
widely used 'String' type by being strict enough to reject just about
any conceivable attack payload, while still accepting relatively simple
strings.

6 years agoMerge pull request #12252 from seamuslee001/dev_core_160
Eileen McNaughton [Tue, 5 Jun 2018 04:11:24 +0000 (16:11 +1200)]
Merge pull request #12252 from seamuslee001/dev_core_160

dev/core#160 Set the import progress widget to poll the server every …

6 years agoFix unrelease regression - fatal when editing relationship type Employer
eileen [Tue, 5 Jun 2018 02:06:29 +0000 (14:06 +1200)]
Fix unrelease regression - fatal when editing relationship type Employer

6 years agoMerge pull request #12256 from colemanw/CRM-20621
colemanw [Tue, 5 Jun 2018 01:04:24 +0000 (21:04 -0400)]
Merge pull request #12256 from colemanw/CRM-20621

CRM-20621 - Initial cleanup toward performance improvements

6 years agoMerge pull request #12254 from jitendrapurohit/core-162
Eileen McNaughton [Mon, 4 Jun 2018 21:45:26 +0000 (09:45 +1200)]
Merge pull request #12254 from jitendrapurohit/core-162

dev/core#162 - Use checksum to access user dashboard

6 years agoCRM-20621 - Initial cleanup toward performance improvements
Coleman Watts [Mon, 4 Jun 2018 16:31:11 +0000 (12:31 -0400)]
CRM-20621 - Initial cleanup toward performance improvements

6 years agoMerge pull request #12241 from michaelmcandrew/dev/core#157
colemanw [Mon, 4 Jun 2018 19:35:45 +0000 (15:35 -0400)]
Merge pull request #12241 from michaelmcandrew/dev/core#157

ensure that the indexed column is not an FK before deleting the index

6 years agofix related to issue dev/core#127, in depth overlap of filter related contacts
Hossein Amin [Mon, 4 Jun 2018 15:34:53 +0000 (18:34 +0300)]
fix related to issue dev/core#127, in depth overlap of filter related contacts

6 years agoensure that the indexed column is not an FK before deleting the index
Michael McAndrew [Thu, 31 May 2018 20:39:17 +0000 (21:39 +0100)]
ensure that the indexed column is not an FK before deleting the index

6 years agoMerge pull request #12248 from colemanw/tagsets
Monish Deb [Mon, 4 Jun 2018 10:08:29 +0000 (15:38 +0530)]
Merge pull request #12248 from colemanw/tagsets

Auto-open tagest fields

6 years agoMerge pull request #12249 from hosseinamin/master
Seamus Lee [Mon, 4 Jun 2018 10:03:48 +0000 (20:03 +1000)]
Merge pull request #12249 from hosseinamin/master

fix of issue dev/core#127 (at gitlab), incorrect cache records for smart groups

6 years agoMerge pull request #12114 from jitendrapurohit/membership-2
Monish Deb [Mon, 4 Jun 2018 10:00:31 +0000 (15:30 +0530)]
Merge pull request #12114 from jitendrapurohit/membership-2

dev/membership#2 - Add membership start date and registration start/end date to schedule reminder

6 years agodev/core#162 - Use checksum to access user dashboard
Jitendra Purohit [Mon, 4 Jun 2018 09:21:42 +0000 (14:51 +0530)]
dev/core#162 - Use checksum to access user dashboard

6 years agofix for issue dev/core#127, incorrect cache records for smart groups, with testunit
Hossein Amin [Sat, 2 Jun 2018 11:03:11 +0000 (14:03 +0300)]
fix for issue dev/core#127, incorrect cache records for smart groups, with testunit

6 years agoAdditional unit test
Jitendra Purohit [Mon, 4 Jun 2018 05:16:20 +0000 (10:46 +0530)]
Additional unit test

6 years agodev/core#160 Set the import progress widget to poll the server every 5s rather than...
Seamus Lee [Mon, 4 Jun 2018 01:40:59 +0000 (11:40 +1000)]
dev/core#160 Set the import progress widget to poll the server every 5s rather than every 5ms

6 years agoMerge pull request #12226 from JMAConsulting/dev_core_147
Seamus Lee [Fri, 1 Jun 2018 21:55:29 +0000 (07:55 +1000)]
Merge pull request #12226 from JMAConsulting/dev_core_147

dev/core#147 Use location type machine name as table alias instead of label

6 years agoMerge pull request #12245 from sritechie26/master
Seamus Lee [Fri, 1 Jun 2018 21:54:03 +0000 (07:54 +1000)]
Merge pull request #12245 from sritechie26/master

getCaseRoles not working when supplied relationship id.  civicrm_relationship table name changed to alias name rel because its changed in the actual query

6 years agoMerge pull request #12247 from JMAConsulting/dev_mail_12
Seamus Lee [Fri, 1 Jun 2018 21:53:43 +0000 (07:53 +1000)]
Merge pull request #12247 from JMAConsulting/dev_mail_12

dev/mail#12 Incorrect Total Count on mail summary report

6 years agoAuto-open tagest fields
Coleman Watts [Fri, 1 Jun 2018 20:55:42 +0000 (16:55 -0400)]
Auto-open tagest fields

6 years agoMerge pull request #11407 from cividesk/CRM-21553
colemanw [Fri, 1 Jun 2018 18:42:16 +0000 (14:42 -0400)]
Merge pull request #11407 from cividesk/CRM-21553

CRM-21553 : profile duplicate field validation for field with primary location type

6 years agodev/mail#12 Incorrect Total Count on mail summary report
deb.monish [Fri, 1 Jun 2018 18:34:30 +0000 (00:04 +0530)]
dev/mail#12 Incorrect Total Count on mail summary report

6 years agodev/core#147 Use location type m/c name as table alias instead of label
deb.monish [Tue, 29 May 2018 02:52:49 +0000 (08:22 +0530)]
dev/core#147 Use location type m/c name as table alias instead of label

6 years agocivicrm_relationship table name changed to alias name rel, because its changed in...
root [Fri, 1 Jun 2018 13:05:42 +0000 (14:05 +0100)]
civicrm_relationship table name changed to alias name rel, because its changed in the actual query but not in this extra Where condition

6 years agoMerge pull request #12225 from jitendrapurohit/core-149
colemanw [Fri, 1 Jun 2018 11:52:26 +0000 (07:52 -0400)]
Merge pull request #12225 from jitendrapurohit/core-149

dev/core#149 - Fatal Error on customvalue get api

6 years agoadditional unit test fixes
Jitendra Purohit [Fri, 1 Jun 2018 09:41:04 +0000 (15:11 +0530)]
additional unit test fixes

6 years agoFix enotice when updating a custom group with is_multiple = 1
eileen [Fri, 1 Jun 2018 04:26:03 +0000 (16:26 +1200)]
Fix enotice when updating a custom group with is_multiple = 1

When updating a group with is_multiple = 1 there should be no change unless ['is_multiple']
is set but existing code is pretty confusing.

6 years agoMerge pull request #12240 from michaelmcandrew/dev/core#156
Eileen McNaughton [Fri, 1 Jun 2018 04:10:05 +0000 (16:10 +1200)]
Merge pull request #12240 from michaelmcandrew/dev/core#156

Only set defaults when creating a custom field (not when editing one)

6 years agoMerge pull request #12242 from eileenmcnaughton/up
Seamus Lee [Fri, 1 Jun 2018 01:02:30 +0000 (11:02 +1000)]
Merge pull request #12242 from eileenmcnaughton/up

Move upgrade message to right file

6 years agoOnly set defaults when creating the custom field
Michael McAndrew [Thu, 31 May 2018 23:50:55 +0000 (00:50 +0100)]
Only set defaults when creating the custom field

6 years agoMove upgrade message to right file
eileen [Thu, 31 May 2018 21:45:59 +0000 (09:45 +1200)]
Move upgrade message to right file

6 years agoMerge pull request #12211 from eileenmcnaughton/price
colemanw [Thu, 31 May 2018 18:19:36 +0000 (14:19 -0400)]
Merge pull request #12211 from eileenmcnaughton/price

Preliminary tidy up on PriceSet form.

6 years agoMerge pull request #12158 from agileware/Accessibility-Issue-4
colemanw [Thu, 31 May 2018 18:17:28 +0000 (14:17 -0400)]
Merge pull request #12158 from agileware/Accessibility-Issue-4

Accessibility #4: Make alerts accessible, Added new setting under misc.

6 years agoMerge pull request #11672 from omarabuhussein/CRM-21769-improve-unsupported-locale...
Michael McAndrew [Thu, 31 May 2018 13:57:01 +0000 (14:57 +0100)]
Merge pull request #11672 from omarabuhussein/CRM-21769-improve-unsupported-locale-warning

CRM-21769: Show 'unsupported locale for parsing' warning only when enabling address parsing

6 years agoAccessibility #4: Make alerts accessible, Added new setting under misc.
Alok Patel [Thu, 31 May 2018 12:43:48 +0000 (18:13 +0530)]
Accessibility #4: Make alerts accessible, Added new setting under misc.

6 years agodev/core#61 Split Edit Message Templates Permission (#11974)
Samson Alajede [Thu, 31 May 2018 11:41:50 +0000 (12:41 +0100)]
dev/core#61 Split Edit Message Templates Permission (#11974)

* dev/core#61 split edit message templates permission

6 years agodev/core#149 - Fatal Error on customvalue get api
Jitendra Purohit [Tue, 29 May 2018 10:39:15 +0000 (16:09 +0530)]
dev/core#149 - Fatal Error on customvalue get api

6 years agoCRM-20565 - Use contact api for now
Coleman Watts [Thu, 31 May 2018 03:00:34 +0000 (23:00 -0400)]
CRM-20565 - Use contact api for now

Per discussion on https://github.com/civicrm/civicrm-core/pull/10341
Since the default dedupe rules are inadequate for this, we'll just
use the contact api for now.

6 years agoCRM-20565 - Add throttling to prevent multiple dupe checks popping up
Coleman Watts [Thu, 31 May 2018 02:40:58 +0000 (22:40 -0400)]
CRM-20565 - Add throttling to prevent multiple dupe checks popping up

6 years agoCRM-20565 - Improve ajax dedupe lookups on contact add form
Coleman Watts [Fri, 12 May 2017 17:38:23 +0000 (12:38 -0500)]
CRM-20565 - Improve ajax dedupe lookups on contact add form

6 years agodev/core/#152 - Remove AdvMulti-Select custom field type
Coleman Watts [Wed, 30 May 2018 23:10:37 +0000 (19:10 -0400)]
dev/core/#152 - Remove AdvMulti-Select custom field type

6 years agoMerge pull request #12234 from colemanw/CustomForm
Eileen McNaughton [Wed, 30 May 2018 20:14:27 +0000 (08:14 +1200)]
Merge pull request #12234 from colemanw/CustomForm

Change custom contact ref groups selector to use select2

6 years agoMerge pull request #12229 from mattwire/optionvalue_fixes
Eileen McNaughton [Wed, 30 May 2018 10:34:33 +0000 (22:34 +1200)]
Merge pull request #12229 from mattwire/optionvalue_fixes

Allow saving of new option value with value = 0.

6 years agoPreliminary tidy up on PriceSet form.
eileen [Fri, 25 May 2018 22:10:41 +0000 (10:10 +1200)]
Preliminary tidy up on PriceSet form.

Switching price set form to using metadata & trait as first step towards making it
custom data aware. Note the form will need to call the api rather than BAO::create
and the tpl will need to be updated before the form is viable for custom data

6 years agoFix saving option value with value=0
Matthew Wire [Tue, 29 May 2018 18:45:27 +0000 (19:45 +0100)]
Fix saving option value with value=0

6 years agoCommenting/unused variables
Matthew Wire [Tue, 29 May 2018 18:45:03 +0000 (19:45 +0100)]
Commenting/unused variables

6 years agoMerge pull request #12212 from eileenmcnaughton/export_clean
Monish Deb [Wed, 30 May 2018 06:35:15 +0000 (12:05 +0530)]
Merge pull request #12212 from eileenmcnaughton/export_clean

Code cleanup on export

6 years agoMerge pull request #12221 from eileenmcnaughton/api_extend_mailing_job
Monish Deb [Wed, 30 May 2018 04:20:06 +0000 (09:50 +0530)]
Merge pull request #12221 from eileenmcnaughton/api_extend_mailing_job

Add api testing / custom data support for MailingJob.

6 years agoAdd api testing / custom data support for MailingJob.
eileen [Mon, 28 May 2018 00:00:13 +0000 (12:00 +1200)]
Add api testing / custom data support for MailingJob.

There is no specific requirement for MailingJob to have custom data - but
this is generally part of standardising all entities to support custom
data (ie. workign through the list in
api_v3_SyntaxConformanceTest:toBeSkipped_custom_data_creatable
 to remove the remaining rows.

Fix some places to call create instead of saving mailing job to trigger hooks.

6 years agodev/core#43 - [Update] to Update geocoding setting text to reflect need for Google...
Lars SG [Tue, 29 May 2018 22:48:24 +0000 (16:48 -0600)]
dev/core#43 - [Update] to Update geocoding setting text to reflect need for Google API key (#12232)

dev/core#43 - [Update] to Update geocoding setting text to reflect need for Google API key

6 years agoChange custom contact ref groups selector to use select2
Coleman Watts [Tue, 29 May 2018 21:22:29 +0000 (17:22 -0400)]
Change custom contact ref groups selector to use select2

6 years agoMerge pull request #12205 from eileenmcnaughton/soft_error
Eileen McNaughton [Tue, 29 May 2018 21:16:51 +0000 (09:16 +1200)]
Merge pull request #12205 from eileenmcnaughton/soft_error

dev/core#139 Fail more gracefully on contribution detail report with invalid combination

6 years agoCustom Field form tpl and js cleanup
Coleman Watts [Tue, 29 May 2018 21:16:05 +0000 (17:16 -0400)]
Custom Field form tpl and js cleanup

6 years agoMerge pull request #12227 from laryn/patch-1
colemanw [Tue, 29 May 2018 16:48:37 +0000 (12:48 -0400)]
Merge pull request #12227 from laryn/patch-1

Backdrop - update styles for status messages

6 years agoUpdate Backdrop styles slightly
Laryn - CEDC.org [Tue, 29 May 2018 15:58:45 +0000 (10:58 -0500)]
Update Backdrop styles slightly

Works better with stock and works with Shoreditch enabled as well.

6 years agoFail more gracefully when attempting to use a soft credit filter but not including...
eileen [Fri, 25 May 2018 00:18:34 +0000 (12:18 +1200)]
Fail more gracefully when attempting to use a soft credit filter but not including soft credits.

For better or worse this report munges soft credits & contributions in a very wierd way.

It currently hard fails if you try to search for 'contributions only' but include
a soft credit criteria, although there appears to have been an effort to block this in the past.

It might be nice to add that filter but restructuring the report to make it testable
should be a pre-requisite for that - so for now, let's address the fatal

6 years agoMerge pull request #10909 from mattwire/CRM-21111_BAO_Activity_getActivities_cleanup
Eileen McNaughton [Mon, 28 May 2018 23:26:42 +0000 (11:26 +1200)]
Merge pull request #10909 from mattwire/CRM-21111_BAO_Activity_getActivities_cleanup

CRM-21111 Refactor include/exclude activity types into it's own function and im…

6 years agoRefactor include/exclude activity types into it's own function and improve performanc...
Matthew Wire [Mon, 28 Aug 2017 12:02:04 +0000 (13:02 +0100)]
Refactor include/exclude activity types into it's own function and improve performance (don't retrieve excluded activity types)

6 years agoMerge pull request #12213 from JMAConsulting/dev_core_142
colemanw [Mon, 28 May 2018 16:24:16 +0000 (10:24 -0600)]
Merge pull request #12213 from JMAConsulting/dev_core_142

dev/core#142 Add chain select to state and counties in Search Builder

6 years agoMerge pull request #11739 from JMAConsulting/CRM-19948
colemanw [Mon, 28 May 2018 15:35:59 +0000 (09:35 -0600)]
Merge pull request #11739 from JMAConsulting/CRM-19948

CRM-19948: Store Attachment uploader information

6 years agoMerge pull request #12215 from seamuslee001/CRM-21120
Seamus Lee [Mon, 28 May 2018 08:21:29 +0000 (18:21 +1000)]
Merge pull request #12215 from seamuslee001/CRM-21120

CRM-21120 Add environment check for existence of mcrypt function

6 years agoMerge pull request #12206 from eileenmcnaughton/api_encoder
colemanw [Mon, 28 May 2018 04:54:33 +0000 (22:54 -0600)]
Merge pull request #12206 from eileenmcnaughton/api_encoder

[NFC] minor function tidy up - stop using  $ids array

6 years agoMerge pull request #12222 from seamuslee001/master
Eileen McNaughton [Mon, 28 May 2018 04:52:23 +0000 (16:52 +1200)]
Merge pull request #12222 from seamuslee001/master

Fix re-delcare issue

6 years agoFix re-delcare issue
Seamus Lee [Mon, 28 May 2018 04:29:06 +0000 (14:29 +1000)]
Fix re-delcare issue