civicrm-core.git
5 years agoConvert getTemplateContribution to api4
Aidan Saunders [Tue, 8 Oct 2019 17:05:48 +0000 (18:05 +0100)]
Convert getTemplateContribution to api4

5 years agoMerge pull request #15433 from aydun/add_contribution_is_template
Eileen McNaughton [Tue, 8 Oct 2019 15:34:10 +0000 (17:34 +0200)]
Merge pull request #15433 from aydun/add_contribution_is_template

dev/financial#72 Add is_template field to contribution entity

5 years agoFix example
Seamus Lee [Tue, 8 Oct 2019 13:03:59 +0000 (00:03 +1100)]
Fix example

5 years agoMerge pull request #14891 from eileenmcnaughton/saved_search
Matthew Wire [Tue, 8 Oct 2019 10:22:48 +0000 (12:22 +0200)]
Merge pull request #14891 from eileenmcnaughton/saved_search

[Code-quality] remove references to where_tables, where_clause

5 years agoAdd is_template field to contribution entity
Aidan Saunders [Mon, 7 Oct 2019 13:27:53 +0000 (14:27 +0100)]
Add is_template field to contribution entity
Update tests and examples

5 years agoMerge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt
Seamus Lee [Tue, 8 Oct 2019 08:25:32 +0000 (10:25 +0200)]
Merge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt

dev/core#1270 - fix email processor dropping attachments - ALTERNATE

5 years agoMerge pull request #15281 from mattwire/formatpaymentparams_useprepare
Seamus Lee [Tue, 8 Oct 2019 08:01:54 +0000 (10:01 +0200)]
Merge pull request #15281 from mattwire/formatpaymentparams_useprepare

REF Use the new prepareParamsForPaymentProcessor function in more places

5 years agoMerge pull request #15425 from eileenmcnaughton/loc_clean
Seamus Lee [Tue, 8 Oct 2019 06:51:49 +0000 (08:51 +0200)]
Merge pull request #15425 from eileenmcnaughton/loc_clean

[NFC] minor simplification

5 years agoMerge pull request #15418 from seamuslee001/frontend_contribution_page_title
Seamus Lee [Tue, 8 Oct 2019 06:50:00 +0000 (08:50 +0200)]
Merge pull request #15418 from seamuslee001/frontend_contribution_page_title

Add in frontend_title field for Contribution Pages to allow site mana…

5 years agofix email processor dropping attachments
DemeritCowboy [Tue, 8 Oct 2019 02:33:55 +0000 (22:33 -0400)]
fix email processor dropping attachments

5 years ago[NFC] minor simplification
eileen [Mon, 7 Oct 2019 15:50:12 +0000 (17:50 +0200)]
[NFC] minor simplification

This just changes how return vars are handled to make it clearer that ONLY contact::Create
cares about location_block::create return values

5 years agoMerge pull request #15434 from civicrm/5.19
Eileen McNaughton [Mon, 7 Oct 2019 23:02:25 +0000 (01:02 +0200)]
Merge pull request #15434 from civicrm/5.19

5.19 to master

5 years agoMerge pull request #15428 from greenpeace-cee/fix-status-check
Eileen McNaughton [Mon, 7 Oct 2019 22:55:50 +0000 (00:55 +0200)]
Merge pull request #15428 from greenpeace-cee/fix-status-check

Fix status check not rendering before 5.19 migrations

5 years agoMerge pull request #15411 from systopia/dev_l10nx
Seamus Lee [Mon, 7 Oct 2019 21:09:27 +0000 (23:09 +0200)]
Merge pull request #15411 from systopia/dev_l10nx

Allow custom ts functions in extensions; defer custom ts calls until booted

5 years agoMerge pull request #15430 from civicrm/5.19
Seamus Lee [Mon, 7 Oct 2019 19:47:22 +0000 (21:47 +0200)]
Merge pull request #15430 from civicrm/5.19

