Seamus Lee [Tue, 25 Jun 2019 21:16:02 +0000 (07:16 +1000)]
[Test] Add in unit test attempting to demonstrate issue caused by dev/core#1069
Eileen McNaughton [Tue, 25 Jun 2019 20:43:42 +0000 (08:43 +1200)]
Merge pull request #14632 from colemanw/datePicker
Handle relative start & end dates passed to datepicker widget
Eileen McNaughton [Tue, 25 Jun 2019 20:17:35 +0000 (08:17 +1200)]
Merge pull request #14635 from colemanw/2019
Update example dates from 2009 to current year
Coleman Watts [Tue, 25 Jun 2019 13:51:13 +0000 (09:51 -0400)]
Update example dates from 2009 to current year
Eileen McNaughton [Tue, 25 Jun 2019 03:11:21 +0000 (15:11 +1200)]
Merge pull request #14630 from mlutfy/activityStatus
Activity formRule status check cleanup
Coleman Watts [Tue, 25 Jun 2019 02:57:10 +0000 (22:57 -0400)]
Handle relative start & end dates passed to datepicker widget
Seamus Lee [Tue, 25 Jun 2019 00:06:46 +0000 (10:06 +1000)]
Merge pull request #14607 from seamuslee001/clear_memory_backed_groups_cache
Ensure that contact groups caches are cleared if memory backed
Eileen McNaughton [Mon, 24 Jun 2019 23:31:43 +0000 (11:31 +1200)]
Merge pull request #14631 from seamuslee001/remove_legacy_prevnext_group
Remove handling for legacy PrevNextCache group as it has now been con…
Seamus Lee [Mon, 24 Jun 2019 22:05:55 +0000 (08:05 +1000)]
Remove handling for legacy PrevNextCache group as it has now been converted
Seamus Lee [Mon, 24 Jun 2019 21:51:47 +0000 (07:51 +1000)]
Merge pull request #14627 from eileenmcnaughton/cont_date
Follow up to receive_date convert to datepicker - update test
Eileen McNaughton [Mon, 24 Jun 2019 20:42:52 +0000 (08:42 +1200)]
Merge pull request #14588 from colemanw/js
Improve utilities & tests for working with js notation
Eileen McNaughton [Mon, 24 Jun 2019 20:20:35 +0000 (08:20 +1200)]
Merge pull request #14629 from seamuslee001/test_dev_core_357
[TEST] Update Email Common Test to incorporate testing for the fix fo…
Coleman Watts [Thu, 20 Jun 2019 15:42:51 +0000 (11:42 -0400)]
Improve utilities & tests for working with js notation
Mathieu Lutfy [Mon, 24 Jun 2019 14:21:42 +0000 (10:21 -0400)]
Activity formRule status check cleanup
Under some circumstances, the activity_type_id from fields and from the getKey
call can both return NULL, causing the formRule to raise an error that one cannot
record a scheduled SMS activity.
colemanw [Mon, 24 Jun 2019 13:19:08 +0000 (09:19 -0400)]
Merge pull request #14602 from mattwire/event_selectedchild
Add a helper function to ensure we always set the correct tab for manage events
Seamus Lee [Mon, 24 Jun 2019 10:44:33 +0000 (20:44 +1000)]
[TEST] Update Email Common Test to incorporate testing for the fix for dev/core#357 for signatures
Seamus Lee [Mon, 24 Jun 2019 06:08:37 +0000 (16:08 +1000)]
Merge pull request #14612 from seamuslee001/fix_contribution_status_default_search_form
Ensure that completed status is selected by default on search contrib…
Seamus Lee [Sun, 23 Jun 2019 05:56:04 +0000 (15:56 +1000)]
Ensure that completed status is selected by default on search contribution form
Use PseudoConstant function as label could change (good point thanks pradeep)
eileen [Mon, 24 Jun 2019 02:55:19 +0000 (14:55 +1200)]
Follow up to receive_date convert to datepicker - update test
Eileen McNaughton [Sun, 23 Jun 2019 23:38:41 +0000 (11:38 +1200)]
Merge pull request #14613 from seamuslee001/dev_core_1059
dev/core#1059 Replace deprecated start and end url params with receiv…
Eileen McNaughton [Sun, 23 Jun 2019 23:30:38 +0000 (11:30 +1200)]
Merge pull request #14611 from eileenmcnaughton/url_support
Follow up fix on start as a url parameter
Eileen McNaughton [Sun, 23 Jun 2019 23:29:53 +0000 (11:29 +1200)]
Merge pull request #14605 from eileenmcnaughton/cust_deadlock
Reduce deadlocks on inserting custom data by only using 'ON DUPLICATE' when it is not a new row
Eileen McNaughton [Sun, 23 Jun 2019 23:29:25 +0000 (11:29 +1200)]
Merge pull request #14623 from eileenmcnaughton/receive
Add query object support for receive_date_high & receive_date_low and generically date fields
eileen [Sun, 23 Jun 2019 22:32:52 +0000 (10:32 +1200)]
Add query object support for receive_date_high & receive_date_low and generically date fields
Seamus Lee [Sun, 23 Jun 2019 21:00:54 +0000 (07:00 +1000)]
Merge pull request #14619 from mattwire/pseudoconstant_types
NFC These pseudoconstant functions return array or string
Seamus Lee [Sun, 23 Jun 2019 07:37:28 +0000 (17:37 +1000)]
dev/core#1059 Replace deprecated start and end url params with receive_date_low and receive_date_high
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 18:05:35 +0000 (19:05 +0100)]
These pseudoconstant functions return array or string
Matthew Wire (MJW Consulting) [Sat, 22 Jun 2019 11:25:04 +0000 (12:25 +0100)]
Add a helper function to ensure we always set the correct tab for manage events
eileen [Fri, 21 Jun 2019 14:41:40 +0000 (10:41 -0400)]
Follow up fix on start as a url parameeter
Eileen McNaughton [Sun, 23 Jun 2019 02:13:45 +0000 (14:13 +1200)]
Merge pull request #14606 from eileenmcnaughton/format
[NFC] code formatting
Seamus Lee [Sun, 23 Jun 2019 02:12:26 +0000 (12:12 +1000)]
Merge pull request #14594 from eileenmcnaughton/url_support
Fix url support for receive_date_high & receive_date_low
Eileen McNaughton [Sat, 22 Jun 2019 23:21:18 +0000 (11:21 +1200)]
Merge pull request #14580 from seamuslee001/convert_prevnext_cache
Convert prevNextCache to standard Cache Defintiion format
eileen [Sat, 22 Jun 2019 21:58:14 +0000 (09:58 +1200)]
[NFC] code formatting
Seamus Lee [Sat, 22 Jun 2019 22:30:56 +0000 (08:30 +1000)]
Ensure that contact groups caches are cleared if memory backed
eileen [Fri, 21 Jun 2019 22:26:35 +0000 (18:26 -0400)]
Reduce deadlocks on inserting custom data by only using 'ON DUPLICATE' when it is not a new row
ON Duplicate is used in the customData.create function so that a row can be inserted and if it exists
mysql adapts and updates the existing row. This is more expensive and more prone to deadlocks than a straight
'INSERT' but is probably better than figuring it out at the php layer when you don't know if it could be
an update rather than an insert.
However, in many of the cases we already know this information - ie. if we are creating a new contribution
the custom data is created afterwards so we can use this information from Contribution.create to opt for the
cheaper & less deadlocky version.
We deployed this fix before our main fundraiser due to handful of daily deadlocks on this under peak load
and this form of deadlock did not bother us again during our main fundraiser when we were processing large volumes.
The patch has been in production around 6 months at this point.
Note that the reason deadlocks are encountered is that the 'next row' index is locked when inserting, and
it's either locked for longer or more aggressively when it;'s also checking for a deadlock at the same time (not
sure which)
Eileen McNaughton [Sat, 22 Jun 2019 21:49:52 +0000 (09:49 +1200)]
Merge pull request #14600 from seamuslee001/util_function_for_resetting_ACL_System_cache
[REF] Add in utility function for resetting ACL and System Level Caches
Eileen McNaughton [Sat, 22 Jun 2019 21:47:01 +0000 (09:47 +1200)]
Merge pull request #14603 from mattwire/event_comments
NFC Cleanup comments on BAO event
Matthew Wire (MJW Consulting) [Sat, 22 Jun 2019 12:03:42 +0000 (13:03 +0100)]
Cleanup comments
Monish Deb [Sat, 22 Jun 2019 04:18:58 +0000 (09:48 +0530)]
Merge pull request #14599 from eileenmcnaughton/record_partial_1
Decommission recordPartialPayment function
Seamus Lee [Sat, 22 Jun 2019 03:46:10 +0000 (13:46 +1000)]
Add in utility function for resetting ACL and System Level Caches
Seamus Lee [Sat, 22 Jun 2019 04:02:30 +0000 (14:02 +1000)]
Merge pull request #14598 from eileenmcnaughton/amp
[REF] do not pass by reference to store & create functions
Eileen McNaughton [Sat, 22 Jun 2019 03:28:10 +0000 (20:28 -0700)]
Merge pull request #14584 from seamuslee001/contact_group_cache_backend_convert
Convert Contact Groups cache group to standard cache definition
eileen [Fri, 21 Jun 2019 22:19:21 +0000 (18:19 -0400)]
[REF] do not pass by reference to store & create functions
After checking the code these are unchanged & not using pass-by-reference unecessarily is better practice
Seamus Lee [Fri, 21 Jun 2019 23:05:52 +0000 (09:05 +1000)]
Ensure that if we are ever clearing keys from civicrm_cache for prevNext that we also clear from civicrm_prev_next_cache if sqlBacked or just deleteItem if only deleting a single cache Key
Seamus Lee [Tue, 18 Jun 2019 22:07:55 +0000 (08:07 +1000)]
Convert prevNextCache to standard Cache Defintiion format
Seamus Lee [Fri, 21 Jun 2019 22:23:29 +0000 (08:23 +1000)]
Merge pull request #14595 from colemanw/setup
Fix setup.sh crash when using the -a flag
eileen [Fri, 21 Jun 2019 21:50:40 +0000 (17:50 -0400)]
Decommission recordPartialPayment function
While I would normally say extracting is good sometimes if feels like things are being broken down in the
wrong places. In this case I think the function name is misleading and having this in the body of Payment.create
makes the path to cleaning up that function clearer
Seamus Lee [Fri, 21 Jun 2019 20:24:56 +0000 (06:24 +1000)]
Merge pull request #14593 from eileenmcnaughton/seamus
Towards Convert receive_date to use datepicker in search
Coleman Watts [Fri, 21 Jun 2019 19:02:45 +0000 (15:02 -0400)]
Fix setup.sh crash when using the -a flag
eileen [Fri, 21 Jun 2019 14:20:06 +0000 (10:20 -0400)]
Fix url support for receive_date_high & receive_date_low
This ensures that the following url params are supported
receive_date_high=
20180101
receive_date_low....
contribution_cancel_date_high
contribution_cancel_date_low
invoice_number=
Note that in doing this I fixed the new & somewhat experimental default function to use field uniquenames
rather than field names (as this is how they are added to the form & it was required for cancel_date.
Support for receive_date_relative=this.day etc would be trivial but not yet tackled
Also I see that we historically support 'start' and 'end' I think we can tackle this by doing something like
if start is set then ->set('contribution_date_low' - probably with a deprecation notice)
I will leave for a follow up though
Seamus Lee [Fri, 14 Jun 2019 21:33:15 +0000 (07:33 +1000)]
Fix Batch searching on receive date follwoing conversion and handle receive_date param for the moment as not properly namespaced
Eileen McNaughton [Fri, 21 Jun 2019 12:42:42 +0000 (08:42 -0400)]
Merge pull request #14590 from colemanw/i18nApi
Support api3 & 4 language syntax & improve test
Eileen McNaughton [Fri, 21 Jun 2019 12:10:14 +0000 (08:10 -0400)]
Merge pull request #14592 from civicrm/5.15
5.15 to master
Eileen McNaughton [Fri, 21 Jun 2019 12:09:31 +0000 (08:09 -0400)]
Merge pull request #14572 from seamuslee001/dev_core_1052
Fix dev/core#1052 Activities causing a fatal error if target_contact is not accessable to logged in user
Coleman Watts [Fri, 21 Jun 2019 02:18:00 +0000 (22:18 -0400)]
Support api3 & 4 language syntax & test
colemanw [Fri, 21 Jun 2019 01:26:27 +0000 (21:26 -0400)]
Merge pull request #14460 from eileenmcnaughton/ajax_test
Add default receive_date for contributions at BAO level
colemanw [Fri, 21 Jun 2019 01:21:51 +0000 (21:21 -0400)]
Merge pull request #14480 from JMAConsulting/core-553
dev/core#553: Creating new event takes value from default value not from saved template for custom fields
Seamus Lee [Tue, 18 Jun 2019 02:14:58 +0000 (12:14 +1000)]
dev/core#1052 fix fatal error when first target contact is not visible to the logged in user and update test appropriately
Seamus Lee [Tue, 18 Jun 2019 01:52:34 +0000 (11:52 +1000)]
Add in unit test demonstrating the fatal error generated
Mathieu Lu [Thu, 20 Jun 2019 19:23:20 +0000 (15:23 -0400)]
Merge pull request #14578 from colemanw/i18n
i18n - Improve multilingual popup for text and wysiwyg fields
Seamus Lee [Thu, 20 Jun 2019 06:16:43 +0000 (16:16 +1000)]
Merge pull request #14519 from colemanw/submitOnce
dev/core#914 rewrite submitOnce function
Yashodha Chaku [Wed, 19 Jun 2019 14:28:45 +0000 (19:58 +0530)]
Merge pull request #14585 from seamuslee001/primary_mebership_label_chagne
Update Owner Membership ID label in reports to be Primary Membership …
Eileen McNaughton [Wed, 19 Jun 2019 11:42:23 +0000 (07:42 -0400)]
Merge pull request #14586 from colemanw/Utils_JS
Utils_JS - add fn to get props of js object without parsing them
Seamus Lee [Tue, 18 Jun 2019 23:25:11 +0000 (09:25 +1000)]
Update Owner Membership ID label in reports to be Primary Membership to be more consistant with rest of system
Re-order owner_membership_id field options so that primary members only and non-primary-members-only filters are at the top
Coleman Watts [Wed, 19 Jun 2019 00:37:37 +0000 (20:37 -0400)]
Utils_JS - add fn to get props of js object without parsing them
Seamus Lee [Tue, 18 Jun 2019 23:00:47 +0000 (09:00 +1000)]
Merge pull request #14579 from civicrm/5.15
5.15
Seamus Lee [Tue, 18 Jun 2019 22:53:18 +0000 (08:53 +1000)]
Convert Contact Groups cache group to standard cache defition
Seamus Lee [Tue, 18 Jun 2019 21:42:38 +0000 (07:42 +1000)]
Merge pull request #14568 from greenpeace-cee/fix-schemahandler-cache
Fix use of cached schema information in SchemaHandler
Eileen McNaughton [Tue, 18 Jun 2019 21:33:45 +0000 (17:33 -0400)]
Merge pull request #14575 from seamuslee001/5_14_1_release_notes
Add release-notes for 5.14.1
Coleman Watts [Tue, 18 Jun 2019 17:48:38 +0000 (13:48 -0400)]
i18n - Improve multilingual popup for text and wysiwyg fields
Tim Otten [Tue, 18 Jun 2019 03:55:00 +0000 (20:55 -0700)]
Add release-notes/5.14.1.md
Seamus Lee [Tue, 18 Jun 2019 06:45:47 +0000 (16:45 +1000)]
Merge pull request #14573 from seamuslee001/5.15
Update http_timeout setting version to match the fact it is being bac…
Seamus Lee [Tue, 18 Jun 2019 04:16:00 +0000 (14:16 +1000)]
Merge pull request #14562 from agileware/CIVICRM-1244
dev/core#1049: Use FrontEndPaymentFormTrait to assign line items…
Seamus Lee [Tue, 18 Jun 2019 03:53:58 +0000 (13:53 +1000)]
Update http_timeout setting version to match the fact it is being backported to 5.14
Seamus Lee [Mon, 17 Jun 2019 23:45:48 +0000 (09:45 +1000)]
Merge pull request #14569 from pradpnayak/HardCodes
Removed hardcoded value for registered participant status
Pradeep Nayak [Mon, 17 Jun 2019 22:01:54 +0000 (23:01 +0100)]
Removed hardcoded value for registered participant statu
Patrick Figel [Mon, 17 Jun 2019 21:44:58 +0000 (23:44 +0200)]
Fix use of cached schema information in SchemaHandler
This fixes an issue where CRM_Core_BAO_SchemaHandler uses outdated
schema/column information from cache when rebuilding triggers. In
certain scenarios, for example when multiple custom fields are deleted
during a single script execution, this could cause generated SQL to
reference deleted columns, throwing an error.
Eileen McNaughton [Mon, 17 Jun 2019 14:56:24 +0000 (10:56 -0400)]
Merge pull request #14543 from eileenmcnaughton/wtf_null
[TEST] add assert to ensure nullArray & nullObject are not contaminated
Eileen McNaughton [Mon, 17 Jun 2019 14:32:25 +0000 (10:32 -0400)]
Merge pull request #14566 from civicrm/5.15
5.15 to master
Eileen McNaughton [Mon, 17 Jun 2019 14:30:52 +0000 (10:30 -0400)]
Merge pull request #14565 from vingle/patch-6
Resolve a conflict with Wordpress CSS
Eileen McNaughton [Mon, 17 Jun 2019 13:30:05 +0000 (09:30 -0400)]
Merge pull request #14564 from seamuslee001/less_null_array
Remove more uses of CRM_Core_DAO::$_nullArray that are unncessary
Nicol [Mon, 17 Jun 2019 12:20:57 +0000 (13:20 +0100)]
Resolve a conflict with Wordpress CSS
Issue was affecting menu item wrap/overflow, described here: https://github.com/veda-consulting/uk.co.vedaconsulting.gdpr/issues/192.
Seamus Lee [Mon, 17 Jun 2019 09:38:56 +0000 (19:38 +1000)]
Remove a few more uses
Seamus Lee [Mon, 17 Jun 2019 09:06:40 +0000 (19:06 +1000)]
Remove more uses of CRM_Core_DAO:: that are unncessary
Eileen McNaughton [Mon, 17 Jun 2019 08:06:34 +0000 (04:06 -0400)]
Merge pull request #14560 from seamuslee001/null_array_profile
Remove unncessary $_nullArray usage when calling createProfileContact function
Eileen McNaughton [Mon, 17 Jun 2019 08:06:18 +0000 (04:06 -0400)]
Merge pull request #14561 from seamuslee001/null_array_execute_query
Remove unneeded use of CRM_Core_DAO::$_nullArray in executeQuery or s…
Seamus Lee [Mon, 17 Jun 2019 04:55:11 +0000 (14:55 +1000)]
Remove unneeded use of CRM_Core_DAO::$_nullArray in executeQuery or similar calls
Seamus Lee [Mon, 17 Jun 2019 04:32:49 +0000 (14:32 +1000)]
Remove unncessary usage of CRM_Core_DAO::$_nullArray when calling createProfileContact function
And annother instance
Francis Whittle [Mon, 17 Jun 2019 04:19:34 +0000 (14:19 +1000)]
CIVICRM-1244: Use FrontEndPaymentFormTrait to assign line items on Event Registration Confirm and ThankYou "forms"
Eileen McNaughton [Mon, 17 Jun 2019 00:05:47 +0000 (20:05 -0400)]
Merge pull request #14558 from seamuslee001/price_bao_null
[REF] Remove more instances of _nullArray
Eileen McNaughton [Mon, 17 Jun 2019 00:04:01 +0000 (20:04 -0400)]
Merge pull request #14559 from seamuslee001/entity_setting_legacy_cache
Alter PSR16 code to take into account of new entitysetting release wi…
Seamus Lee [Sun, 16 Jun 2019 22:31:28 +0000 (08:31 +1000)]
Alter PSR16 code to take into account of new entitysetting release with upgraded caching
Seamus Lee [Sun, 16 Jun 2019 22:19:50 +0000 (08:19 +1000)]
Remove more instances of _nullArray
Seamus Lee [Sun, 16 Jun 2019 22:08:58 +0000 (08:08 +1000)]
Merge pull request #14136 from mattwire/buttonpopups
Support button elements in ajax popups
Seamus Lee [Sun, 16 Jun 2019 20:45:28 +0000 (06:45 +1000)]
Merge pull request #14509 from mattwire/buttons_settings_cleanupcache_standard
Add buttons to 'Cleanup caches and update paths' in standard way
Matthew Wire (MJW Consulting) [Thu, 13 Jun 2019 14:34:19 +0000 (15:34 +0100)]
Add buttons to 'Cleanup caches and update paths' in standard way
Matthew Wire (MJW Consulting) [Fri, 26 Apr 2019 13:29:40 +0000 (14:29 +0100)]
Support button elements in ajax popups
Coleman Watts [Sun, 16 Jun 2019 14:58:56 +0000 (10:58 -0400)]
SubmitOnce - play nice with jQuery validate
Coleman Watts [Thu, 13 Jun 2019 20:26:02 +0000 (16:26 -0400)]
Rewrite submitOnce function, deprecate old one
New function works on a per-form basis, not per button.
It changes the button icon instead of the button text.
Eileen McNaughton [Sun, 16 Jun 2019 13:55:07 +0000 (09:55 -0400)]
Merge pull request #14557 from civicrm/5.15
5.15 to master