civicrm-core.git
5 years ago[REF] simplify & add tests on getMappingParams
eileen [Tue, 9 Jul 2019 22:26:38 +0000 (10:26 +1200)]
[REF] simplify & add tests on getMappingParams

Tests extended to cover search builder (all that operator stuff

5 years agoMerge pull request #14745 from eileenmcnaughton/fgb
Eileen McNaughton [Tue, 9 Jul 2019 19:47:16 +0000 (07:47 +1200)]
Merge pull request #14745 from eileenmcnaughton/fgb

dev/core#578 follow up fix on activity summary report

5 years agoMerge pull request #14615 from mattwire/contributionpage_title
Eileen McNaughton [Tue, 9 Jul 2019 19:46:39 +0000 (07:46 +1200)]
Merge pull request #14615 from mattwire/contributionpage_title

Set title using standard form method and use for success message on contributionpage

5 years agoMerge pull request #14762 from eileenmcnaughton/mapping_whomp
Matthew Wire [Tue, 9 Jul 2019 16:27:53 +0000 (17:27 +0100)]
Merge pull request #14762 from eileenmcnaughton/mapping_whomp

[REF] Extract mapping converter function, kinda brutally

5 years agoExtract mapping converter function, kinda brutally
eileen [Tue, 9 Jul 2019 08:23:38 +0000 (20:23 +1200)]
Extract mapping converter function, kinda brutally

5 years agoMerge pull request #14706 from ixiam/dev-SmartyCompiled
Eileen McNaughton [Tue, 9 Jul 2019 12:13:34 +0000 (00:13 +1200)]
Merge pull request #14706 from ixiam/dev-SmartyCompiled

expose smarty's compile_check to be overridden in civicrm.settings.php

5 years agoMerge pull request #14758 from eileenmcnaughton/export_test_improve
colemanw [Tue, 9 Jul 2019 12:05:07 +0000 (08:05 -0400)]
Merge pull request #14758 from eileenmcnaughton/export_test_improve

[REF] export code simplification

5 years agoAdd unit test for saveFieldMapping
eileen [Tue, 9 Jul 2019 07:08:35 +0000 (19:08 +1200)]
Add unit test for saveFieldMapping

5 years agoMerge pull request #14757 from eileenmcnaughton/mapping_fields
Eileen McNaughton [Tue, 9 Jul 2019 08:27:55 +0000 (20:27 +1200)]
Merge pull request #14757 from eileenmcnaughton/mapping_fields

[REF] Extract saveMapping Field

5 years agoMerge pull request #14729 from eileenmcnaughton/enotice
Eileen McNaughton [Tue, 9 Jul 2019 08:08:18 +0000 (20:08 +1200)]
Merge pull request #14729 from eileenmcnaughton/enotice

e-notice fix & unit test

5 years agoRemove unecessary pass-by-reference
eileen [Tue, 9 Jul 2019 05:00:30 +0000 (17:00 +1200)]
Remove unecessary pass-by-reference

5 years ago[REF] export code simplification
eileen [Tue, 9 Jul 2019 04:43:26 +0000 (16:43 +1200)]
[REF] export code simplification

On review I find the value ['exportOption'] is a parameter used at the form later to determine whether to
export 'Primary fields only' (ahem) or the user should select an array of fields. By the time the form is submitted we
either have an array of selected fields or NULL denoting that there is no selection (& hence the defaults should be used)
and the selection at the form layer is redundant. However it is still being referenced in one place (and hence the tests
are passing it in to avoid an enotice). This fixes that one place & removes it from the tests. It also extracts part of
a test to move towards making it easier to alter the signature of exportComponents without messing with so many places in
the code

5 years agoMerge pull request #14756 from eileenmcnaughton/wrangle
Eileen McNaughton [Tue, 9 Jul 2019 03:57:09 +0000 (15:57 +1200)]
Merge pull request #14756 from eileenmcnaughton/wrangle

Extract field wrangling to determineReturnProperties

5 years agoExtract saveMapping Field
eileen [Tue, 9 Jul 2019 00:58:16 +0000 (12:58 +1200)]
Extract saveMapping Field

Basic extraction. Tangental to export mapping cleanup

5 years agoMerge pull request #14754 from eileenmcnaughton/cust_field_fix
colemanw [Tue, 9 Jul 2019 02:53:52 +0000 (22:53 -0400)]
Merge pull request #14754 from eileenmcnaughton/cust_field_fix

Fix obscure bug on updating custom fields (not necessarily hittable via UI)

5 years agoMerge pull request #14755 from eileenmcnaughton/mapping_sane
colemanw [Tue, 9 Jul 2019 02:51:37 +0000 (22:51 -0400)]
Merge pull request #14755 from eileenmcnaughton/mapping_sane

[REF] Remove call to getMappingFields in favour of api call.

5 years agoExtract field wrangling to determineReturnProperties
eileen [Mon, 8 Jul 2019 23:22:00 +0000 (11:22 +1200)]
Extract field wrangling to determineReturnProperties

This encases the wrangling of the field format to it's own function

5 years agoMerge pull request #14742 from eileenmcnaughton/payment_out
colemanw [Mon, 8 Jul 2019 23:51:34 +0000 (19:51 -0400)]
Merge pull request #14742 from eileenmcnaughton/payment_out

[REF] un-extract createProportionalFinancialEntities

5 years agoFix obscure bug on updating custom fields (not necessarily hittable via UI)
eileen [Mon, 8 Jul 2019 22:41:20 +0000 (10:41 +1200)]
Fix obscure bug on updating custom fields (not necessarily hittable via UI)

This fixes a bug which I think only applies to programatically created custom fields -basically if the field has an empty option_group_id
and then you update it to have one it does a check to see if the existing option_group_id is in use and does not handle the
fact the field is empty - leading to a mysql error.

5 years agoRemove call to getMappingFields in favour of api call.
eileen [Mon, 8 Jul 2019 23:08:18 +0000 (11:08 +1200)]
Remove call to getMappingFields in favour of api call.

The getMappingFields function is confusing - it turns out we just need an array of names

5 years agoMerge pull request #14752 from eileenmcnaughton/export
Eileen McNaughton [Mon, 8 Jul 2019 23:13:26 +0000 (11:13 +1200)]
Merge pull request #14752 from eileenmcnaughton/export

[REF] Move function onto the processor class

5 years agoNFC - reformat test class
eileen [Mon, 8 Jul 2019 22:28:28 +0000 (10:28 +1200)]
NFC - reformat test class

5 years agoMove function onto the processor class
eileen [Mon, 8 Jul 2019 21:35:32 +0000 (09:35 +1200)]
Move function onto the processor class

I went to extract the function that determines fields off to be a funciton on the processor class
but moving this first simplifies it

5 years agoMerge pull request #14514 from eileenmcnaughton/export_sc_jus_test
Eileen McNaughton [Mon, 8 Jul 2019 21:25:38 +0000 (09:25 +1200)]
Merge pull request #14514 from eileenmcnaughton/export_sc_jus_test

dev/core#1015 Unit test for fix regression on exporting soft credits

5 years agoMerge pull request #14751 from colemanw/extractCompFields
colemanw [Mon, 8 Jul 2019 16:14:59 +0000 (12:14 -0400)]
Merge pull request #14751 from colemanw/extractCompFields

[REF] Extract CRM_Core_BAO_Mapping::addComponentFields

5 years agoExtract CRM_Core_BAO_Mapping::addComponentFields
Coleman Watts [Mon, 8 Jul 2019 13:48:43 +0000 (09:48 -0400)]
Extract CRM_Core_BAO_Mapping::addComponentFields

5 years agoMerge pull request #14744 from lcdservices/dev-report-17
Yashodha Chaku [Mon, 8 Jul 2019 04:31:28 +0000 (10:01 +0530)]
Merge pull request #14744 from lcdservices/dev-report-17

dev/report#17 fix postal_code_suffix col

5 years agoe-notice fix & unit test
eileen [Thu, 4 Jul 2019 02:36:30 +0000 (14:36 +1200)]
e-notice fix & unit test

This addresses a fairly obscure enotice. The notice occurs when a table has been excluded from
triggers by a hook (as makes sense if the table includes only calculated fields) and then a new
custom field is added to the table (or presumably edited or removed). In this case we should
not go through the whole trigger handling loop.

Note I see it as a feature rather than a bug that this would also apply to triggers that
update the contact.modified_date as it's not helpful to update this when updating a
calculation - if someone decides to intervene by hook we should trust them

5 years agoMerge pull request #14616 from mattwire/contributionpage_tabset_cleanup
Eileen McNaughton [Sun, 7 Jul 2019 21:30:24 +0000 (09:30 +1200)]
Merge pull request #14616 from mattwire/contributionpage_tabset_cleanup

REF Simple cleanup of tabset code for contributionpages

5 years agoMerge pull request #14720 from pradpnayak/REF-1
Eileen McNaughton [Sun, 7 Jul 2019 16:41:59 +0000 (04:41 +1200)]
Merge pull request #14720 from pradpnayak/REF-1

Removed hardcoded activity status and used Activity create

5 years agoMerge pull request #14749 from civicrm/5.16
Eileen McNaughton [Sun, 7 Jul 2019 15:35:33 +0000 (03:35 +1200)]
Merge pull request #14749 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14746 from eileenmcnaughton/order_report
Eileen McNaughton [Sun, 7 Jul 2019 15:35:10 +0000 (03:35 +1200)]
Merge pull request #14746 from eileenmcnaughton/order_report

dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agoRemoved hardcoded activity status and used Activity create
Pradeep Nayak [Wed, 3 Jul 2019 08:17:16 +0000 (09:17 +0100)]
Removed hardcoded activity status and used Activity create

Added unit test

Use unique subject for activity in test

5 years agodev/core#1081 fix for error on contribution detail when using custom data order by...
eileen [Sun, 7 Jul 2019 06:25:19 +0000 (18:25 +1200)]
dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agodev/core#578 handle full group by on activity summary.
eileen [Sun, 7 Jul 2019 05:17:19 +0000 (17:17 +1200)]
dev/core#578 handle full group by on activity summary.

Dave J did a tonne of work fixing up this report & adding a unit test - this complete by just handling FGB very specifically
on one query

5 years agoMerge pull request #13540 from davejenx/dev-core-577-activity-summary-report-db-error
Eileen McNaughton [Sun, 7 Jul 2019 05:13:53 +0000 (17:13 +1200)]
Merge pull request #13540 from davejenx/dev-core-577-activity-summary-report-db-error

dev/core/issues/577: Activity Summary report fix for db column count error with section header (without ONLY_FULL_GROUP_BY)

5 years agodev/report#17 fix postal_code_suffix col
Brian Shaughnessy [Sat, 6 Jul 2019 13:39:33 +0000 (09:39 -0400)]
dev/report#17 fix postal_code_suffix col

5 years agoMerge pull request #14743 from colemanw/mappingRef
Eileen McNaughton [Sat, 6 Jul 2019 05:54:00 +0000 (17:54 +1200)]
Merge pull request #14743 from colemanw/mappingRef

[REF] Further cleanup & extraction in getMappingFieds

5 years agoFurther cleanup & extraction in getMappingFieds
Coleman Watts [Fri, 5 Jul 2019 22:42:40 +0000 (18:42 -0400)]
Further cleanup & extraction in getMappingFieds

5 years ago[REF] un-extract createProportionalFinancialEntities
eileen [Fri, 5 Jul 2019 20:56:19 +0000 (08:56 +1200)]
[REF] un-extract createProportionalFinancialEntities

This is one of those places where, unituitively, I think undoing an extraction makes sense.

The code for allocating monies to financial items is shared with the change payment instrument functionality
but fundamentally these are different processes and sharing the code is making it less rather than more readable.

My goal is to pull back all the code that handles processing financials off a payment back into Payment.create
and to clean it up from there

5 years agoMerge pull request #14741 from colemanw/mappingExt
Eileen McNaughton [Fri, 5 Jul 2019 20:47:43 +0000 (08:47 +1200)]
Merge pull request #14741 from colemanw/mappingExt

[REF] Simple function extraction for buildMappingForm

5 years ago[REF] Simple function extraction for buildMappingForm
Coleman Watts [Fri, 5 Jul 2019 13:53:32 +0000 (09:53 -0400)]
[REF] Simple function extraction for buildMappingForm

5 years agoMerge pull request #14727 from eileenmcnaughton/cust1
Eileen McNaughton [Fri, 5 Jul 2019 03:58:59 +0000 (15:58 +1200)]
Merge pull request #14727 from eileenmcnaughton/cust1

[REF] simple extraction of getFieldAlterSQL

5 years ago[REF] simple extraction of getFieldAlterSQL
eileen [Wed, 3 Jul 2019 23:57:59 +0000 (11:57 +1200)]
[REF] simple extraction of getFieldAlterSQL

5 years agoMerge pull request #14589 from eileenmcnaughton/money
Eileen McNaughton [Fri, 5 Jul 2019 00:13:40 +0000 (12:13 +1200)]
Merge pull request #14589 from eileenmcnaughton/money

 Fix creation of additional zero value line item when changing fee selection in edge case

5 years agoMerge pull request #14725 from eileenmcnaughton/cust_field4
Eileen McNaughton [Fri, 5 Jul 2019 00:04:29 +0000 (12:04 +1200)]
Merge pull request #14725 from eileenmcnaughton/cust_field4

[REF] extract portion that creates the custom field record

5 years agoMerge pull request #14738 from civicrm/5.16
Eileen McNaughton [Thu, 4 Jul 2019 23:47:07 +0000 (11:47 +1200)]
Merge pull request #14738 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14732 from eileenmcnaughton/backoffice
Eileen McNaughton [Thu, 4 Jul 2019 23:45:44 +0000 (11:45 +1200)]
Merge pull request #14732 from eileenmcnaughton/backoffice

dev/report#16 Unreleased regression - fee levels incorrectly show sol…

5 years agoMerge pull request #14733 from eileenmcnaughton/payment_reg
Eileen McNaughton [Thu, 4 Jul 2019 23:44:27 +0000 (11:44 +1200)]
Merge pull request #14733 from eileenmcnaughton/payment_reg

Fix refund payment not recording from additional payment form

5 years agodev/core#1015 Unit test for (merged) regression on exporting soft credits
eileen [Sat, 22 Jun 2019 22:58:20 +0000 (10:58 +1200)]
dev/core#1015 Unit test for (merged) regression on exporting soft credits

5 years agoMerge pull request #14614 from mattwire/manageevent_title
Eileen McNaughton [Thu, 4 Jul 2019 21:58:44 +0000 (09:58 +1200)]
Merge pull request #14614 from mattwire/manageevent_title

Improve handling of 'Manage Event' title

5 years agoMerge pull request #14697 from eileenmcnaughton/schema
Eileen McNaughton [Thu, 4 Jul 2019 21:51:57 +0000 (09:51 +1200)]
Merge pull request #14697 from eileenmcnaughton/schema

[REF] Cleanup fixSchemaDifferencesFor()

5 years ago[REF] extract portion that creates the custom field record
eileen [Wed, 3 Jul 2019 23:33:51 +0000 (11:33 +1200)]
[REF] extract portion that creates the custom field record

5 years agoClarify appending field to column_name
eileen [Wed, 3 Jul 2019 23:27:22 +0000 (11:27 +1200)]
Clarify appending field to column_name

5 years ago[REF] further simplification of custom field create action
eileen [Mon, 1 Jul 2019 23:43:45 +0000 (11:43 +1200)]
[REF] further simplification of custom field create action

5 years agoMerge pull request #14724 from eileenmcnaughton/cust_field3
Eileen McNaughton [Thu, 4 Jul 2019 21:43:37 +0000 (09:43 +1200)]
Merge pull request #14724 from eileenmcnaughton/cust_field3

[REF] clarify  variable (very minor change with good test cover)

5 years agoMerge pull request #14731 from eileenmcnaughton/leaky
Seamus Lee [Thu, 4 Jul 2019 16:42:27 +0000 (12:42 -0400)]
Merge pull request #14731 from eileenmcnaughton/leaky

Fix some test leakage

5 years agoMerge pull request #14736 from pradpnayak/contriblist
Seamus Lee [Thu, 4 Jul 2019 16:41:56 +0000 (12:41 -0400)]
Merge pull request #14736 from pradpnayak/contriblist

Updated Circle-Interactive developers info

5 years agoMerge pull request #14701 from eileenmcnaughton/act_location
Seamus Lee [Thu, 4 Jul 2019 15:34:21 +0000 (11:34 -0400)]
Merge pull request #14701 from eileenmcnaughton/act_location

Activity search - convert priority_id to a metadata field and add location as a searchable field

5 years agoUpdated Circle-Interactive developers info
Pradeep Nayak [Thu, 4 Jul 2019 15:09:45 +0000 (16:09 +0100)]
Updated Circle-Interactive developers info

5 years agoSimple cleanup of tabset code for contributionpages
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:05:24 +0000 (13:05 +0100)]
Simple cleanup of tabset code for contributionpages

