civicrm-core.git
5 years agoMerge pull request #14516 from eileenmcnaughton/except
Tim Otten [Thu, 13 Jun 2019 20:32:19 +0000 (16:32 -0400)]
Merge pull request #14516 from eileenmcnaughton/except

[test] Add PrematureExitException to support unit testing where the code would otherwise exit

5 years agoAdd PrematureExitException to support unit testing where the code would otherwise...
eileen [Thu, 13 Jun 2019 18:53:17 +0000 (14:53 -0400)]
Add PrematureExitException to support unit testing where the code would otherwise exit

5 years agoMerge pull request #14468 from seamuslee001/e2e_asset_builder_test_wordpress
Seamus Lee [Sat, 8 Jun 2019 10:06:26 +0000 (20:06 +1000)]
Merge pull request #14468 from seamuslee001/e2e_asset_builder_test_wordpress

Add CRM_Utils_System::sendResponse(). Fix AssetBuilder's status-code on WP.

5 years agoIncorporate Tim's Cleanup
Seamus Lee [Sat, 8 Jun 2019 08:57:11 +0000 (18:57 +1000)]
Incorporate Tim's Cleanup

5 years agoMerge pull request #14482 from seamuslee001/update_exception_dao
Seamus Lee [Sat, 8 Jun 2019 08:55:23 +0000 (18:55 +1000)]
Merge pull request #14482 from seamuslee001/update_exception_dao

[NFC] Update Exception DAO class

5 years agoUpdate Exception DAO class
Seamus Lee [Sat, 8 Jun 2019 07:40:27 +0000 (17:40 +1000)]
Update Exception DAO class

5 years agoSlimplify functions down as per Tim's review comments
Seamus Lee [Sat, 8 Jun 2019 03:07:16 +0000 (13:07 +1000)]
Slimplify functions down as per Tim's review comments

5 years agoUpdate to use PSR HTTP Message Response Interface as per @totten
Seamus Lee [Fri, 7 Jun 2019 00:06:28 +0000 (10:06 +1000)]
Update to use PSR HTTP Message Response Interface as per @totten

5 years agoMove content of returning response into CRM_Utils_System and have user_system based...
Seamus Lee [Thu, 6 Jun 2019 22:37:10 +0000 (08:37 +1000)]
Move content of returning response into CRM_Utils_System and have user_system based method to set HTTP Status code

5 years agoSet version to 5.15.beta1
CiviCRM [Fri, 7 Jun 2019 23:34:14 +0000 (23:34 +0000)]
Set version to 5.15.beta1

5 years agoMerge pull request #14472 from eileenmcnaughton/from_to_test
colemanw [Fri, 7 Jun 2019 13:03:13 +0000 (09:03 -0400)]
Merge pull request #14472 from eileenmcnaughton/from_to_test

[nfc] [test] Skip testGetFromTo on date transition

5 years agoMerge pull request #14470 from eileenmcnaughton/alike
colemanw [Fri, 7 Jun 2019 13:02:34 +0000 (09:02 -0400)]
Merge pull request #14470 from eileenmcnaughton/alike

[NFC][test-fix] centralise use of assertLike for comparing sql

5 years agoMerge pull request #14448 from eileenmcnaughton/exception2
Eileen McNaughton [Fri, 7 Jun 2019 09:24:36 +0000 (21:24 +1200)]
Merge pull request #14448 from eileenmcnaughton/exception2

Fix Exception api to save lower id number as contact 1

5 years agoMerge pull request #14473 from eileenmcnaughton/custom_filter
Seamus Lee [Fri, 7 Jun 2019 08:49:18 +0000 (18:49 +1000)]
Merge pull request #14473 from eileenmcnaughton/custom_filter

dev/core#1025 fix unreleased regression on contact.get with custom fields

5 years agoFix Exception api to save lower id number as contact 1
eileen [Thu, 6 Jun 2019 05:16:28 +0000 (17:16 +1200)]
Fix Exception api to save lower id number as contact 1

This is already actioned (& tested) via ajax fn markNonDuplicates - this moves the functionality from
the ajax layer to the BAO layer & stdises it under unit tests

5 years agoMerge pull request #14447 from eileenmcnaughton/exception
Seamus Lee [Fri, 7 Jun 2019 08:14:34 +0000 (18:14 +1000)]
Merge pull request #14447 from eileenmcnaughton/exception

Fix Exception to remove result from duplicates