5.19

5 years agoMerge pull request #15412 from demeritcowboy/fly-backwards
Seamus Lee [Mon, 7 Oct 2019 17:46:30 +0000 (19:46 +0200)]
Merge pull request #15412 from demeritcowboy/fly-backwards

Minor a_b/b_a mixup on case type edit screen

5 years agoMerge pull request #15420 from eileenmcnaughton/live_notice
Seamus Lee [Mon, 7 Oct 2019 17:42:13 +0000 (19:42 +0200)]
Merge pull request #15420 from eileenmcnaughton/live_notice

dev/core#1281 fix e-notice on isLiveMode

5 years agoMerge pull request #15359 from fkohrt/master
Seamus Lee [Mon, 7 Oct 2019 17:19:16 +0000 (19:19 +0200)]
Merge pull request #15359 from fkohrt/master

Improve item order inside Online Contributions section of configuration checklist; see lab issue dev/core#1278

5 years agoFix status check not rendering before 5.19 migrations
Patrick Figel [Mon, 7 Oct 2019 17:05:59 +0000 (19:05 +0200)]
Fix status check not rendering before 5.19 migrations

This fixes an issue where the status check page does not render when
migrations to 5.19 are pending because the is_active column hasn't been
added yet.

The rationale for this change is to avoid scenarios where users forget
to run upgrades because there's no status check warning.

5 years agoMerge pull request #15424 from eileenmcnaughton/email_form
Seamus Lee [Mon, 7 Oct 2019 16:49:39 +0000 (18:49 +0200)]
Merge pull request #15424 from eileenmcnaughton/email_form

[NFC] code formatting

5 years agoMerge pull request #15423 from greenpeace-cee/fix-is-required-address-field
Eileen McNaughton [Mon, 7 Oct 2019 16:27:36 +0000 (18:27 +0200)]
Merge pull request #15423 from greenpeace-cee/fix-is-required-address-field

Fix E_NOTICE for is_required in address form

5 years agoAdd in frontend_title field for Contribution Pages to allow site managers to specify...
Seamus Lee [Mon, 7 Oct 2019 12:05:48 +0000 (23:05 +1100)]
Add in frontend_title field for Contribution Pages to allow site managers to specify a title for a page different to that for use from the backend

5 years ago[NFC] code formatting
eileen [Mon, 7 Oct 2019 15:12:23 +0000 (17:12 +0200)]
[NFC] code formatting

5 years agoMerge pull request #15419 from eileenmcnaughton/event_filter
Eileen McNaughton [Mon, 7 Oct 2019 15:09:06 +0000 (17:09 +0200)]
Merge pull request #15419 from eileenmcnaughton/event_filter

dev/financial#72 Make is_template=0 the default for api get requests.

5 years agoSet version to 5.20.alpha1
CiviCRM [Mon, 7 Oct 2019 15:07:03 +0000 (15:07 +0000)]
Set version to 5.20.alpha1

5 years agoSet version to 5.19.beta1
CiviCRM [Mon, 7 Oct 2019 15:01:46 +0000 (15:01 +0000)]
Set version to 5.19.beta1

5 years agoFix E_NOTICE for is_required in address form
Patrick Figel [Mon, 7 Oct 2019 14:48:51 +0000 (16:48 +0200)]
Fix E_NOTICE for is_required in address form

This fixes an E_NOTICE that's triggered for optional address custom
fields in CRM_Contact_Form_Edit_Address.

5 years agodev/core#1281 fix e-notice on isLiveMode
eileen [Mon, 7 Oct 2019 13:49:28 +0000 (15:49 +0200)]
dev/core#1281 fix e-notice on isLiveMode

Looks like a regression from https://github.com/civicrm/civicrm-core/commit/752cee47213094c29b8e6ae5d0b20f0800520d80
which hit in 5.15 - seems good to merge to rc / about to cut to rc

