civicrm-core.git
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 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

6 years agoRefactor towards fixing / reviewing export issues
eileen [Thu, 22 Feb 2018 02:21:47 +0000 (15:21 +1300)]
Refactor towards fixing / reviewing export issues

6 years agoMerge pull request #12214 from JMAConsulting/dev_core_143
Eileen McNaughton [Sun, 27 May 2018 22:42:29 +0000 (10:42 +1200)]
Merge pull request #12214 from JMAConsulting/dev_core_143

dev/core#143 Contact 'World Region' Field not functioning properly in  Search Builder

6 years agoMerge pull request #12184 from eileenmcnaughton/entity_form
Eileen McNaughton [Sun, 27 May 2018 22:23:15 +0000 (10:23 +1200)]
Merge pull request #12184 from eileenmcnaughton/entity_form

Remove inheritance of MembershipConfig form from MembershipStatus form.

6 years agoMerge pull request #12216 from mattwire/dep_warning
Eileen McNaughton [Sun, 27 May 2018 22:14:26 +0000 (10:14 +1200)]
Merge pull request #12216 from mattwire/dep_warning

dev/core#128 Add deprecated warning helper function

6 years agoMerge pull request #12220 from civicrm/5.2
Eileen McNaughton [Sun, 27 May 2018 21:57:04 +0000 (09:57 +1200)]
Merge pull request #12220 from civicrm/5.2

5.2 merge to master

6 years agoMerge pull request #12219 from eileenmcnaughton/case
Eileen McNaughton [Sun, 27 May 2018 21:55:52 +0000 (09:55 +1200)]
Merge pull request #12219 from eileenmcnaughton/case

dev/core#137 Fix Find Deleted Cases

6 years agoFix Find Deleted Cases
Matthew Wire [Sun, 27 May 2018 15:04:39 +0000 (16:04 +0100)]
Fix Find Deleted Cases