5 years agoSet title using standard form method and use for success message on contributionpage
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:11:45 +0000 (13:11 +0100)]
Set title using standard form method and use for success message on contributionpage

5 years agoImprove handling of 'Manage Event' title
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 10:47:25 +0000 (11:47 +0100)]
Improve handling of 'Manage Event' title

5 years agoMerge pull request #14726 from eileenmcnaughton/cust_field_5
Matthew Wire [Thu, 4 Jul 2019 12:52:18 +0000 (13:52 +0100)]
Merge pull request #14726 from eileenmcnaughton/cust_field_5

[REF] simple extraction of prepareCreateParams

5 years agoMerge pull request #14721 from kirk-circle/master
Matthew Wire [Thu, 4 Jul 2019 12:51:35 +0000 (13:51 +0100)]
Merge pull request #14721 from kirk-circle/master

dev/core#1097 - Ensure consistent count on Groups tab

5 years agoFix refund payment not recording from additional payment form
eileen [Thu, 4 Jul 2019 08:41:56 +0000 (20:41 +1200)]
Fix refund payment not recording from additional payment form

5 years agoRevert participant portion of https://github.com/civicrm/civicrm-core/pull/14244
eileen [Thu, 4 Jul 2019 08:30:23 +0000 (20:30 +1200)]
Revert participant portion of https://github.com/civicrm/civicrm-core/pull/14244

