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
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
Eileen McNaughton [Mon, 7 Oct 2019 10:54:05 +0000 (12:54 +0200)]
Update fix - should not be localisable
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
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
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
eileen [Thu, 3 Oct 2019 07:26:16 +0000 (09:26 +0200)]
Add test for uF group one bug
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.
Tim Otten [Sun, 6 Oct 2019 23:48:13 +0000 (00:48 +0100)]
Merge pull request #15352 from colemanw/extCompat
Improve obsolete extension management
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 …
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
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
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.
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:22:20 +0000 (19:22 +0200)]
Fix check for isSubscriptionCancelled in contribute
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:21:41 +0000 (19:21 +0200)]
Explicitly retrieve label for contributionStatus (no change in behaviour)
eileen [Sun, 6 Oct 2019 16:21:52 +0000 (18:21 +0200)]
Add is_active to status pref
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)
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
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.
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
Mikey O'Toole [Sun, 6 Oct 2019 15:49:01 +0000 (16:49 +0100)]
Update ConfigTaskList to remove Yahoo reference and add OSM
Mikey O'Toole [Sun, 6 Oct 2019 15:47:21 +0000 (16:47 +0100)]
Remove Yahoo reference from the Mapping settings.
Mikey O'Toole [Sun, 6 Oct 2019 15:34:59 +0000 (16:34 +0100)]
Merge remote-tracking branch 'MikeyMJCO/patch-2' into patch-1
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.
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
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.
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
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
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
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
smaen123 [Sat, 5 Oct 2019 15:57:28 +0000 (17:57 +0200)]
Fix height of select2 box (appears squished)
eileen [Sat, 5 Oct 2019 13:50:57 +0000 (15:50 +0200)]
Add exceptions to phpdoc
eileen [Sat, 5 Oct 2019 13:44:51 +0000 (15:44 +0200)]
[NFC] code formatting
DemeritCowboy [Fri, 4 Oct 2019 22:00:08 +0000 (18:00 -0400)]
fix typo resulting in fatal error
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
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
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
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
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
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
Tim Otten [Sat, 5 Oct 2019 09:57:38 +0000 (10:57 +0100)]
Update 5.18.1.md
Seamus Lee [Sat, 5 Oct 2019 08:49:28 +0000 (18:49 +1000)]
Update release notes for the export fix
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.
Tim Otten [Sat, 5 Oct 2019 07:51:39 +0000 (08:51 +0100)]
Update 5.18.1.md
Seamus Lee [Fri, 4 Oct 2019 14:45:41 +0000 (00:45 +1000)]
Add in 5.18.1 release notes
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
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
DemeritCowboy [Fri, 4 Oct 2019 14:50:45 +0000 (10:50 -0400)]
pull out function for testing
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
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
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
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.
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
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
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…
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
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
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
DemeritCowboy [Thu, 3 Oct 2019 21:49:26 +0000 (17:49 -0400)]
tests for case type edit screen
CiviCRM [Thu, 3 Oct 2019 14:11:42 +0000 (14:11 +0000)]
Set version to 5.18.0
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
Tim Otten [Thu, 3 Oct 2019 14:09:04 +0000 (15:09 +0100)]
Merge pull request #15380 from eileenmcnaughton/cust_uf
(dev/event#15) Fix regression in handling of post profiles in email
Tim Otten [Thu, 3 Oct 2019 10:28:43 +0000 (11:28 +0100)]
Event::sendMail() - Don't assume $postProfileID has content
The unit-test suite includes cases in which the value is actually NULL.
Tim Otten [Thu, 3 Oct 2019 08:30:52 +0000 (09:30 +0100)]
Event::sendEmail() - Fix displaying of heading. Use same key.
The message templates use this loop:
```
{foreach from=$customPost item=customPos key=j}
<tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>
```
Note that the keys in `$customPost` and `$customPost_grouptitle` need to
match.
Tim Otten [Thu, 3 Oct 2019 07:44:31 +0000 (08:44 +0100)]
release-notes/5.18.0.md - Add dev/event#15
Tim Otten [Thu, 3 Oct 2019 07:19:21 +0000 (08:19 +0100)]
Event::sendEmail() - Fix profile ID for realz this time
eileen [Thu, 3 Oct 2019 06:55:33 +0000 (08:55 +0200)]
Fix regression in handling of post profiles in email
Eileen McNaughton [Thu, 3 Oct 2019 05:31:54 +0000 (07:31 +0200)]
Merge pull request #15377 from demeritcowboy/relTypes-not-relTypes
[NFC] Rename local variable
DemeritCowboy [Wed, 2 Oct 2019 19:42:34 +0000 (15:42 -0400)]
rename local variable
Matthew Wire [Wed, 2 Oct 2019 17:52:33 +0000 (18:52 +0100)]
Merge pull request #15365 from samuelsov/userdashboard
Removing 'Array' from user dashboard contributions
Tim Otten [Wed, 2 Oct 2019 16:15:24 +0000 (17:15 +0100)]
extension-compatibility - Add 'force-uninstall' mode for api4 transition
There is a compatibility problem when upgrading a system which has an old
copy of api4: the top level `api4.php` indiscriminately declares the
function `civicrm_api4()`, which eventually provokes a conflict with the
copy that is now in `civicrm-core`.
Using the normal disable/uninstall actions doesn't resolve this because the
error arises too early during boot (before the upgrader gets a chance to
remove the extension).
The 'force-uninstall' option will make the system behave as if the extension
is uninstalled, regardless of what files exist and what state may be stored
in the `civicrm_extension` table.
This commit technically does ~3 things:
1. Changes the policy for `org.civicrm.api4` to use `force-uninstall`
2. Makes the extension-cache version-dependent. During an upgrade, you
might have a stale cache that claims that the old extension is
active. This ensures that (as soon as you drop in new code)
it begins working with a fresh cache.
3. Update any spots which query the table `civicrm_extensions` for
extension status. Have it consult `extension-compatibility.json`
for `force-uninstall`ed items.
Coleman Watts [Thu, 26 Sep 2019 19:34:53 +0000 (15:34 -0400)]
Completely uninstall obsolete extensions during upgrade
Coleman Watts [Thu, 26 Sep 2019 19:33:43 +0000 (15:33 -0400)]
Do not allow obsolete extensions to be enabled
Matthew Wire (MJW Consulting) [Wed, 2 Oct 2019 15:42:07 +0000 (16:42 +0100)]
Use name instead of label to check contribution status
Jon Goldberg [Wed, 2 Oct 2019 14:28:19 +0000 (10:28 -0400)]
financial#71 - allow emailing partially paid invoices
Eileen McNaughton [Wed, 2 Oct 2019 08:53:15 +0000 (10:53 +0200)]
Merge pull request #15361 from seamuslee001/index_geo_code_fields
Add in an index on geo_code_1 and geo_code_2 to assist with distance …
Eileen McNaughton [Wed, 2 Oct 2019 08:49:01 +0000 (10:49 +0200)]
Merge pull request #15368 from seamuslee001/deprecated_getvalue_mailing_prefernces
[REF] Remove call to depreacated getValue call in Mailing Preferences…
Eileen McNaughton [Wed, 2 Oct 2019 05:46:41 +0000 (13:46 +0800)]
Merge pull request #15372 from civicrm/5.18
5.18
Seamus Lee [Tue, 1 Oct 2019 18:16:41 +0000 (04:16 +1000)]
Merge pull request #15371 from agh1/5.18.0-releasenotes-final
5.18.0 release notes final edits
Andrew Hunt [Tue, 1 Oct 2019 17:27:26 +0000 (13:27 -0400)]
5.18.0 release notes: some final edits
Andrew Hunt [Tue, 1 Oct 2019 14:56:32 +0000 (10:56 -0400)]
5.18.0 release notes: added late changes
Seamus Lee [Tue, 1 Oct 2019 07:40:35 +0000 (17:40 +1000)]
[REF] Remove call to depreacated getValue call in Mailing Preferences settings form
Seamus Lee [Tue, 1 Oct 2019 01:38:12 +0000 (11:38 +1000)]
Merge pull request #15366 from demeritcowboy/radio-date-gmt
dev/core#1279 - crmMailingRadioDateSpec.js always has a failure if west of GMT
DemeritCowboy [Tue, 1 Oct 2019 00:03:10 +0000 (20:03 -0400)]
GMT fix
Samuel Vanhove [Mon, 30 Sep 2019 20:31:48 +0000 (16:31 -0400)]
NFC - removing 'Array' from user dashboard contributions
colemanw [Mon, 30 Sep 2019 12:17:01 +0000 (08:17 -0400)]
Merge pull request #15360 from seamuslee001/ids_path_fix
[REF] Fix path to htmlpurifier in IDS file
Eileen McNaughton [Mon, 30 Sep 2019 07:33:17 +0000 (15:33 +0800)]
Merge pull request #15305 from yashodha/CRM_21777
CRM-21777 - Set readonly for the smtp fields initialised in civicrm_s…
Seamus Lee [Mon, 30 Sep 2019 06:18:18 +0000 (16:18 +1000)]
Add in an index on geo_code_1 and geo_code_2 to assist with distance and other queries
Seamus Lee [Mon, 30 Sep 2019 00:15:07 +0000 (10:15 +1000)]
[REF] Fix path to htmlpurifier in IDS file
colemanw [Fri, 27 Sep 2019 23:52:59 +0000 (19:52 -0400)]
Merge pull request #15335 from jitendrapurohit/13365-test
Add getdisplayvalue api with unit test.
Seamus Lee [Fri, 27 Sep 2019 22:42:45 +0000 (08:42 +1000)]
Merge pull request #15357 from civicrm/5.18
5.18
Tim Otten [Fri, 27 Sep 2019 04:37:05 +0000 (21:37 -0700)]
Merge pull request #15356 from seamuslee001/5.18
release-notes - Add 5.17.5
Tim Otten [Fri, 27 Sep 2019 04:11:08 +0000 (21:11 -0700)]
release-notes - Add 5.17.5
Tim Otten [Fri, 27 Sep 2019 04:22:17 +0000 (21:22 -0700)]
Merge pull request #15351 from civicrm/5.18
5.18
Seamus Lee [Thu, 26 Sep 2019 23:11:14 +0000 (09:11 +1000)]
Merge pull request #15353 from totten/master-api4-header
(NFC) api4 - Apply standard headers
Tim Otten [Mon, 23 Sep 2019 18:57:02 +0000 (11:57 -0700)]
api4 - Apply standard headers
colemanw [Thu, 26 Sep 2019 20:21:04 +0000 (16:21 -0400)]
Merge pull request #15350 from seamuslee001/lab_core_1276
Ensure that price_field_value rows aren't duplicated when editing pri…
Seamus Lee [Thu, 26 Sep 2019 09:04:57 +0000 (19:04 +1000)]
Ensure that price_field_value rows aren't duplicated when editing price field of type text
Seamus Lee [Wed, 25 Sep 2019 02:41:57 +0000 (12:41 +1000)]
Merge pull request #15346 from jitendrapurohit/dev-1272
dev/core#1272 - PHP 7.3 warning message on import contribution
Seamus Lee [Tue, 24 Sep 2019 00:14:10 +0000 (10:14 +1000)]
Merge pull request #15348 from civicrm/5.18
5.18