5 years agodev/financial#72 Make is_template=0 the default for api get requests.
eileen [Mon, 7 Oct 2019 13:09:50 +0000 (15:09 +0200)]
dev/financial#72 Make is_template=0 the default for api get requests.

We are planning on adding is_template to the civicrm_contribution table - following the precedent from event.

By default it is NOT desirable to get template entities returned in a get request - this fixes that at the generic
apiv4 level and means that it will be a default filter when present

5 years agoMerge pull request #15417 from eileenmcnaughton/matt
Matthew Wire [Mon, 7 Oct 2019 12:43:02 +0000 (14:43 +0200)]
Merge pull request #15417 from eileenmcnaughton/matt

Add trxn_id as a parameter on Payment.get

5 years agoMerge pull request #15414 from eileenmcnaughton/fix_log_text
Seamus Lee [Mon, 7 Oct 2019 11:44:02 +0000 (13:44 +0200)]
Merge pull request #15414 from eileenmcnaughton/fix_log_text

dev/core#1283 fix inability to export more than 255 chars

5 years agoMerge pull request #15416 from civicrm/eileenmcnaughton-patch-1
Seamus Lee [Mon, 7 Oct 2019 11:43:32 +0000 (13:43 +0200)]
Merge pull request #15416 from civicrm/eileenmcnaughton-patch-1

Update fix - should not be localisable

5 years agoAccept trxn_id to Payment.get
eileen [Mon, 7 Oct 2019 11:22:42 +0000 (13:22 +0200)]
Accept trxn_id to Payment.get

Alternative to #15166 (incorporates #15229 )

5 years agoUnit test for #15166 fix
Jitendra Purohit [Fri, 6 Sep 2019 12:09:28 +0000 (17:39 +0530)]
Unit test for #15166 fix

5 years agoMerge pull request #15381 from eileenmcnaughton/w_test
Matthew Wire [Mon, 7 Oct 2019 11:00:55 +0000 (13:00 +0200)]
Merge pull request #15381 from eileenmcnaughton/w_test

Add test for uF group one bug

5 years agoUpdate fix - should not be localisable
Eileen McNaughton [Mon, 7 Oct 2019 10:54:05 +0000 (12:54 +0200)]
Update fix - should not be localisable

5 years agodev/core#1283 fix inability to export more than 255 chars
eileen [Mon, 7 Oct 2019 08:34:21 +0000 (10:34 +0200)]
dev/core#1283 fix inability to export more than 255 chars

5 years agodon't prevent I18n init, @totten says it's not too costly...
B. Endres [Mon, 7 Oct 2019 10:48:22 +0000 (12:48 +0200)]
don't prevent I18n init, @totten says it's not too costly...

5 years agofixed style error
B. Endres [Mon, 7 Oct 2019 10:07:18 +0000 (12:07 +0200)]
fixed style error

5 years agoMerge pull request #15409 from eileenmcnaughton/status
Seamus Lee [Mon, 7 Oct 2019 10:01:59 +0000 (12:01 +0200)]
Merge pull request #15409 from eileenmcnaughton/status

dev/core#1295 Add is_active field to civicrm_status_preference

5 years agorun strings through ts(), but skip actual translation
B. Endres [Mon, 7 Oct 2019 09:28:58 +0000 (11:28 +0200)]
run strings through ts(), but skip actual translation

5 years agoMerge pull request #15413 from eileenmcnaughton/default_sub_type
Seamus Lee [Mon, 7 Oct 2019 08:44:05 +0000 (10:44 +0200)]
Merge pull request #15413 from eileenmcnaughton/default_sub_type

[REF] don't handle non-array, pass by reference

5 years agoHeed is_active value if set to zero
eileen [Sun, 6 Oct 2019 18:13:54 +0000 (20:13 +0200)]
Heed is_active value if set to zero

Note this is done BEFORE doing checks in case it is for performance reasons