5 years agoSet version to 5.17.alpha1
CiviCRM [Thu, 4 Jul 2019 07:23:15 +0000 (07:23 +0000)]
Set version to 5.17.alpha1

5 years agoSet version to 5.16.beta1
CiviCRM [Thu, 4 Jul 2019 07:19:06 +0000 (07:19 +0000)]
Set version to 5.16.beta1

5 years agoMerge remote-tracking branch 'origin/5.15'
Tim Otten [Thu, 4 Jul 2019 07:18:18 +0000 (00:18 -0700)]
Merge remote-tracking branch 'origin/5.15'

5 years agodev/report#16 Unreleased regression - fee levels incorrectly show sold out
eileen [Thu, 4 Jul 2019 07:11:14 +0000 (19:11 +1200)]
dev/report#16 Unreleased regression - fee levels incorrectly show sold out

5 years agoMerge pull request #14730 from alifrumin/5.15.0-releasenotes
Tim Otten [Thu, 4 Jul 2019 06:07:41 +0000 (23:07 -0700)]
Merge pull request #14730 from alifrumin/5.15.0-releasenotes

5.15.0 releasenotes

5 years agoSet version to 5.15.0
Tim Otten [Thu, 4 Jul 2019 06:07:19 +0000 (23:07 -0700)]
Set version to 5.15.0

