civicrm-core.git
5 years agoCopy assignProportional Line items back into Payment.create function
eileen [Fri, 21 Jun 2019 22:03:29 +0000 (18:03 -0400)]
Copy assignProportional Line items back into Payment.create function

This is a case where (unintuitively) I feel reducing code sharing and extraction makes sense. The reason being
I think the 'needs' of adding a payment are not obviously the same as the needs of 'changing a payment instrument'
and the code feels confusion and like the extractions make less sense now than they did. In the interests
of improving it bringing it back together seems the right path to me here. We can then edit for the purposes
of payment create code very specifically (and all functions that add payments need to call that)

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 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 agoCleanup comments
Matthew Wire (MJW Consulting) [Sat, 22 Jun 2019 12:03:42 +0000 (13:03 +0100)]
Cleanup comments

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 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…

5 years agoMerge pull request #14562 from agileware/CIVICRM-1244
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…

5 years agoUpdate http_timeout setting version to match the fact it is being backported to 5.14
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

5 years agoMerge pull request #14569 from pradpnayak/HardCodes
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

5 years agoRemoved hardcoded value for registered participant statu
Pradeep Nayak [Mon, 17 Jun 2019 22:01:54 +0000 (23:01 +0100)]
Removed hardcoded value for registered participant statu

5 years agoFix use of cached schema information in SchemaHandler
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.

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

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

5 years agoMerge pull request #14565 from vingle/patch-6
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

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

5 years agoResolve a conflict with Wordpress CSS
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.

5 years agoRemove a few more uses
Seamus Lee [Mon, 17 Jun 2019 09:38:56 +0000 (19:38 +1000)]
Remove a few more uses

5 years agoRemove more uses of CRM_Core_DAO:: that are unncessary
Seamus Lee [Mon, 17 Jun 2019 09:06:40 +0000 (19:06 +1000)]
Remove more uses of CRM_Core_DAO:: that are unncessary

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

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

5 years agoRemove unneeded use of CRM_Core_DAO::$_nullArray in executeQuery or similar calls
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

5 years agoRemove unncessary usage of CRM_Core_DAO::$_nullArray when calling createProfileContac...
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

5 years agoCIVICRM-1244: Use FrontEndPaymentFormTrait to assign line items on Event Registration...
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"

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

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

5 years agoAlter PSR16 code to take into account of new entitysetting release with upgraded...
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

5 years agoRemove more instances of _nullArray
Seamus Lee [Sun, 16 Jun 2019 22:19:50 +0000 (08:19 +1000)]
Remove more instances of _nullArray

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

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

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

5 years agoSupport button elements in ajax popups
Matthew Wire (MJW Consulting) [Fri, 26 Apr 2019 13:29:40 +0000 (14:29 +0100)]
Support button elements in ajax popups

5 years agoSubmitOnce - play nice with jQuery validate
Coleman Watts [Sun, 16 Jun 2019 14:58:56 +0000 (10:58 -0400)]
SubmitOnce - play nice with jQuery validate

5 years agoRewrite submitOnce function, deprecate old one
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.

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

5 years agoMerge pull request #14545 from demeritcowboy/temp-remove-submit-once
Eileen McNaughton [Sun, 16 Jun 2019 13:53:57 +0000 (09:53 -0400)]
Merge pull request #14545 from demeritcowboy/temp-remove-submit-once

Temporarily remove activity submit once pending PR 14519

5 years agoStandardise exception use in test suite
eileen [Sun, 16 Jun 2019 01:32:07 +0000 (21:32 -0400)]
Standardise exception use in test suite

Using less different types of exceptions is cleaner- our own exception is pretty much our go-to
so using here

5 years ago[TEST] add assert to ensure nullArray & nullObject are not contaminated
eileen [Fri, 14 Jun 2019 21:00:31 +0000 (17:00 -0400)]
[TEST] add assert to ensure nullArray & nullObject are not contaminated

5 years agoMerge pull request #14556 from eileenmcnaughton/null_another
Seamus Lee [Sun, 16 Jun 2019 08:37:53 +0000 (18:37 +1000)]
Merge pull request #14556 from eileenmcnaughton/null_another

dev/core#1047 Fix instance of null contamination

5 years agoMerge pull request #14555 from eileenmcnaughton/null
Seamus Lee [Sun, 16 Jun 2019 08:37:15 +0000 (18:37 +1000)]
Merge pull request #14555 from eileenmcnaughton/null

dev/core#1047 Fix instance of null contamination

5 years agodev/core#1047 Fix instance of null contamination
eileen [Sun, 16 Jun 2019 01:36:34 +0000 (21:36 -0400)]
dev/core#1047 Fix instance of null contamination