5 years agoMerge pull request #14475 from eileenmcnaughton/contact_def
Monish Deb [Fri, 7 Jun 2019 06:41:00 +0000 (12:11 +0530)]
Merge pull request #14475 from eileenmcnaughton/contact_def

Permit sort_name as a url parameter on advanced search

5 years agoConvert sort_name to use search form methodology to pass by url
eileen [Fri, 7 Jun 2019 03:01:16 +0000 (15:01 +1200)]
Convert sort_name to use search form methodology to pass by url

5 years agoMerge pull request #14476 from eileenmcnaughton/basic_search
Eileen McNaughton [Fri, 7 Jun 2019 04:34:06 +0000 (16:34 +1200)]
Merge pull request #14476 from eileenmcnaughton/basic_search

[REF] Move retrieval of basicSearchFields to 'get' fn

5 years agoMove retrieval of basicSearchFields to 'get' fn
eileen [Fri, 7 Jun 2019 02:41:43 +0000 (14:41 +1200)]
Move retrieval of basicSearchFields to 'get' fn

This is a partial of https://github.com/civicrm/civicrm-core/pull/14418

5 years agodev/core#1025 fix unreleased regression on contact.get with custom fields
eileen [Fri, 7 Jun 2019 00:51:25 +0000 (12:51 +1200)]
dev/core#1025 fix unreleased regression on contact.get with custom fields

Fixes a bug where contact.get does not retrieve results if a custom field is requested and an activity custom field exists

This bug came about because a recent fix made metadata more consistent but it turns out this class was filtering the
metadata by the passed in  - and then iterating through the metadata. Now it iterates the ids instead.

5 years agoMerge pull request #14469 from eileenmcnaughton/pledge_msg
Eileen McNaughton [Fri, 7 Jun 2019 00:40:17 +0000 (12:40 +1200)]
Merge pull request #14469 from eileenmcnaughton/pledge_msg

Fix version for pledge message update, also remove 'please print'

5 years agoSkip testGetFromTo on date transition
eileen [Fri, 7 Jun 2019 00:37:24 +0000 (12:37 +1200)]
Skip testGetFromTo on date transition

This avoids fails when the expectations were calculated right at the end of a day but then are compared with the new day's values.

Results in this case look like

CRM_Report_FormTest::testGetFromTo with data set #1 ('20190606000000', '20190606235959', 'this.day', '', '')
fail on data set [ this.day ,  ,  ]. Local php time is 2019-06-07 00:00:13 and mysql time is 2019-06-07 00:00:13
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
-    0 => '20190606000000'
-    1 => '20190606235959'
+    0 => '20190607000000'
+    1 => '20190607235959'

5 years ago[NFC][test-fix] centralise use of assertLike for comparing sql
eileen [Thu, 6 Jun 2019 23:36:07 +0000 (11:36 +1200)]
[NFC][test-fix] centralise use of assertLike for comparing sql

This function makes the tests cope with minor changes to whitespace in sql strings being compared

5 years agoMerge pull request #14461 from colemanw/displayPrefsStyle
Eileen McNaughton [Thu, 6 Jun 2019 23:26:57 +0000 (11:26 +1200)]
Merge pull request #14461 from colemanw/displayPrefsStyle

Use crm-checkbox-list styling in display prefs tpl

5 years agoMerge pull request #14450 from eileenmcnaughton/pay_rs
Mathieu Lu [Thu, 6 Jun 2019 23:24:48 +0000 (19:24 -0400)]
Merge pull request #14450 from eileenmcnaughton/pay_rs

Wrap titles in metadata in ts on payment.create api

5 years agoMerge pull request #14433 from eileenmcnaughton/mailin_settings
colemanw [Thu, 6 Jun 2019 23:17:17 +0000 (19:17 -0400)]
Merge pull request #14433 from eileenmcnaughton/mailin_settings

[Outbound mail admin form] fix some more notices resulting from recent change

5 years agoMerge pull request #14427 from eileenmcnaughton/search_upgrade
Seamus Lee [Thu, 6 Jun 2019 23:04:19 +0000 (09:04 +1000)]
Merge pull request #14427 from eileenmcnaughton/search_upgrade

Fix upgrade on participant_register date

5 years agoFix version for pledge message update, also remove 'please print'
eileen [Thu, 6 Jun 2019 22:46:44 +0000 (10:46 +1200)]
Fix version for pledge message update, also remove 'please print'