6 years agoMake label field on relationship type required again (accidentally removed
eileen [Wed, 23 May 2018 04:27:13 +0000 (16:27 +1200)]
Make label field on relationship type required again (accidentally removed

6 years agoRemove inheritance of MembershipConfig form from MembershipStatus form.
eileen [Wed, 23 May 2018 03:23:40 +0000 (15:23 +1200)]
Remove inheritance of MembershipConfig form from MembershipStatus form.

This is part of trying to move towards an entity form (ie. support custom data) for MembershipType.

Currently the 2 forms share a parent class - but really the add buttons is the only shared functionality.

This change uses the EntityTrait to add the buttons as well. There is some minor tidy up in there
but I tried to keep it very limited.

I switched only one field over to being added via addField, the parent mechanism so far

6 years agoMerge pull request #12174 from eileenmcnaughton/matt
Eileen McNaughton [Sun, 27 May 2018 21:46:33 +0000 (09:46 +1200)]
Merge pull request #12174 from eileenmcnaughton/matt

Towards dev/financial/#16 Paypal unreliable getting payment processor type

6 years agoRemove usage of deprecated function from paypal
Matthew Wire [Sat, 28 Apr 2018 15:15:45 +0000 (16:15 +0100)]
Remove usage of deprecated function from paypal

6 years agodev/core#128 Add deprecated warning helper function
Matthew Wire [Sun, 27 May 2018 12:13:33 +0000 (13:13 +0100)]
dev/core#128 Add deprecated warning helper function

6 years agoCRM-21120 Add environment check for existence of mcrypt function
adixon [Tue, 29 Aug 2017 18:36:01 +0000 (14:36 -0400)]
CRM-21120 Add environment check for existence of mcrypt function

CRM-21120 Use a function-name agnostic test for encrypting powers

CRM-21120 syntax error, missing semi-colon

CRM-21120 Comma problems

6 years agodev/core#143 Contact 'World Region' Field not functioning properly in Search Builder
deb.monish [Sat, 26 May 2018 19:47:42 +0000 (01:17 +0530)]
dev/core#143 Contact 'World Region' Field not functioning properly in Search Builder

6 years agodev/core#142 Add chain select to state and counties in Search Builder
deb.monish [Sat, 26 May 2018 14:21:51 +0000 (19:51 +0530)]
dev/core#142 Add chain select to state and counties in Search Builder

6 years agoMerge pull request #12210 from colemanw/dev/core#117
Eileen McNaughton [Fri, 25 May 2018 22:19:00 +0000 (10:19 +1200)]
Merge pull request #12210 from colemanw/dev/core#117

dev/core#117 Replace useage of deprecated each() in MembershpView

6 years agodev/core#117 Replace useage of deprecated each() in MembershpView
Coleman Watts [Fri, 25 May 2018 17:20:40 +0000 (11:20 -0600)]
dev/core#117 Replace useage of deprecated each() in MembershpView

6 years agoMerge pull request #12192 from eileenmcnaughton/utils
Joe Murray [Fri, 25 May 2018 17:04:54 +0000 (13:04 -0400)]
Merge pull request #12192 from eileenmcnaughton/utils

Further additional utility function for handling odd array structure

6 years agoMerge pull request #12208 from JMAConsulting/access-3-datepicker
colemanw [Fri, 25 May 2018 15:53:56 +0000 (09:53 -0600)]
Merge pull request #12208 from JMAConsulting/access-3-datepicker

dev/accessiblity#3 Add aria-label to datepicker element

6 years agodev/accessiblity#3 Add aria-label to datepicker element
deb.monish [Fri, 25 May 2018 12:24:15 +0000 (17:54 +0530)]
dev/accessiblity#3 Add aria-label to datepicker element

6 years ago[NFC] minor function tidy up - stop using array.
eileen [Fri, 25 May 2018 06:07:20 +0000 (18:07 +1200)]
[NFC] minor function tidy up - stop using  array.

Also don't set a couple of params that aren't needed

6 years agoMerge pull request #12204 from eileenmcnaughton/api_teste
Seamus Lee [Fri, 25 May 2018 05:13:43 +0000 (15:13 +1000)]
Merge pull request #12204 from eileenmcnaughton/api_teste

[NFC] test clean up.

6 years agoMerge pull request #11951 from mydropwizard/open-flash-chart-markup
Tim Otten [Fri, 25 May 2018 03:34:10 +0000 (21:34 -0600)]
Merge pull request #11951 from mydropwizard/open-flash-chart-markup

Adjust creation of markup for Open Flash Chart

6 years agoMerge pull request #12203 from eileenmcnaughton/api_tester
Eileen McNaughton [Fri, 25 May 2018 03:18:52 +0000 (15:18 +1200)]
Merge pull request #12203 from eileenmcnaughton/api_tester

dev/core#38 Fix inappropriate limit on participant.getcount

6 years agoMerge pull request #12199 from seamuslee001/case_core_117
Eileen McNaughton [Thu, 24 May 2018 23:49:34 +0000 (11:49 +1200)]
Merge pull request #12199 from seamuslee001/case_core_117

dev/core#117 Replace deprecated each() function in CiviCase

6 years agodev/core#38 Fix inappropriate limit on participant.getcount
eileen [Thu, 24 May 2018 23:21:37 +0000 (11:21 +1200)]
dev/core#38 Fix inappropriate limit on participant.getcount

6 years ago[NFC] test clean up.
eileen [Thu, 24 May 2018 23:20:30 +0000 (11:20 +1200)]
[NFC] test clean up.

Just some basic tidy up, removed a couple of tests that are very much covered by syntaxConformance tests

6 years agoMerge pull request #12202 from seamuslee001/event_core_117
Seamus Lee [Thu, 24 May 2018 23:07:39 +0000 (09:07 +1000)]
Merge pull request #12202 from seamuslee001/event_core_117

dev/core#117 Replace deprecated each in CiviEvent Participant registr…

6 years agoMerge pull request #12201 from seamuslee001/report_activity_117
Seamus Lee [Thu, 24 May 2018 23:07:11 +0000 (09:07 +1000)]
Merge pull request #12201 from seamuslee001/report_activity_117

dev/core#117 Replace usage of deprecated each() in Activity Summary R…

6 years agoMerge pull request #12196 from yashodha/CRM-12186_fix
Eileen McNaughton [Thu, 24 May 2018 22:32:26 +0000 (10:32 +1200)]
Merge pull request #12196 from yashodha/CRM-12186_fix

CRM-21632 - {membership.fee} prints out in documents with 9 decimal p…

6 years agodev/core#117 Replace usage of deprecated each() in Activity Summary Report
Seamus Lee [Thu, 24 May 2018 21:07:36 +0000 (07:07 +1000)]
dev/core#117 Replace usage of deprecated each() in Activity Summary Report

6 years agodev/core#117 Replace deprecated each in CiviEvent Participant registration
Seamus Lee [Thu, 24 May 2018 21:07:28 +0000 (07:07 +1000)]
dev/core#117 Replace deprecated each in CiviEvent Participant registration

6 years agodev/core#117 Replace deprecated each() function in CiviCase
Seamus Lee [Thu, 24 May 2018 21:07:06 +0000 (07:07 +1000)]
dev/core#117 Replace deprecated each() function in CiviCase

6 years agoMerge pull request #12021 from michaelmcandrew/managed-entity-deletion
colemanw [Thu, 24 May 2018 17:32:49 +0000 (11:32 -0600)]
Merge pull request #12021 from michaelmcandrew/managed-entity-deletion

More robust managed entity deletion

6 years agoAdded comment describing obfuscation
Will Long [Thu, 24 May 2018 16:37:50 +0000 (10:37 -0600)]
Added comment describing obfuscation

6 years agoCRM-21632 - {membership.fee} prints out in documents with 9 decimal places
yashodha [Thu, 24 May 2018 14:44:35 +0000 (20:14 +0530)]
CRM-21632 - {membership.fee} prints out in documents with 9 decimal places

6 years agoMerge pull request #12177 from eileenmcnaughton/test_monish
Monish Deb [Thu, 24 May 2018 08:05:09 +0000 (13:35 +0530)]
Merge pull request #12177 from eileenmcnaughton/test_monish

[NFC] code changes for export with merge household

6 years agoMerge pull request #12180 from agileware/CIVICRM-832-5.0
Eileen McNaughton [Thu, 24 May 2018 07:30:09 +0000 (19:30 +1200)]
Merge pull request #12180 from agileware/CIVICRM-832-5.0

Removing related memberships if parent membership type is changed which does not have relation type associated.

6 years agoFurther utility on handling odd array structure
eileen [Thu, 24 May 2018 03:31:21 +0000 (15:31 +1200)]
Further utility on handling odd array structure

6 years agoMerge pull request #12191 from seamuslee001/dev_core_135
Eileen McNaughton [Thu, 24 May 2018 02:45:14 +0000 (14:45 +1200)]
Merge pull request #12191 from seamuslee001/dev_core_135

dev/core#135 Fix remaining non well formed numeric number problems in…

6 years agoMerge pull request #12188 from larssg-wildsight/master
Eileen McNaughton [Thu, 24 May 2018 00:31:24 +0000 (12:31 +1200)]
Merge pull request #12188 from larssg-wildsight/master

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

6 years agodev/core#135 Fix remaining non well formed numeric number problems in CRM_Batch_Form_...
Seamus Lee [Thu, 24 May 2018 00:05:59 +0000 (10:05 +1000)]
dev/core#135 Fix remaining non well formed numeric number problems in CRM_Batch_Form_EntryTest

6 years agoMerge pull request #12190 from seamuslee001/dev_ore_135_a
Seamus Lee [Thu, 24 May 2018 00:03:25 +0000 (10:03 +1000)]
Merge pull request #12190 from seamuslee001/dev_ore_135_a

dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entr…

6 years agoMerge pull request #12189 from seamuslee001/117_report_recur
Seamus Lee [Wed, 23 May 2018 23:53:14 +0000 (09:53 +1000)]
Merge pull request #12189 from seamuslee001/117_report_recur

Dev/Core#117 Fix use of each() function in Recur Report

6 years agodev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entryTest
Seamus Lee [Wed, 23 May 2018 21:55:05 +0000 (07:55 +1000)]
dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entryTest

6 years agoDev/Core#117 Fix use of each() function in Recur Report
Seamus Lee [Wed, 23 May 2018 21:35:48 +0000 (07:35 +1000)]
Dev/Core#117 Fix use of each() function in Recur Report

6 years agoMerge pull request #12187 from colemanw/recursive
Seamus Lee [Wed, 23 May 2018 21:31:46 +0000 (07:31 +1000)]
Merge pull request #12187 from colemanw/recursive

Add utils for finding nested array items

6 years agoAdd utils for finding nested array items
Coleman Watts [Wed, 23 May 2018 19:42:59 +0000 (13:42 -0600)]
Add utils for finding nested array items

6 years agoUpdate GetFields.php
wildsight [Wed, 23 May 2018 19:39:51 +0000 (13:39 -0600)]
Update GetFields.php

6 years agoUpdate Map.setting.php
wildsight [Wed, 23 May 2018 19:34:38 +0000 (13:34 -0600)]
Update Map.setting.php

6 years agoUpdate Mapping.tpl
wildsight [Wed, 23 May 2018 19:32:45 +0000 (13:32 -0600)]
Update Mapping.tpl

6 years agoUpdate Mapping.tpl
wildsight [Wed, 23 May 2018 19:25:02 +0000 (13:25 -0600)]
Update Mapping.tpl

6 years agoadding test to ensure dependent entities are uninstalled cleanly
Michael McAndrew [Wed, 23 May 2018 09:26:50 +0000 (10:26 +0100)]
adding test to ensure dependent entities are uninstalled cleanly

6 years agoDelete entities in the reverse order that they were created
Michael McAndrew [Mon, 23 Apr 2018 11:16:57 +0000 (12:16 +0100)]
Delete entities in the reverse order that they were created

6 years agoalways remove entity from civicrm_managed if we think it should be deleted
Michael McAndrew [Mon, 23 Apr 2018 11:01:55 +0000 (12:01 +0100)]
always remove entity from civicrm_managed if we think it should be deleted

6 years agoCIVICRM-832: Removing related memberships if parent membership type is changed which...
Alok Patel [Wed, 23 May 2018 07:05:55 +0000 (12:35 +0530)]
CIVICRM-832: Removing related memberships if parent membership type is changed which does not have relation type associated.

6 years agoset default created_id value to BAO
deb.monish [Wed, 18 Apr 2018 12:03:46 +0000 (17:33 +0530)]
set default created_id value to BAO

6 years agoCRM-19948: Store the logged in contact ID as the file uploader
Davi Alexandre [Tue, 31 Jan 2017 20:30:30 +0000 (18:30 -0200)]
CRM-19948: Store the logged in contact ID as the file uploader

6 years agoCRM-19948: Add The created_id field to File
Davi Alexandre [Wed, 8 Mar 2017 20:40:04 +0000 (17:40 -0300)]
CRM-19948: Add The created_id field to File

6 years agoMerge pull request #12137 from eileenmcnaughton/year_fiscal
Eileen McNaughton [Tue, 22 May 2018 19:30:09 +0000 (07:30 +1200)]
Merge pull request #12137 from eileenmcnaughton/year_fiscal

Extend fiscal year relative options to better match other periods

6 years agoMerge pull request #12182 from michaelmcandrew/dev/mail#10
Monish Deb [Tue, 22 May 2018 18:01:15 +0000 (23:31 +0530)]
Merge pull request #12182 from michaelmcandrew/dev/mail#10

only add a closing quote if it is not already present

6 years agoonly add a closing quote if it is not already present
Michael McAndrew [Tue, 22 May 2018 15:28:19 +0000 (16:28 +0100)]
only add a closing quote if it is not already present

6 years agoMerge pull request #12169 from seamuslee001/mime_mail_upgrade
Monish Deb [Tue, 22 May 2018 13:13:02 +0000 (18:43 +0530)]
Merge pull request #12169 from seamuslee001/mime_mail_upgrade

Update variable name as per upgraded Mime_mail package to support PHP7.2

6 years ago[NFC] stop passing around variables that are cached anyway.
eileen [Tue, 22 May 2018 11:11:02 +0000 (23:11 +1200)]
[NFC] stop passing around variables that are cached anyway.

6 years ago[NFC] minor variable renaming.
eileen [Tue, 22 May 2018 10:44:25 +0000 (22:44 +1200)]
[NFC] minor variable renaming.

I am working through https://github.com/civicrm/civicrm-core/pull/11870/files &
this is one very minor change that makes sense to commit in isolation

6 years agominor fix
deb.monish [Tue, 22 May 2018 10:24:21 +0000 (15:54 +0530)]
minor fix

6 years agoUpdate variable name as per upgraded Mime_mail package to support PHP7.2
Seamus Lee [Sat, 19 May 2018 21:55:26 +0000 (07:55 +1000)]
Update variable name as per upgraded Mime_mail package to support PHP7.2

6 years agoMerge pull request #12170 from seamuslee001/php72_pledge_foreach
Monish Deb [Tue, 22 May 2018 09:06:51 +0000 (14:36 +0530)]
Merge pull request #12170 from seamuslee001/php72_pledge_foreach

dev/core#117 Fix use of each in CRM/Pledge

6 years agoMerge pull request #11732 from twomice/CRM-21811_optimize_search_reciprocal_relations...
Seamus Lee [Tue, 22 May 2018 04:01:26 +0000 (14:01 +1000)]
Merge pull request #11732 from twomice/CRM-21811_optimize_search_reciprocal_relationship_group

CRM-21811: Optimize advanced search by relationship with target g…

6 years agoMerge pull request #12175 from eileenmcnaughton/jamie
Eileen McNaughton [Mon, 21 May 2018 20:06:06 +0000 (08:06 +1200)]
Merge pull request #12175 from eileenmcnaughton/jamie

dev/core#35 Avoid variable leakage on recurring contribution receipts.

6 years agoMerge pull request #11944 from JMAConsulting/access-3-1
Monish Deb [Mon, 21 May 2018 20:02:22 +0000 (01:32 +0530)]
Merge pull request #11944 from JMAConsulting/access-3-1

(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates that share same code

6 years agofixed civilint error
Michael McAndrew [Mon, 21 May 2018 19:50:33 +0000 (20:50 +0100)]
fixed civilint error