civicrm-core.git
5 years ago[NFC] formatting on test class cleanup
eileen [Thu, 27 Jun 2019 02:30:57 +0000 (14:30 +1200)]
[NFC] formatting on test class cleanup

5 years agoMerge pull request #14642 from civicrm/5.15
Eileen McNaughton [Wed, 26 Jun 2019 23:11:25 +0000 (11:11 +1200)]
Merge pull request #14642 from civicrm/5.15

5.15

5 years agoMerge pull request #14571 from eileenmcnaughton/mem
Seamus Lee [Wed, 26 Jun 2019 22:50:09 +0000 (08:50 +1000)]
Merge pull request #14571 from eileenmcnaughton/mem

dev/core#1038 partial - fix checksum url for cancelling recurring with mid in the url

5 years agoMerge pull request #14641 from agh1/fix-cron-help-link
Seamus Lee [Wed, 26 Jun 2019 22:18:29 +0000 (08:18 +1000)]
Merge pull request #14641 from agh1/fix-cron-help-link

Scheduled jobs: replace outdated wiki link

5 years agoScheduled jobs: replace outdated wiki link
Andrew Hunt [Wed, 26 Jun 2019 15:43:27 +0000 (11:43 -0400)]
Scheduled jobs: replace outdated wiki link

5 years agoMerge pull request #14601 from seamuslee001/dev_core_1067
Eileen McNaughton [Wed, 26 Jun 2019 05:48:45 +0000 (17:48 +1200)]
Merge pull request #14601 from seamuslee001/dev_core_1067

dev/core#1067 Clean Money before creating Campaign record and add test

5 years agoMerge pull request #14626 from eileenmcnaughton/notice
Eileen McNaughton [Wed, 26 Jun 2019 00:05:32 +0000 (12:05 +1200)]
Merge pull request #14626 from eileenmcnaughton/notice

Fix notice on editing contribution

5 years agoFix notice on editing contribution
eileen [Mon, 24 Jun 2019 02:43:16 +0000 (14:43 +1200)]
Fix notice on editing contribution

5 years agoMerge pull request #14499 from mattwire/extract_getdefaultroleid
Seamus Lee [Tue, 25 Jun 2019 22:23:35 +0000 (08:23 +1000)]
Merge pull request #14499 from mattwire/extract_getdefaultroleid

REF Extract getDefaultRoleID for add participant

5 years agoMerge pull request #14634 from colemanw/checklist
Tim Otten [Tue, 25 Jun 2019 21:58:14 +0000 (14:58 -0700)]
Merge pull request #14634 from colemanw/checklist

Add checklist-model angular module

5 years agoMerge pull request #14636 from colemanw/revertDate
Seamus Lee [Tue, 25 Jun 2019 21:56:23 +0000 (07:56 +1000)]
Merge pull request #14636 from colemanw/revertDate

Partially revert "Update example dates from 2009 to current year"

5 years agoMerge pull request #14597 from colemanw/Reset
Seamus Lee [Tue, 25 Jun 2019 21:50:28 +0000 (07:50 +1000)]
Merge pull request #14597 from colemanw/Reset

Reset language at end of localized api call

5 years agoMerge pull request #14638 from civicrm/5.15
Eileen McNaughton [Tue, 25 Jun 2019 21:46:02 +0000 (09:46 +1200)]
Merge pull request #14638 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14624 from eileenmcnaughton/force_defaults
Seamus Lee [Tue, 25 Jun 2019 21:37:50 +0000 (07:37 +1000)]
Merge pull request #14624 from eileenmcnaughton/force_defaults

dev/core#1059 Fix contribution search to work with url parameters in force mode

5 years agoMerge pull request #14618 from eileenmcnaughton/5.15
Seamus Lee [Tue, 25 Jun 2019 21:37:14 +0000 (07:37 +1000)]
Merge pull request #14618 from eileenmcnaughton/5.15