5 years agoMerge pull request #14552 from eileenmcnaughton/tear
Eileen McNaughton [Sun, 16 Jun 2019 01:29:52 +0000 (21:29 -0400)]
Merge pull request #14552 from eileenmcnaughton/tear

[test] Call parent tearDown more consistently

5 years agodev/core#1047 Fix instance of null contamination
eileen [Sat, 15 Jun 2019 11:55:53 +0000 (07:55 -0400)]
dev/core#1047 Fix instance of null contamination

5 years ago[test] Call parent tearDown more consistently
eileen [Sat, 15 Jun 2019 15:25:44 +0000 (11:25 -0400)]
[test] Call parent tearDown more consistently

Primarliy consistentcy - also supports checking nullArray is cleared per

https://github.com/civicrm/civicrm-core/pull/14550

5 years agoMerge pull request #14550 from eileenmcnaughton/null_fix
Seamus Lee [Sat, 15 Jun 2019 21:52:42 +0000 (07:52 +1000)]
Merge pull request #14550 from eileenmcnaughton/null_fix

dev/core#1047 Fix instance of NULL contamination

5 years agoMerge pull request #14551 from totten/master-theme-cleanup
Eileen McNaughton [Sat, 15 Jun 2019 15:13:48 +0000 (11:13 -0400)]
Merge pull request #14551 from totten/master-theme-cleanup

CRM-18792, dev/core#378 - Catch-up on settings metadata

5 years agoCRM-18792, dev/core#378 - Catch-up on settings metadata
Tim Otten [Sat, 15 Jun 2019 15:09:47 +0000 (11:09 -0400)]
CRM-18792, dev/core#378 - Catch-up on settings metadata

This is a follow-up to #12929.  In the interim between the writing and
merging of the PR, the version numbers changed.

5 years agoFix instance of NULL contamination
eileen [Sat, 15 Jun 2019 09:43:47 +0000 (05:43 -0400)]
Fix instance of NULL contamination

5 years agoMerge pull request #14443 from eileenmcnaughton/export
Matthew Wire [Sat, 15 Jun 2019 10:45:02 +0000 (11:45 +0100)]
Merge pull request #14443 from eileenmcnaughton/export

Fix duplicate households on 'Merge same household' exports

5 years agoMerge pull request #14549 from seamuslee001/master
Eileen McNaughton [Sat, 15 Jun 2019 01:49:04 +0000 (21:49 -0400)]
Merge pull request #14549 from seamuslee001/master

5.15

5 years agoMerge in 5.15
Seamus Lee [Sat, 15 Jun 2019 01:45:51 +0000 (11:45 +1000)]
Merge in 5.15

5 years agoMerge pull request #14525 from seamuslee001/feature_timeout_setting
Seamus Lee [Sat, 15 Jun 2019 01:44:25 +0000 (11:44 +1000)]
Merge pull request #14525 from seamuslee001/feature_timeout_setting

dev/core#1035 Add in new setting http_timeout to set how long in seco…

5 years agoMerge pull request #12929 from totten/master-theming-rb
Seamus Lee [Sat, 15 Jun 2019 01:33:26 +0000 (11:33 +1000)]
Merge pull request #12929 from totten/master-theming-rb

CRM-18792, dev/core#378 - Create CSS theming subsystem

5 years agoMerge pull request #14542 from eileenmcnaughton/tests
Seamus Lee [Sat, 15 Jun 2019 00:56:49 +0000 (10:56 +1000)]
Merge pull request #14542 from eileenmcnaughton/tests

[TEST] Fix intermittent test fail on NULL array getting contaminated

5 years agodev/core#1035 Add in new setting http_timeout to set how long in seconds should HTTP...
Seamus Lee [Fri, 14 Jun 2019 02:31:14 +0000 (12:31 +1000)]
dev/core#1035 Add in new setting http_timeout to set how long in seconds should HTTP requests last for to fix dev/core#1035

Handle situations where a 0 timeout is passed in

Remove from form

Update variable name as per EIleen

5 years agoMerge pull request #14548 from seamuslee001/nfc_declaration_fix
Seamus Lee [Sat, 15 Jun 2019 00:20:54 +0000 (10:20 +1000)]
Merge pull request #14548 from seamuslee001/nfc_declaration_fix

[NFC] Fix Test function delcaration to match change in CiviUnitTestCa…

5 years agoCRM-18792 - CRM_Core_Theme - Add helper for loading CSS files from themes
Tim Otten [Tue, 7 Jun 2016 00:23:27 +0000 (18:23 -0600)]
CRM-18792 - CRM_Core_Theme - Add helper for loading CSS files from themes