5 years agoMerge pull request #14467 from mlutfy/ts-fixes-5-16
Seamus Lee [Thu, 6 Jun 2019 22:46:14 +0000 (08:46 +1000)]
Merge pull request #14467 from mlutfy/ts-fixes-5-16

Misc translation 'ts' fixes

5 years agoMerge pull request #14465 from philmb/dev/core#1010
Eileen McNaughton [Thu, 6 Jun 2019 22:43:08 +0000 (10:43 +1200)]
Merge pull request #14465 from philmb/dev/core#1010

dev/core#1010 pledge_acknowledge template - capitalization and greeting

5 years agoMerge pull request #14442 from colemanw/drupal8jquery
Eileen McNaughton [Thu, 6 Jun 2019 22:11:36 +0000 (10:11 +1200)]
Merge pull request #14442 from colemanw/drupal8jquery

Conditionally use Drupal's jQuery only if available

5 years agoMerge pull request #14464 from mattwire/smartgroupeditcriteria
Eileen McNaughton [Thu, 6 Jun 2019 22:07:23 +0000 (10:07 +1200)]
Merge pull request #14464 from mattwire/smartgroupeditcriteria

Don't run search when editing smartgroup criteria

5 years agoMisc translation 'ts' fixes
Mathieu Lutfy [Thu, 6 Jun 2019 20:51:36 +0000 (16:51 -0400)]
Misc translation 'ts' fixes

5 years agodev/core#1010 pledge_acknowledge template - capitalization and greeting
PhilMB [Thu, 6 Jun 2019 17:51:11 +0000 (12:51 -0500)]
dev/core#1010 pledge_acknowledge template - capitalization and greeting

Pledge Acknowledgements have incorrect capitalization in greetings, and greetings do not use email_greeting.

5 years agoConditionally use Drupal's jQuery only if available
Coleman Watts [Thu, 6 Jun 2019 00:54:47 +0000 (20:54 -0400)]
Conditionally use Drupal's jQuery only if available

5 years agoDon't search before showing smartgroup criteria
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 15:11:29 +0000 (16:11 +0100)]
Don't search before showing smartgroup criteria

5 years agoWhitespace formatting in CRM/Group/Form/Edit.tpl
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 14:57:35 +0000 (15:57 +0100)]
Whitespace formatting in CRM/Group/Form/Edit.tpl

5 years agoMerge pull request #14463 from seamuslee001/5_14_master
Seamus Lee [Thu, 6 Jun 2019 13:57:08 +0000 (23:57 +1000)]
Merge pull request #14463 from seamuslee001/5_14_master

5.14

5 years agoMerge in 5.14
Seamus Lee [Thu, 6 Jun 2019 13:55:06 +0000 (23:55 +1000)]
Merge in 5.14

5 years agoUse crm-checkbox-list styling in display prefs tpl
Coleman Watts [Thu, 6 Jun 2019 13:19:24 +0000 (09:19 -0400)]
Use crm-checkbox-list styling in display prefs tpl

5 years agoMerge pull request #14394 from eileenmcnaughton/merge_get_conflicts
Eileen McNaughton [Thu, 6 Jun 2019 12:35:42 +0000 (00:35 +1200)]
Merge pull request #14394 from eileenmcnaughton/merge_get_conflicts

Add Contact.get_merge_conflicts api

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:45:07 +0000 (04:45 -0700)]
Update 5.14.0.md

5 years agoinstall/index.php - Fix misleading install text
Tim Otten [Thu, 6 Jun 2019 11:39:43 +0000 (04:39 -0700)]
install/index.php - Fix misleading install text

During GUI install, there's a health-check based on the PHP version.  Now
that PHP 7 is required, this message *always* talks about PHP 7.x. But
it's presented under a bucket labeled "PHP5".

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:12:11 +0000 (04:12 -0700)]
Update 5.14.0.md

5 years agoSet version to 5.14.0
CiviCRM [Thu, 6 Jun 2019 10:52:41 +0000 (10:52 +0000)]
Set version to 5.14.0

5 years agoMerge pull request #14451 from eileenmcnaughton/format
Eileen McNaughton [Thu, 6 Jun 2019 10:30:17 +0000 (22:30 +1200)]
Merge pull request #14451 from eileenmcnaughton/format

[NFC] array formatting in api_v3_paymentTest class

5 years agoMerge pull request #14458 from eileenmcnaughton/cachekey
Eileen McNaughton [Thu, 6 Jun 2019 10:29:44 +0000 (22:29 +1200)]
Merge pull request #14458 from eileenmcnaughton/cachekey