dev/core#926 & dev/core#1048 Fix group search builder bugs

5 years agoMerge pull request #14632 from colemanw/datePicker
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

5 years agoPartially revert "Update example dates from 2009 to current year"
Coleman Watts [Tue, 25 Jun 2019 20:33:31 +0000 (16:33 -0400)]
Partially revert "Update example dates from 2009 to current year"

This reverts most of commit 86ef49af1894a4e68a9bf84d40bb5fa0cb98c586.

5 years agoMerge pull request #14635 from colemanw/2019
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

5 years agoUpdate 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

5 years agoAdd checklist-model angular module
Coleman Watts [Tue, 25 Jun 2019 13:37:01 +0000 (09:37 -0400)]
Add checklist-model angular module

5 years agoMerge pull request #14630 from mlutfy/activityStatus
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

5 years agoHandle relative start & end dates passed to datepicker widget
Coleman Watts [Tue, 25 Jun 2019 02:57:10 +0000 (22:57 -0400)]
Handle relative start & end dates passed to datepicker widget

5 years agoMerge pull request #14607 from seamuslee001/clear_memory_backed_groups_cache
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

5 years agoMerge pull request #14631 from seamuslee001/remove_legacy_prevnext_group
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…

5 years agodev/core#1059 Fix contribution search to work with url parameters in force mode
eileen [Sun, 23 Jun 2019 23:59:18 +0000 (11:59 +1200)]
dev/core#1059 Fix contribution search to work with url parameters in force mode

Note this is part of the general 'convert receive_date to datepicker' work

5 years agoSupport url defaults on event search
eileen [Fri, 7 Jun 2019 05:16:59 +0000 (17:16 +1200)]
Support url defaults on event search

This adds url support for sort_name & participant_status_id & participant_register_date to event search

civicrm/event/search?reset=1&sort_name=p&participant_status_id=1&participant_register_date_low=20180101

5 years agoRemove handling for legacy PrevNextCache group as it has now been converted
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

5 years agoMerge pull request #14627 from eileenmcnaughton/cont_date
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

5 years agoMerge pull request #14588 from colemanw/js
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

5 years agoMerge pull request #14629 from seamuslee001/test_dev_core_357
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…

5 years agoImprove utilities & tests for working with js notation
Coleman Watts [Thu, 20 Jun 2019 15:42:51 +0000 (11:42 -0400)]
Improve utilities & tests for working with js notation

5 years agoActivity formRule status check cleanup
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.

5 years agoMerge pull request #14602 from mattwire/event_selectedchild
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

5 years ago[TEST] Update Email Common Test to incorporate testing for the fix for dev/core#357...
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

5 years agoMerge pull request #14612 from seamuslee001/fix_contribution_status_default_search_form
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…

5 years agoEnsure that completed status is selected by default on search contribution form
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)

5 years agoFollow up to receive_date convert to datepicker - update test
eileen [Mon, 24 Jun 2019 02:55:19 +0000 (14:55 +1200)]
Follow up to receive_date convert to datepicker - update test

5 years agoCast = to IN as tests show this PR otherwise breaks on resolving parent-child
eileen [Sun, 23 Jun 2019 19:03:34 +0000 (07:03 +1200)]
Cast = to IN as tests show this PR otherwise breaks on resolving parent-child

5 years agoMerge pull request #14609 from seamuslee001/5.15
Eileen McNaughton [Mon, 24 Jun 2019 00:13:01 +0000 (12:13 +1200)]
Merge pull request #14609 from seamuslee001/5.15

[NFC] Ensure that test is properly cleaned up

5 years agoMerge pull request #14604 from colemanw/dev/core#1066
Eileen McNaughton [Sun, 23 Jun 2019 23:39:57 +0000 (11:39 +1200)]
Merge pull request #14604 from colemanw/dev/core#1066

dev/core#1066 Fix mailing permissions