5 years agoAdd test for uF group one bug
eileen [Thu, 3 Oct 2019 07:26:16 +0000 (09:26 +0200)]
Add test for uF group one bug

5 years ago[REF] don't handle non-array, pass by reference
eileen [Mon, 7 Oct 2019 04:57:29 +0000 (06:57 +0200)]
[REF] don't handle non-array, pass by reference

This is only called from one place & it is definitely coming in as an array & using the return values.

5 years agominor a_b/b_a mixup
DemeritCowboy [Mon, 7 Oct 2019 03:35:01 +0000 (23:35 -0400)]
minor a_b/b_a mixup

5 years agoMerge pull request #15352 from colemanw/extCompat
Tim Otten [Sun, 6 Oct 2019 23:48:13 +0000 (00:48 +0100)]
Merge pull request #15352 from colemanw/extCompat

Improve obsolete extension management

5 years agoimplemented @totten's approach to fix custom ts functions in extensions
B. Endres [Sun, 6 Oct 2019 21:46:35 +0000 (23:46 +0200)]
implemented @totten's approach to fix custom ts functions in extensions

5 years agoMerge pull request #15404 from seamuslee001/dev_core_861
Seamus Lee [Sun, 6 Oct 2019 18:59:34 +0000 (20:59 +0200)]
Merge pull request #15404 from seamuslee001/dev_core_861

dev/core#861 Ensure that when processing mailings that no emails are …

5 years agoMerge pull request #15384 from mattwire/membership_updaterecur
Seamus Lee [Sun, 6 Oct 2019 18:59:08 +0000 (20:59 +0200)]
Merge pull request #15384 from mattwire/membership_updaterecur

Remove call to updateRecurMembership which is handled by Membership::create BAO

5 years agoMerge pull request #15406 from mattwire/morecontributionstatuslabel
Seamus Lee [Sun, 6 Oct 2019 18:58:17 +0000 (20:58 +0200)]
Merge pull request #15406 from mattwire/morecontributionstatuslabel

Fix checking of isSubscriptionCancelled when label is changed

5 years agoMerge pull request #15405 from MikeyMJCO/nomoreyahoo
Matthew Wire [Sun, 6 Oct 2019 18:20:22 +0000 (20:20 +0200)]
Merge pull request #15405 from MikeyMJCO/nomoreyahoo

Remove legacy Yahoo references from the Mapping/Geocoding settings/code.

5 years agoFix check for isSubscriptionCancelled in contribute
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:22:20 +0000 (19:22 +0200)]
Fix check for isSubscriptionCancelled in contribute

5 years agoExplicitly retrieve label for contributionStatus (no change in behaviour)
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:21:41 +0000 (19:21 +0200)]
Explicitly retrieve label for contributionStatus (no change in behaviour)

5 years agoAdd is_active to status pref
eileen [Sun, 6 Oct 2019 16:21:52 +0000 (18:21 +0200)]
Add is_active to status pref

5 years agoMerge pull request #15403 from smaen123/patch-1
Matthew Wire [Sun, 6 Oct 2019 17:01:23 +0000 (19:01 +0200)]
Merge pull request #15403 from smaen123/patch-1

Fix height of select2 box (appears squished)

5 years agoRemove call to updateRecurMembership which is handled by Membership::create BAO
Matthew Wire (MJW Consulting) [Thu, 3 Oct 2019 10:23:52 +0000 (11:23 +0100)]
Remove call to updateRecurMembership which is handled by Membership::create BAO

5 years agoextension-compatibility - Update DB state of force-uninstalled extensions
Tim Otten [Sun, 6 Oct 2019 16:49:16 +0000 (17:49 +0100)]
extension-compatibility - Update DB state of force-uninstalled extensions

Note:
1. This is more advisory than functional - the functionality is really in the runtime bits
   in the previous commits.
2. Technically, this is more of a disable, but we should keep the record around in
   `civicrm_extension` so that we know the old schema revision.