Test tweaks that *might* help with intermittant test weirdness

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 10:28:58 +0000 (03:28 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14201 from seamuslee001/5.14
Tim Otten [Thu, 6 Jun 2019 10:28:37 +0000 (03:28 -0700)]
Merge pull request #14201 from seamuslee001/5.14

Fix AssetBuilderTest when running on WordPress. Use Guzzle.

5 years agoMerge pull request #14449 from demeritcowboy/bulksms-enotice
Eileen McNaughton [Thu, 6 Jun 2019 10:25:36 +0000 (22:25 +1200)]
Merge pull request #14449 from demeritcowboy/bulksms-enotice

dev/core#1023 - E_NOTICE when creating bulk SMS

5 years agoMerge pull request #14457 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 10:11:14 +0000 (22:11 +1200)]
Merge pull request #14457 from civicrm/5.14

5.14

5 years agoAssetBuilderTest - Add more assertions for Guzzle variant of test
Tim Otten [Thu, 6 Jun 2019 09:34:50 +0000 (02:34 -0700)]
AssetBuilderTest - Add more assertions for Guzzle variant of test

5 years agoTest tweaks that *might* help with intermittant test weirdness
eileen [Thu, 6 Jun 2019 09:27:52 +0000 (21:27 +1200)]
Test tweaks that *might* help with intermittant test weirdness

It's technically possible for the 2 cache keys to be the same - which would break stuff - although it seems
a bit too frequent to be the reason...

Also we clear one cache in tear down & not the other.

I'm not optimistic either of these will solve the intermittant fails but they seem more correct changed

Also I added verbosity

5 years agoMerge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter
Yashodha Chaku [Thu, 6 Jun 2019 09:23:16 +0000 (14:53 +0530)]
Merge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter

dev/core#1022 - Manage Case deleted activities search filter no longer working

5 years agoFix Invalid asset builder test by using guzzle
Seamus Lee [Sun, 5 May 2019 01:43:12 +0000 (11:43 +1000)]
Fix Invalid asset builder test by using guzzle

5 years agoRevert "Fix Asset builder test by altering error_reporting level to match Drupal...
Tim Otten [Thu, 6 Jun 2019 09:15:55 +0000 (02:15 -0700)]
Revert "Fix Asset builder test by altering error_reporting level to match Drupal and changing regex to not care about HTTP version"

This reverts commit be441aa368ef7f1e5a8dd115c065caa172f95a6a.

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:38:24 +0000 (01:38 -0700)]
Update 5.14.0.md

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:36:06 +0000 (01:36 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix
Tim Otten [Thu, 6 Jun 2019 08:33:34 +0000 (01:33 -0700)]
Merge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix

Fix AssetBuilderTest by altering error_reporting level to match Dru…

5 years agoMerge pull request #14439 from seamuslee001/5_14_0_release_notes_update
Eileen McNaughton [Thu, 6 Jun 2019 07:50:29 +0000 (19:50 +1200)]
Merge pull request #14439 from seamuslee001/5_14_0_release_notes_update

Update 5.14.0 release notes with latest changes

5 years agoMerge pull request #14455 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 07:45:04 +0000 (19:45 +1200)]
Merge pull request #14455 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14454 from eileenmcnaughton/php72
Eileen McNaughton [Thu, 6 Jun 2019 07:43:28 +0000 (19:43 +1200)]
Merge pull request #14454 from eileenmcnaughton/php72

(NFC) Remove without param tests

5 years agoMerge pull request #14453 from eileenmcnaughton/export_sc_514
Tim Otten [Thu, 6 Jun 2019 07:24:19 +0000 (00:24 -0700)]
Merge pull request #14453 from eileenmcnaughton/export_sc_514

dev/core#1015 fix regression on exporting soft credits

5 years agoRemove without param tests
eileen [Thu, 6 Jun 2019 06:40:56 +0000 (18:40 +1200)]
Remove without param tests

These really date back to when we were creating the api wrapper. I don't think
they add much value now - esp since php is not quiet if we break the wrapper
contract

5 years agodev/core#1015 fix regression on exporting soft credits
eileen [Thu, 6 Jun 2019 06:34:20 +0000 (18:34 +1200)]
dev/core#1015 fix regression on exporting soft credits

Cut down from https://github.com/civicrm/civicrm-core/pull/14440/commits due to test fails

5 years agoUpdate Release 5.14.0 release notes with latest changes
Seamus Lee [Wed, 5 Jun 2019 23:09:45 +0000 (09:09 +1000)]
Update Release 5.14.0 release notes with latest changes

Update release notes for PR #14440

Withdraw soft credits item

5 years agofix E_NOTICE
DemeritCowboy [Thu, 6 Jun 2019 05:10:51 +0000 (01:10 -0400)]
fix E_NOTICE

5 years ago[NFC] array formatting in api_v3_paymentTest class
eileen [Thu, 6 Jun 2019 05:44:24 +0000 (17:44 +1200)]
[NFC] array formatting in api_v3_paymentTest class

5 years agoWrap titles in metadata in ts on payment.create api
eileen [Thu, 6 Jun 2019 05:40:09 +0000 (17:40 +1200)]
Wrap titles in metadata in ts on payment.create api

5 years agoFix Exception to remove result from duplicates
eileen [Thu, 6 Jun 2019 04:32:09 +0000 (16:32 +1200)]
Fix Exception to remove result from duplicates

This updates, and tests, the Exception.create function (via the api) to remove duplicates from the
prevnext_cache. This feels like a better fix than the cartwheels the prevnext cache code does to avoid
retrieving cached duplicates.

5 years agoMerge pull request #14441 from colemanw/sortable
Eileen McNaughton [Thu, 6 Jun 2019 04:15:38 +0000 (16:15 +1200)]
Merge pull request #14441 from colemanw/sortable

dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14411 from eileenmcnaughton/merge_get_duplicates
Eileen McNaughton [Thu, 6 Jun 2019 04:05:43 +0000 (16:05 +1200)]
Merge pull request #14411 from eileenmcnaughton/merge_get_duplicates

Add api for Dedupe.getduplicates

5 years agomake search filter work again
DemeritCowboy [Thu, 6 Jun 2019 02:59:32 +0000 (22:59 -0400)]
make search filter work again

5 years agoUpdate get_merge_conflicts api
eileen [Mon, 3 Jun 2019 03:42:33 +0000 (15:42 +1200)]
Update get_merge_conflicts api

Increase result nuance in response to review

5 years agodev/core#628 - Make Quicksearch options sortable
Coleman Watts [Wed, 5 Jun 2019 21:47:10 +0000 (17:47 -0400)]
dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14438 from eileenmcnaughton/display
Seamus Lee [Thu, 6 Jun 2019 00:09:30 +0000 (10:09 +1000)]
Merge pull request #14438 from eileenmcnaughton/display

(dev/core#1000) Fixes contact's displayname not appearing in membership edit, if no registered email is found

5 years agoMerge pull request #14363 from mfb/error-msg
Seamus Lee [Thu, 6 Jun 2019 00:08:23 +0000 (10:08 +1000)]
Merge pull request #14363 from mfb/error-msg

Avoid logging error message if status check query fails.

5 years agoMerge pull request #14407 from eileenmcnaughton/514
Seamus Lee [Wed, 5 Jun 2019 23:34:27 +0000 (09:34 +1000)]
Merge pull request #14407 from eileenmcnaughton/514

Fix checksum failure on editing recurring contributions

5 years agoMerge pull request #14435 from eileenmcnaughton/5.14
Seamus Lee [Wed, 5 Jun 2019 23:11:04 +0000 (09:11 +1000)]
Merge pull request #14435 from eileenmcnaughton/5.14

Revert "Create contribution before taking payment, per contribution page workflow"

5 years agoFix checksum failure on editing recurring contributions
eileen [Sun, 2 Jun 2019 23:11:49 +0000 (11:11 +1200)]
Fix checksum failure on editing recurring contributions

5 years agoFixes contact's displayname not appearing in membership edit, if no registered email...
Vangelis Pantazis [Wed, 29 May 2019 10:54:38 +0000 (11:54 +0100)]
Fixes contact's displayname not appearing in membership edit, if no registered email is found

Add a unit test to lock in fix to dev/core#1000

5 years ago5.14.0 release notes (#14245)
Andrew Hunt [Wed, 5 Jun 2019 22:42:23 +0000 (18:42 -0400)]
5.14.0 release notes (#14245)

* 5.14.0 release notes: raw from script

* 5.14.0 release notes: add boilerplate

* sorting misc and deleting 5.13 commits

* fixing up contributors

* fixing up gitlab issues titles

* annotating

* rearranging sections

* editing and clean up

* 5.14.0 release notes: edits

* 5.14.0 release notes: incorporated late changes

5 years agoMerge pull request #14437 from agh1/no-php-56
Tim Otten [Wed, 5 Jun 2019 22:27:09 +0000 (15:27 -0700)]
Merge pull request #14437 from agh1/no-php-56

Minimum supported PHP version is 7.0

5 years agoMerge pull request #14426 from eileenmcnaughton/cont_notice
Eileen McNaughton [Wed, 5 Jun 2019 22:02:00 +0000 (10:02 +1200)]
Merge pull request #14426 from eileenmcnaughton/cont_notice

dev/core#1014 fix e-notice regression

5 years agoAdd api for Dedupe.getduplicates
eileen [Mon, 3 Jun 2019 04:21:46 +0000 (16:21 +1200)]
Add api for Dedupe.getduplicates

5 years agoMinimum supported PHP version is 7.0
Andrew Hunt [Wed, 5 Jun 2019 16:33:24 +0000 (12:33 -0400)]
Minimum supported PHP version is 7.0

5 years agoImprove handling of 1st option on search prefs
Coleman Watts [Wed, 5 Jun 2019 15:38:47 +0000 (11:38 -0400)]
Improve handling of 1st option on search prefs

5 years agoMerge pull request #14247 from pradpnayak/ActvityTags
Monish Deb [Wed, 5 Jun 2019 15:23:32 +0000 (20:53 +0530)]
Merge pull request #14247 from pradpnayak/ActvityTags

Change Activity tag to use select2

5 years agoRevert "Create contribution before taking payment, per contribution page workflow"
eileen [Wed, 5 Jun 2019 13:18:23 +0000 (01:18 +1200)]
Revert "Create contribution before taking payment, per contribution page workflow"

This reverts commit 9257f129

5 years agoMerge pull request #14434 from eileenmcnaughton/activity_form
Eileen McNaughton [Wed, 5 Jun 2019 12:24:55 +0000 (00:24 +1200)]
Merge pull request #14434 from eileenmcnaughton/activity_form

[REF] Activity form - very minor tidy up

5 years agoRemove fatal errors in favour of status bounces
eileen [Wed, 5 Jun 2019 04:21:10 +0000 (16:21 +1200)]
Remove fatal errors in favour of status bounces

5 years ago[REF] very small code cleanup
eileen [Wed, 5 Jun 2019 04:19:29 +0000 (16:19 +1200)]
[REF] very small code cleanup

activityTName is only ever set in the proceeding IF clause so moving this chunk of code into that
clause makes that a little more readable

5 years ago[Outbound mail admin form] fix some more notices resulting from recent change
eileen [Wed, 5 Jun 2019 04:10:21 +0000 (16:10 +1200)]
[Outbound mail admin form] fix some more notices resulting from recent change

5 years agoMerge pull request #14432 from civicrm/5.14
Eileen McNaughton [Wed, 5 Jun 2019 03:24:53 +0000 (15:24 +1200)]
Merge pull request #14432 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14430 from agileware/5.14--CIVICRM-1228
Eileen McNaughton [Wed, 5 Jun 2019 03:24:27 +0000 (15:24 +1200)]
Merge pull request #14430 from agileware/5.14--CIVICRM-1228

dev/core#1017: Always bootstrap CRM_Utils_System against 5.14

5 years agodev/core#1017: Always bootstrap CRM_Utils_System
Francis Whittle [Wed, 5 Jun 2019 01:15:45 +0000 (11:15 +1000)]
dev/core#1017: Always bootstrap CRM_Utils_System

5 years agoFix upgrade on participant_register date
eileen [Wed, 5 Jun 2019 00:24:08 +0000 (12:24 +1200)]
Fix upgrade on participant_register date

On testing I found the conversion routing on participant register date wasn't working properly when
upgrading to 5.15 - this fixes

5 years agodev/core#1014 fix e-notice regression
eileen [Tue, 4 Jun 2019 23:46:40 +0000 (11:46 +1200)]
dev/core#1014 fix e-notice regression

5 years agoMerge pull request #14424 from seamuslee001/phpunit6_money_test
Eileen McNaughton [Tue, 4 Jun 2019 23:42:05 +0000 (11:42 +1200)]
Merge pull request #14424 from seamuslee001/phpunit6_money_test

Fix running of CRM_Utils_MoneyTest on PHPUnit6+