5 years agoUpdate 5.15.0.md
Tim Otten [Thu, 4 Jul 2019 04:35:46 +0000 (21:35 -0700)]
Update 5.15.0.md

5 years agocleanup
Alice Frumin [Mon, 17 Jun 2019 18:29:43 +0000 (14:29 -0400)]
cleanup

5 years agofinished annotating
Alice Frumin [Mon, 17 Jun 2019 17:54:06 +0000 (13:54 -0400)]
finished annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 19:54:48 +0000 (15:54 -0400)]
annotating

5 years agofinishing changes with git lab issues
Alice Frumin [Tue, 11 Jun 2019 18:54:29 +0000 (14:54 -0400)]
finishing changes with git lab issues

5 years agolinking and annotating
Alice Frumin [Tue, 11 Jun 2019 18:09:33 +0000 (14:09 -0400)]
linking and annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 16:05:48 +0000 (12:05 -0400)]
annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 15:45:06 +0000 (11:45 -0400)]
annotating

5 years agocontributors
Alice Frumin [Mon, 10 Jun 2019 19:27:29 +0000 (15:27 -0400)]
contributors

5 years agoorganizing by git lab issue and condensing as well as pulling out obvious misc
Alice Frumin [Mon, 10 Jun 2019 19:01:46 +0000 (15:01 -0400)]
organizing by git lab issue and condensing as well as pulling out obvious misc