5 years agodev/core#861 Ensure that when processing mailings that no emails are sent to deceased...
Seamus Lee [Sun, 6 Oct 2019 16:26:46 +0000 (03:26 +1100)]
dev/core#861 Ensure that when processing mailings that no emails are sent to deceased contacts or those with emails now on hold

5 years agoUpdate ConfigTaskList to remove Yahoo reference and add OSM
Mikey O'Toole [Sun, 6 Oct 2019 15:49:01 +0000 (16:49 +0100)]
Update ConfigTaskList to remove Yahoo reference and add OSM

5 years agoRemove Yahoo reference from the Mapping settings.
Mikey O'Toole [Sun, 6 Oct 2019 15:47:21 +0000 (16:47 +0100)]
Remove Yahoo reference from the Mapping settings.

5 years agoMerge remote-tracking branch 'MikeyMJCO/patch-2' into patch-1
Mikey O'Toole [Sun, 6 Oct 2019 15:34:59 +0000 (16:34 +0100)]
Merge remote-tracking branch 'MikeyMJCO/patch-2' into patch-1

5 years agoRemove conditional for Yahoo mapping provider
Mikey O'Toole [Sun, 6 Oct 2019 15:32:01 +0000 (16:32 +0100)]
Remove conditional for Yahoo mapping provider

The Yahoo mapping provider is no longer in core and therefore this conditional logic is no longer necessary.

5 years agoMerge pull request #14184 from mattwire/relationshipcolumns
Seamus Lee [Sun, 6 Oct 2019 15:29:15 +0000 (17:29 +0200)]
Merge pull request #14184 from mattwire/relationshipcolumns

Allow columns in relationship table to be modified by searchColumns hook

5 years agoRemove Yahoo references
Mikey O'Toole [Sun, 6 Oct 2019 15:27:21 +0000 (16:27 +0100)]
Remove Yahoo references

Remove references to Yahoo Geocoder which is no longer included core.

5 years agoMerge pull request #15397 from mattwire/contributionstatuslabel
Seamus Lee [Sun, 6 Oct 2019 15:17:36 +0000 (17:17 +0200)]
Merge pull request #15397 from mattwire/contributionstatuslabel

REF Explicitly specify params so we can find problems with comparing translated labels

5 years agoMerge pull request #14577 from mattwire/type_consolidation
Eileen McNaughton [Sun, 6 Oct 2019 10:05:01 +0000 (12:05 +0200)]
Merge pull request #14577 from mattwire/type_consolidation

REF Remove some duplication in CRM_Utils_Type::escape/validate

5 years agoMerge pull request #15402 from eileenmcnaughton/nfc
Seamus Lee [Sun, 6 Oct 2019 07:49:50 +0000 (09:49 +0200)]
Merge pull request #15402 from eileenmcnaughton/nfc

[NFC] code formatting & exceptions in doc blocks

5 years agoMerge pull request #15401 from seamuslee001/master
Seamus Lee [Sun, 6 Oct 2019 07:49:43 +0000 (09:49 +0200)]
Merge pull request #15401 from seamuslee001/master

Master / 5.19 version of #15392

5 years agoFix height of select2 box (appears squished)
smaen123 [Sat, 5 Oct 2019 15:57:28 +0000 (17:57 +0200)]
Fix height of select2 box (appears squished)

5 years agoAdd exceptions to phpdoc
eileen [Sat, 5 Oct 2019 13:50:57 +0000 (15:50 +0200)]
Add exceptions to phpdoc

5 years ago[NFC] code formatting
eileen [Sat, 5 Oct 2019 13:44:51 +0000 (15:44 +0200)]
[NFC] code formatting

5 years agofix typo resulting in fatal error
DemeritCowboy [Fri, 4 Oct 2019 22:00:08 +0000 (18:00 -0400)]
fix typo resulting in fatal error