5 years agoMerge pull request #14613 from seamuslee001/dev_core_1059
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…

5 years agoMerge pull request #14611 from eileenmcnaughton/url_support
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

5 years agoMerge pull request #14605 from eileenmcnaughton/cust_deadlock
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

5 years agoMerge pull request #14623 from eileenmcnaughton/receive
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

5 years agoAdd query object support for receive_date_high & receive_date_low and generically...
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

5 years ago[NFC] Ensure that test is properly cleanuped
Seamus Lee [Sat, 22 Jun 2019 23:30:11 +0000 (09:30 +1000)]
[NFC] Ensure that test is properly cleanuped

5 years agoMerge pull request #14619 from mattwire/pseudoconstant_types
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

5 years agodev/core#1059 Replace deprecated start and end url params with receive_date_low and...
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

5 years agoFix regression when searching on empty in group search
Pradeep Nayak [Sun, 23 Jun 2019 17:29:27 +0000 (05:29 +1200)]
Fix regression when searching on empty in group search

5 years agodev/core#926 Fixes bug on searching for removed members of smartgroups
eileen [Thu, 2 May 2019 06:56:44 +0000 (18:56 +1200)]
dev/core#926 Fixes bug on searching for removed members of smartgroups

5 years agodev/core#1048 test replicating bug
eileen [Sun, 23 Jun 2019 02:50:31 +0000 (14:50 +1200)]
dev/core#1048 test replicating bug

5 years agoThese pseudoconstant functions return array or string
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 18:05:35 +0000 (19:05 +0100)]
These pseudoconstant functions return array or string

5 years agoAdd a helper function to ensure we always set the correct tab for manage events
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

5 years agoFollow up fix on start as a url parameeter
eileen [Fri, 21 Jun 2019 14:41:40 +0000 (10:41 -0400)]
Follow up fix on start as a url parameeter

5 years agoMerge pull request #14606 from eileenmcnaughton/format
Eileen McNaughton [Sun, 23 Jun 2019 02:13:45 +0000 (14:13 +1200)]
Merge pull request #14606 from eileenmcnaughton/format

[NFC] code formatting

5 years agoMerge pull request #14594 from eileenmcnaughton/url_support
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

5 years agoMerge pull request #14580 from seamuslee001/convert_prevnext_cache
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

5 years ago[NFC] code formatting
eileen [Sat, 22 Jun 2019 21:58:14 +0000 (09:58 +1200)]
[NFC] code formatting

5 years agoEnsure that contact groups caches are cleared if memory backed
Seamus Lee [Sat, 22 Jun 2019 22:30:56 +0000 (08:30 +1000)]
Ensure that contact groups caches are cleared if memory backed

5 years agoReduce deadlocks on inserting custom data by only using 'ON DUPLICATE' when it is...
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)

5 years agoMerge pull request #14600 from seamuslee001/util_function_for_resetting_ACL_System_cache
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

5 years agoMerge pull request #14603 from mattwire/event_comments
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

5 years agodev/core#1066 Fix mailing permissions
Coleman Watts [Sat, 22 Jun 2019 17:07:19 +0000 (13:07 -0400)]
dev/core#1066 Fix mailing permissions

5 years agoCleanup comments
Matthew Wire (MJW Consulting) [Sat, 22 Jun 2019 12:03:42 +0000 (13:03 +0100)]
Cleanup comments

5 years agodev/core#1067 Clean Money before creating Campaign record and add test
Seamus Lee [Sat, 22 Jun 2019 07:11:32 +0000 (17:11 +1000)]
dev/core#1067 Clean Money before creating Campaign record and add test

5 years agoMerge pull request #14599 from eileenmcnaughton/record_partial_1
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

5 years agoAdd in utility function for resetting ACL and System Level Caches
Seamus Lee [Sat, 22 Jun 2019 03:46:10 +0000 (13:46 +1000)]
Add in utility function for resetting ACL and System Level Caches