5 years ago5.15.0 release notes: added boilerplate
Andrew Hunt [Mon, 10 Jun 2019 16:19:23 +0000 (12:19 -0400)]
5.15.0 release notes: added boilerplate

5 years ago5.15.0 release notes: raw from script
Andrew Hunt [Mon, 10 Jun 2019 16:15:51 +0000 (12:15 -0400)]
5.15.0 release notes: raw from script

5 years agoFix some test leakage
eileen [Wed, 3 Jul 2019 21:10:16 +0000 (09:10 +1200)]
Fix some test leakage

5 years ago[REF] simple extraction of prepareCreateParams
eileen [Tue, 2 Jul 2019 01:07:36 +0000 (13:07 +1200)]
[REF] simple extraction of prepareCreateParams

5 years ago[REF] clarify variable
eileen [Wed, 3 Jul 2019 22:46:43 +0000 (10:46 +1200)]
[REF] clarify  variable

The variable is clearer being defined directly as 'add' or 'modify' in the main function to reduce wrangling

5 years agoMerge pull request #14723 from seamuslee001/ref_date_to_local_extract
Eileen McNaughton [Wed, 3 Jul 2019 21:32:20 +0000 (09:32 +1200)]
Merge pull request #14723 from seamuslee001/ref_date_to_local_extract