5 years agoMerge pull request #15395 from seamuslee001/5_18_1_release_notes
Seamus Lee [Sat, 5 Oct 2019 13:18:20 +0000 (23:18 +1000)]
Merge pull request #15395 from seamuslee001/5_18_1_release_notes

5 18 1 release notes

5 years agoMerge pull request #15398 from eileenmcnaughton/adv
Eileen McNaughton [Sat, 5 Oct 2019 12:52:05 +0000 (14:52 +0200)]
Merge pull request #15398 from eileenmcnaughton/adv

dev/core#1294 Remove getFormValues function

5 years agoMerge pull request #14897 from mattwire/membership_payment2
Eileen McNaughton [Sat, 5 Oct 2019 11:20:22 +0000 (13:20 +0200)]
Merge pull request #14897 from mattwire/membership_payment2

Don't use random parameters to detect if we should create MembershipPayment

5 years agoMerge pull request #15385 from demeritcowboy/test-case-type-edit-1
Eileen McNaughton [Sat, 5 Oct 2019 11:16:21 +0000 (13:16 +0200)]
Merge pull request #15385 from demeritcowboy/test-case-type-edit-1

[TEST] dev/core#1046 - tests for case type edit screen

5 years agodev/core#1294 Remove getFormValues function
eileen [Sat, 5 Oct 2019 10:52:43 +0000 (12:52 +0200)]
dev/core#1294 Remove getFormValues function

This is overiding the parent function which gives an empty result

5 years agoExplicitly specify params so we can find problems with comparing translated labels
Matthew Wire (MJW Consulting) [Sat, 5 Oct 2019 10:36:34 +0000 (12:36 +0200)]
Explicitly specify params so we can find problems with comparing translated labels

5 years agoUpdate 5.18.1.md
Tim Otten [Sat, 5 Oct 2019 09:57:38 +0000 (10:57 +0100)]
Update 5.18.1.md

5 years agoUpdate release notes for the export fix
Seamus Lee [Sat, 5 Oct 2019 08:49:28 +0000 (18:49 +1000)]
Update release notes for the export fix

5 years agoMerge pull request #15389 from eileenmcnaughton/cleanup_query
Matthew Wire [Sat, 5 Oct 2019 10:32:20 +0000 (12:32 +0200)]
Merge pull request #15389 from eileenmcnaughton/cleanup_query

Extract the code to get the field name.

5 years agoUpdate 5.18.1.md
Tim Otten [Sat, 5 Oct 2019 07:51:39 +0000 (08:51 +0100)]
Update 5.18.1.md

5 years agoAdd in 5.18.1 release notes
Seamus Lee [Fri, 4 Oct 2019 14:45:41 +0000 (00:45 +1000)]
Add in 5.18.1 release notes

5 years agoMerge pull request #15376 from mattwire/ts_membershippending
Mathieu Lu [Sat, 5 Oct 2019 07:19:00 +0000 (03:19 -0400)]
Merge pull request #15376 from mattwire/ts_membershippending

Use name instead of label to check contribution status

5 years agoMerge pull request #15378 from demeritcowboy/deanonymize-on-the-fly
colemanw [Sat, 5 Oct 2019 01:45:58 +0000 (21:45 -0400)]
Merge pull request #15378 from demeritcowboy/deanonymize-on-the-fly

[REF] Pull out anonymous javascript function to make it testable

5 years agopull out function for testing
DemeritCowboy [Fri, 4 Oct 2019 14:50:45 +0000 (10:50 -0400)]
pull out function for testing

5 years agoMerge pull request #15329 from mattwire/contributepagetab_cleanupstatic
Eileen McNaughton [Fri, 4 Oct 2019 14:42:21 +0000 (16:42 +0200)]
Merge pull request #15329 from mattwire/contributepagetab_cleanupstatic

Remove static caching of static on Contribution page tab