CRM-18792 - CRM_Core_Resources - Load civicrm.css through theme system

CRM-18792 - Rename `CRM_Core_Theme` to `\Civi\Core\Theme`

CRM-18792 - Civi\Core\Theme - Remove statics

WIP

CRM_Core_Resources::addCoreStyles - Revert change

CRM-18792 - addStyleFile - Always pass through to theme. Support fallback.

Rename `Civi\Core\Theme` to `Civi\Core\Themes`

The class manages a list of themes -- not just a single theme.

CRM-18792 - Add org.civicrm.demotheme

CRM-18792 - Add uncommitted test files (`Civi\Core\Themes`)

CRM-18792 - Fix regression in CRM_Core_ResourceTest

CRM-18792 - Theme naming - Use prefix '_' for hidden themes

This cleans up a few things:

 * Previously, there was a special case for using FALLBACK in `search_order`.
 * If you're creating a multitheme extension, you may want to define a base theme
   (which is extended by the others). Previously, you were required to show this
   base theme as a user-selectable option. Now, it can be hidden.
 * There was a bug where `resolveUrl()` would sometimes call the wrong callback.
   (It used resolver for `$active` instead of `$themeKey`.)

CRM-18792 - Themes - File overrides and excludes should use same naming

Previously, when using `addStyleFile($cssExt,$css$file)`, the file overrides
and exlcudes would combine them differently e.g.

 * For `addStyleFile('civicrm','css/bootstrap.css')`
   * Override `css/bootstrap.css`
   * Exclude `civicrm:css/bootstrap.css`
 * For `('org.foo.bar','css/bang.css')`
   * Override `org.foo.bar-css/bang.css`
   * Exclude `org.foo.bar:css/bang.css`

Now, they use the same notation:

 * For `addStyleFile('civicrm','css/bootstrap.css')`
   * Override `css/bootstrap.css`
   * Exclude `css/bootstrap.css`
 * For `('org.foo.bar','css/bang.css')`
   * Override `org.foo.bar-css/bang.css`
   * Exclude `org.foo.bar-css/bang.css`

"Display Preferences" - Add the `theme_backend` and `theme_frontend` settings

hook_civicrm_activeTheme - Allow extensions and CMS modules to choose active theme

CRM_Utils_Hook::themes() - Tweak docblock

Civi\Core\Themes - Move cache from `short` to `long`

Remove tools/extensions/org.civicrm.demotheme

Fix merge ahem errors

5 years agoMerge pull request #14547 from civicrm/5.15
Eileen McNaughton [Fri, 14 Jun 2019 23:59:54 +0000 (19:59 -0400)]
Merge pull request #14547 from civicrm/5.15

5.15 to master

5 years agoFix intermittent test fail on NULL array getting contaminated & causing later tests...
eileen [Fri, 14 Jun 2019 20:58:05 +0000 (16:58 -0400)]
Fix intermittent test fail on NULL array getting contaminated & causing later tests to pass the wrong thing

5 years ago[NFC] Fix Test function delcaration to match change in CiviUnitTestCase class
Seamus Lee [Fri, 14 Jun 2019 22:57:01 +0000 (08:57 +1000)]
[NFC] Fix Test function delcaration to match change in CiviUnitTestCase class

5 years agoMerge pull request #14544 from totten/5.15-JPG
Seamus Lee [Fri, 14 Jun 2019 22:32:23 +0000 (08:32 +1000)]
Merge pull request #14544 from totten/5.15-JPG

(dev/core#1044) Extension/MIME matching should be case insensitive

5 years agoMerge pull request #14540 from eileenmcnaughton/anettest
Seamus Lee [Fri, 14 Jun 2019 21:40:30 +0000 (07:40 +1000)]
Merge pull request #14540 from eileenmcnaughton/anettest

Fix A.net to resolve time when using default

5 years agoMerge pull request #14533 from eileenmcnaughton/deprecate
Seamus Lee [Fri, 14 Jun 2019 21:33:37 +0000 (07:33 +1000)]
Merge pull request #14533 from eileenmcnaughton/deprecate

Deprecate contribution_date as a parameter

5 years agoMerge pull request #14537 from colemanw/jsDecode
Eileen McNaughton [Fri, 14 Jun 2019 21:18:19 +0000 (17:18 -0400)]
Merge pull request #14537 from colemanw/jsDecode

Add CRM_Utils_JS::decode function for decoding js objects

5 years agotemporarily remove activity submit once pending PR 14519
DemeritCowboy [Fri, 14 Jun 2019 21:10:17 +0000 (17:10 -0400)]
temporarily remove activity submit once pending PR 14519