Extract code converting a date object to local timezone object to own…

5 years agoExtract code converting a date object to local timezone object to own function
Seamus Lee [Wed, 3 Jul 2019 18:58:18 +0000 (04:58 +1000)]
Extract code converting a date object to local timezone object to own function

5 years agodev/core#1097 - Ensure consistent count on Groups tab
Kirk Jackson [Wed, 3 Jul 2019 11:03:35 +0000 (12:03 +0100)]
dev/core#1097 - Ensure consistent count on Groups tab

5 years agoMerge pull request #14717 from totten/master-rm-ser
Eileen McNaughton [Wed, 3 Jul 2019 11:55:37 +0000 (23:55 +1200)]
Merge pull request #14717 from totten/master-rm-ser

(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

5 years agoexpose smarty's compile_check to be overridden in civicrm.settings.php
Luciano Spiegel [Tue, 2 Jul 2019 10:30:10 +0000 (12:30 +0200)]
expose smarty's compile_check to be overridden in civicrm.settings.php

5 years ago(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver
Tim Otten [Wed, 3 Jul 2019 04:05:30 +0000 (21:05 -0700)]
(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

The class `CRM_Utils_Cache_SerializeCache` provides a cache-driver for
storing cache records in the filesystem (under `CIVICRM_TEMPLATE_COMPILEDIR`,
using PHP `serialize()` format). Why remove it?

1.  As we work through cleanup in file management (e.g.  #12843,
   dev/cloud-native#3), having an unnecessary reference to
   CIVICRM_TEMPLATE_COMPILEDIR makes it harder to reason about the system.

2. The class is not used. I'm pretty sure it was added speculatively
   (i.e.  with an aim to try using it some day), but that never came to
   pass.  Grepping `universe`, I cannot find any usages or references to
   `SerializeCache`.

3. The implementation is incomplete -- parameters like `get(..., $default)`
   and `set(..., $ttl)` will generate exceptions if used.

5 years agoMerge pull request #14714 from civicrm/5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:48 +0000 (13:22 +1200)]
Merge pull request #14714 from civicrm/5.15

5.15 to master

5 years agoMerge branch 'master' into 5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:37 +0000 (13:22 +1200)]
Merge branch 'master' into 5.15

5 years agoMerge pull request #14690 from eileenmcnaughton/profile_copy
Eileen McNaughton [Wed, 3 Jul 2019 00:59:48 +0000 (12:59 +1200)]
Merge pull request #14690 from eileenmcnaughton/profile_copy

dev/core#1088 Fix fatal error when copying profile with civirules enabled

5 years agoMerge pull request #14713 from pradpnayak/REF-1
Eileen McNaughton [Tue, 2 Jul 2019 22:32:20 +0000 (10:32 +1200)]
Merge pull request #14713 from pradpnayak/REF-1

Grab contribution status id from database

5 years agoMerge pull request #14608 from eileenmcnaughton/csv_test
Seamus Lee [Tue, 2 Jul 2019 20:37:02 +0000 (16:37 -0400)]
Merge pull request #14608 from eileenmcnaughton/csv_test

 [test] convert export test to handle exception rather than early return

5 years agoGrab contribution status id from database
Pradeep Nayak [Tue, 2 Jul 2019 20:36:36 +0000 (21:36 +0100)]
Grab contribution status id from database