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
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
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)
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.
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
colemanw [Mon, 8 Jul 2019 23:51:34 +0000 (19:51 -0400)]
Merge pull request #14742 from eileenmcnaughton/payment_out
[REF] un-extract createProportionalFinancialEntities
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.
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
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
eileen [Mon, 8 Jul 2019 22:28:28 +0000 (10:28 +1200)]
NFC - reformat test 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
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
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
Coleman Watts [Mon, 8 Jul 2019 13:48:43 +0000 (09:48 -0400)]
Extract CRM_Core_BAO_Mapping::addComponentFields
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
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
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
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
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
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
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
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
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)
Brian Shaughnessy [Sat, 6 Jul 2019 13:39:33 +0000 (09:39 -0400)]
dev/report#17 fix postal_code_suffix col
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
Coleman Watts [Fri, 5 Jul 2019 22:42:40 +0000 (18:42 -0400)]
Further cleanup & extraction in getMappingFieds
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
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
Coleman Watts [Fri, 5 Jul 2019 13:53:32 +0000 (09:53 -0400)]
[REF] Simple function extraction for buildMappingForm
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
eileen [Wed, 3 Jul 2019 23:57:59 +0000 (11:57 +1200)]
[REF] simple extraction of getFieldAlterSQL
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
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
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
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…
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
eileen [Sat, 22 Jun 2019 22:58:20 +0000 (10:58 +1200)]
dev/core#1015 Unit test for (merged) regression on exporting soft credits
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
Eileen McNaughton [Thu, 4 Jul 2019 21:51:57 +0000 (09:51 +1200)]
Merge pull request #14697 from eileenmcnaughton/schema
[REF] Cleanup fixSchemaDifferencesFor()
eileen [Wed, 3 Jul 2019 23:33:51 +0000 (11:33 +1200)]
[REF] extract portion that creates the custom field record
eileen [Wed, 3 Jul 2019 23:27:22 +0000 (11:27 +1200)]
Clarify appending field to column_name
eileen [Mon, 1 Jul 2019 23:43:45 +0000 (11:43 +1200)]
[REF] further simplification of custom field create action
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)
Seamus Lee [Thu, 4 Jul 2019 16:42:27 +0000 (12:42 -0400)]
Merge pull request #14731 from eileenmcnaughton/leaky
Fix some test leakage
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
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
Pradeep Nayak [Thu, 4 Jul 2019 15:09:45 +0000 (16:09 +0100)]
Updated Circle-Interactive developers info
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:05:24 +0000 (13:05 +0100)]
Simple cleanup of tabset code for contributionpages
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 10:47:25 +0000 (11:47 +0100)]
Improve handling of 'Manage Event' title
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
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
eileen [Thu, 4 Jul 2019 08:41:56 +0000 (20:41 +1200)]
Fix refund payment not recording from additional payment form
eileen [Thu, 4 Jul 2019 08:30:23 +0000 (20:30 +1200)]
Revert participant portion of https://github.com/civicrm/civicrm-core/pull/14244
CiviCRM [Thu, 4 Jul 2019 07:23:15 +0000 (07:23 +0000)]
Set version to 5.17.alpha1
CiviCRM [Thu, 4 Jul 2019 07:19:06 +0000 (07:19 +0000)]
Set version to 5.16.beta1
Tim Otten [Thu, 4 Jul 2019 07:18:18 +0000 (00:18 -0700)]
Merge remote-tracking branch 'origin/5.15'
eileen [Thu, 4 Jul 2019 07:11:14 +0000 (19:11 +1200)]
dev/report#16 Unreleased regression - fee levels incorrectly show sold out
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
Tim Otten [Thu, 4 Jul 2019 06:07:19 +0000 (23:07 -0700)]
Set version to 5.15.0
Tim Otten [Thu, 4 Jul 2019 04:35:46 +0000 (21:35 -0700)]
Update 5.15.0.md
Alice Frumin [Mon, 17 Jun 2019 18:29:43 +0000 (14:29 -0400)]
cleanup
Alice Frumin [Mon, 17 Jun 2019 17:54:06 +0000 (13:54 -0400)]
finished annotating
Alice Frumin [Tue, 11 Jun 2019 19:54:48 +0000 (15:54 -0400)]
annotating
Alice Frumin [Tue, 11 Jun 2019 18:54:29 +0000 (14:54 -0400)]
finishing changes with git lab issues
Alice Frumin [Tue, 11 Jun 2019 18:09:33 +0000 (14:09 -0400)]
linking and annotating
Alice Frumin [Tue, 11 Jun 2019 16:05:48 +0000 (12:05 -0400)]
annotating
Alice Frumin [Tue, 11 Jun 2019 15:45:06 +0000 (11:45 -0400)]
annotating
Alice Frumin [Mon, 10 Jun 2019 19:27:29 +0000 (15:27 -0400)]
contributors
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
Andrew Hunt [Mon, 10 Jun 2019 16:19:23 +0000 (12:19 -0400)]
5.15.0 release notes: added boilerplate
Andrew Hunt [Mon, 10 Jun 2019 16:15:51 +0000 (12:15 -0400)]
5.15.0 release notes: raw from script
eileen [Wed, 3 Jul 2019 21:10:16 +0000 (09:10 +1200)]
Fix some test leakage
eileen [Tue, 2 Jul 2019 01:07:36 +0000 (13:07 +1200)]
[REF] simple extraction of prepareCreateParams
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
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…
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
Kirk Jackson [Wed, 3 Jul 2019 11:03:35 +0000 (12:03 +0100)]
dev/core#1097 - Ensure consistent count on Groups tab
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
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.
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
Eileen McNaughton [Wed, 3 Jul 2019 01:22:37 +0000 (13:22 +1200)]
Merge branch 'master' into 5.15
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
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
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
Pradeep Nayak [Tue, 2 Jul 2019 20:36:36 +0000 (21:36 +0100)]
Grab contribution status id from database
Eileen McNaughton [Tue, 2 Jul 2019 19:32:56 +0000 (07:32 +1200)]
Merge pull request #14707 from demeritcowboy/why-is-php-case-insensitive-for-classnames-2
dev/joomla#13 - followup 2 - Some class names have wrong upper/lower case spelling
Eileen McNaughton [Tue, 2 Jul 2019 19:32:16 +0000 (07:32 +1200)]
Merge pull request #14708 from demeritcowboy/why-is-php-case-insensitive-for-classnames-3
dev/joomla#13 - followup 3 - Some class names have wrong upper/lower case spelling
Eileen McNaughton [Tue, 2 Jul 2019 19:31:43 +0000 (07:31 +1200)]
Merge pull request #14709 from demeritcowboy/why-is-php-case-insensitive-for-classnames-4
dev/joomla#13 - followup 4 - Some class names have wrong upper/lower case spelling
Seamus Lee [Tue, 2 Jul 2019 15:32:22 +0000 (11:32 -0400)]
Merge pull request #14710 from demeritcowboy/why-is-php-case-insensitive-for-classnames-5
dev/joomla#13 - followup 5 - Some class names have wrong upper/lower case spelling
Seamus Lee [Tue, 2 Jul 2019 15:29:54 +0000 (11:29 -0400)]
Merge pull request #14704 from pradpnayak/REF-1
Grab contribution status id from database
Seamus Lee [Tue, 2 Jul 2019 15:29:28 +0000 (11:29 -0400)]
Merge pull request #14685 from eileenmcnaughton/mark_conflict
Consolidate handling of conflicts between the batch job and get_conflicts api
DemeritCowboy [Tue, 2 Jul 2019 14:31:47 +0000 (10:31 -0400)]
fix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:25:29 +0000 (10:25 -0400)]
fix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:19:54 +0000 (10:19 -0400)]
fix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:09:21 +0000 (10:09 -0400)]
fix wrong spelling of classname
Monish Deb [Tue, 2 Jul 2019 09:13:03 +0000 (14:43 +0530)]
Merge pull request #14693 from eileenmcnaughton/cust_field_sql
[REF] remove instances of pass-by-reference where no change takes place
Monish Deb [Tue, 2 Jul 2019 08:49:30 +0000 (14:19 +0530)]
Merge pull request #14503 from pradpnayak/ReportFix
$this->_selectedTables is not populated incase of boleen filters
Pradeep Nayak [Tue, 2 Jul 2019 08:43:48 +0000 (09:43 +0100)]
Grab contribution status id from database
Eileen McNaughton [Tue, 2 Jul 2019 07:50:50 +0000 (19:50 +1200)]
Merge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames
dev/joomla#13 - followup - Some class names have wrong upper/lower case spelling
Monish Deb [Tue, 2 Jul 2019 06:12:40 +0000 (11:42 +0530)]
Merge pull request #14689 from eileenmcnaughton/cust_field_create
[REF] extract prepareCreate from CustomField.create