5 years agoMerge pull request #14598 from eileenmcnaughton/amp
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

5 years agoMerge pull request #14584 from seamuslee001/contact_group_cache_backend_convert
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

5 years ago[REF] do not pass by reference to store & create functions
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

5 years agoEnsure that if we are ever clearing keys from civicrm_cache for prevNext that we...
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

5 years agoConvert prevNextCache to standard Cache Defintiion format
Seamus Lee [Tue, 18 Jun 2019 22:07:55 +0000 (08:07 +1000)]
Convert prevNextCache to standard Cache Defintiion format

5 years agoMerge pull request #14595 from colemanw/setup
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

5 years agoDecommission recordPartialPayment function
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

5 years agoReset language at end of localized api call
Coleman Watts [Fri, 21 Jun 2019 20:44:27 +0000 (16:44 -0400)]
Reset language at end of localized api call

5 years agoMerge pull request #14593 from eileenmcnaughton/seamus
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

5 years agoFix setup.sh crash when using the -a flag
Coleman Watts [Fri, 21 Jun 2019 19:02:45 +0000 (15:02 -0400)]
Fix setup.sh crash when using the -a flag

5 years agoFix url support for receive_date_high & receive_date_low
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

5 years agoFix Batch searching on receive date follwoing conversion and handle receive_date...
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

5 years agoMerge pull request #14590 from colemanw/i18nApi
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

5 years agoMerge pull request #14592 from civicrm/5.15
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

5 years agoMerge pull request #14572 from seamuslee001/dev_core_1052
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

5 years agoSupport api3 & 4 language syntax & test
Coleman Watts [Fri, 21 Jun 2019 02:18:00 +0000 (22:18 -0400)]
Support api3 & 4 language syntax & test

5 years agoMerge pull request #14460 from eileenmcnaughton/ajax_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

5 years agoMerge pull request #14480 from JMAConsulting/core-553
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

5 years agodev/core#1052 fix fatal error when first target contact is not visible to the logged...
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

5 years agoAdd in unit test demonstrating the fatal error generated
Seamus Lee [Tue, 18 Jun 2019 01:52:34 +0000 (11:52 +1000)]
Add in unit test demonstrating the fatal error generated

5 years agoMerge pull request #14578 from colemanw/i18n
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

5 years agoMerge pull request #14519 from colemanw/submitOnce
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

5 years agoMerge pull request #14585 from seamuslee001/primary_mebership_label_chagne
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 …

5 years agoMerge pull request #14586 from colemanw/Utils_JS
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

5 years agoUpdate Owner Membership ID label in reports to be Primary Membership to be more consi...
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

5 years agoUtils_JS - add fn to get props of js object without parsing them
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

5 years agoMerge pull request #14579 from civicrm/5.15
Seamus Lee [Tue, 18 Jun 2019 23:00:47 +0000 (09:00 +1000)]
Merge pull request #14579 from civicrm/5.15

5.15

5 years agoConvert Contact Groups cache group to standard cache defition
Seamus Lee [Tue, 18 Jun 2019 22:53:18 +0000 (08:53 +1000)]
Convert Contact Groups cache group to standard cache defition

5 years agoMerge pull request #14568 from greenpeace-cee/fix-schemahandler-cache
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

5 years agoMerge pull request #14575 from seamuslee001/5_14_1_release_notes
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

5 years agoi18n - Improve multilingual popup for text and wysiwyg fields
Coleman Watts [Tue, 18 Jun 2019 17:48:38 +0000 (13:48 -0400)]
i18n - Improve multilingual popup for text and wysiwyg fields

5 years agoAdd release-notes/5.14.1.md
Tim Otten [Tue, 18 Jun 2019 03:55:00 +0000 (20:55 -0700)]
Add release-notes/5.14.1.md

5 years agoMerge pull request #14573 from seamuslee001/5.15
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…