5 years agoAllow columns in relationship table to be modified by searchColumns hook
Matthew Wire (MJW Consulting) [Thu, 2 May 2019 13:43:25 +0000 (14:43 +0100)]
Allow columns in relationship table to be modified by searchColumns hook

5 years agoMerge pull request #15345 from yashodha/CRM-21677
Eileen McNaughton [Fri, 4 Oct 2019 13:19:03 +0000 (15:19 +0200)]
Merge pull request #15345 from yashodha/CRM-21677

CRM-21677 - report clean up for contact detail report

5 years agoExtract the code to get the field name.
eileen [Fri, 4 Oct 2019 12:44:26 +0000 (14:44 +0200)]
Extract the code to get the field name.

Ideally we can share this across searches (@monishdeb is hitting some things in case search that are solved
in contribution search so trying to cleanup these bits  - this just pulls out one small piece.

Once this is passing tests (which could be affected by my new deprecations
I think the other fields - fieldspec & 'qillname' if still required can get the same treatment.
in the next step.

Getting the fieldSpec & adding the qill is what I specifically want to genericise.

5 years agoMerge pull request #15388 from MegaphoneJon/financial-71
Eileen McNaughton [Fri, 4 Oct 2019 12:13:19 +0000 (14:13 +0200)]
Merge pull request #15388 from MegaphoneJon/financial-71

financial#71 - allow emailing partially paid invoices

5 years agoMerge pull request #15379 from eileenmcnaughton/cleanup_form_values
Seamus Lee [Fri, 4 Oct 2019 07:21:01 +0000 (17:21 +1000)]
Merge pull request #15379 from eileenmcnaughton/cleanup_form_values

[REF] Consolidate getFormValues on contribution search

5 years agoMerge pull request #15312 from seamuslee001/export_hook_test
Eileen McNaughton [Fri, 4 Oct 2019 04:20:12 +0000 (06:20 +0200)]
Merge pull request #15312 from seamuslee001/export_hook_test

Extend Export test to cover altering sqlColumns and headerRows via ho…

5 years agoMerge pull request #15387 from eileenmcnaughton/merge
Eileen McNaughton [Fri, 4 Oct 2019 04:05:22 +0000 (06:05 +0200)]
Merge pull request #15387 from eileenmcnaughton/merge

Merge 5.18 to master

5 years agoMerge branch '5.18' of https://github.com/civicrm/civicrm-core into merge
eileen [Fri, 4 Oct 2019 04:03:43 +0000 (06:03 +0200)]
Merge branch '5.18' of https://github.com/civicrm/civicrm-core into merge

5 years agoConsolidate getFormValues on contribution search
eileen [Thu, 3 Oct 2019 06:19:13 +0000 (08:19 +0200)]
Consolidate getFormValues on contribution search

This consolidates 2 places where formValues are determined on contribution search. In one place
force is handled in the other retrieving from the form is handled. It seems Ok to handle both in
one place & call that. This might help iron on some glitches Monish is hitting on #15370

We should probably add saved search retrieval in too

To confirm this works use this url
civicrm/contribute/search?reset=1&reset=1&sort_name=p&receive_date_high=20180101&force=1

- it should filter. If you add another criteria to the form afterwards the url criteria should
be present on the form from the url & the new one should also be respected. If you actively remove the url
criteria on the form it is ignored in the search

5 years agotests for case type edit screen
DemeritCowboy [Thu, 3 Oct 2019 21:49:26 +0000 (17:49 -0400)]
tests for case type edit screen

5 years agoSet version to 5.18.0
CiviCRM [Thu, 3 Oct 2019 14:11:42 +0000 (14:11 +0000)]
Set version to 5.18.0

5 years agoMerge pull request #15382 from totten/5.18-note-event
Tim Otten [Thu, 3 Oct 2019 14:09:40 +0000 (15:09 +0100)]
Merge pull request #15382 from totten/5.18-note-event

(NFC) release-notes/5.18.0.md - Add dev/event#15