Eileen McNaughton [Wed, 4 Sep 2019 23:49:46 +0000 (11:49 +1200)]
Merge pull request #15215 from eileenmcnaughton/import_next
[Ref] Import use process for relationship defaults, add test
eileen [Wed, 4 Sep 2019 22:07:43 +0000 (10:07 +1200)]
Remove a bunch of now-unused variables, will improve performance too as one involved a query
eileen [Wed, 4 Sep 2019 22:07:15 +0000 (10:07 +1200)]
Ensure subtype is set on processor
eileen [Wed, 4 Sep 2019 22:04:42 +0000 (10:04 +1200)]
Move default fetching to Processor class
eileen [Wed, 4 Sep 2019 21:58:59 +0000 (09:58 +1200)]
Improve tests on loading relationship data
Eileen McNaughton [Wed, 4 Sep 2019 21:34:03 +0000 (09:34 +1200)]
Merge pull request #14621 from pradpnayak/CleanUps
Use api to create activity and removed hardcoded status id
Seamus Lee [Wed, 4 Sep 2019 21:20:54 +0000 (07:20 +1000)]
Merge pull request #15212 from mmyriam/mmyriam-case-tag-search-patch-1
Fix search for case tags that are part of tag sets
Eileen McNaughton [Wed, 4 Sep 2019 21:19:58 +0000 (09:19 +1200)]
Merge pull request #15214 from civicrm/5.17
5.17
Seamus Lee [Wed, 4 Sep 2019 20:38:49 +0000 (06:38 +1000)]
Merge pull request #15213 from agh1/5.17.0-releasenotes-final
5.17.0 release notes: late changes and tidy-up
colemanw [Wed, 4 Sep 2019 18:54:22 +0000 (14:54 -0400)]
Merge pull request #15189 from eileenmcnaughton/import_tiny
[Import][ref] Minor code improvement - move setDefaults to processor
colemanw [Wed, 4 Sep 2019 18:51:41 +0000 (14:51 -0400)]
Merge pull request #15211 from caltha-eu/patch.ts-deceased
Add ts() to deceased string
mmyriam [Wed, 4 Sep 2019 13:43:42 +0000 (09:43 -0400)]
Fix search for case tags that are part of tag sets
Changes to be committed:
modified: CRM/Case/BAO/Query.php
Andrew Hunt [Wed, 4 Sep 2019 14:50:41 +0000 (10:50 -0400)]
5.17.0 release notes: late changes and tidy-up
scardinius [Wed, 4 Sep 2019 12:15:08 +0000 (14:15 +0200)]
(patch.ts-deceased) Add ts() to deceased
Eileen McNaughton [Wed, 4 Sep 2019 05:55:01 +0000 (17:55 +1200)]
Merge pull request #15209 from yashodha/dev1065
(dev/core#1065) Grant in Edit mode doesn't show the associated contact
yashodha [Wed, 4 Sep 2019 03:32:40 +0000 (09:02 +0530)]
(dev/core#1065) Grant in Edit mode doesn't show the associated contact
Eileen McNaughton [Wed, 4 Sep 2019 02:00:21 +0000 (14:00 +1200)]
Merge pull request #15208 from civicrm/5.17
5.17 to master
Eileen McNaughton [Wed, 4 Sep 2019 01:59:53 +0000 (13:59 +1200)]
Merge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes
[NFC] Bring up 5.16.4 release notes into 5.17
Seamus Lee [Wed, 4 Sep 2019 01:56:50 +0000 (11:56 +1000)]
Merge pull request #15203 from eileenmcnaughton/index_contact
Add index to civicrm_contact.created_date & modified_date
Seamus Lee [Wed, 4 Sep 2019 01:53:32 +0000 (11:53 +1000)]
Merge pull request #15165 from fkohrt/master
SMTP help text and URL are misleading to Organization Address and Contact Info instead of leading to From Email Addresses; see also #14055 and #14329
Tim Otten [Tue, 3 Sep 2019 06:35:02 +0000 (23:35 -0700)]
Update 5.16.4.md
Tim Otten [Tue, 3 Sep 2019 06:31:19 +0000 (23:31 -0700)]
release-notes - Add 5.16.4
Seamus Lee [Wed, 4 Sep 2019 00:25:33 +0000 (10:25 +1000)]
Merge pull request #15193 from pradpnayak/ChangeACLCacheCLass
Changed ClassName for ACL cache
eileen [Tue, 3 Sep 2019 07:23:13 +0000 (19:23 +1200)]
Add index to civicrm_contact.created_date & modified_date
Note this will add the indexes to new installs or to installs who run the script to update indexes
(we used to promote this via a status check but there was a bug & we 'hushed' it & stopped trying to fix
the bug)
Seamus Lee [Tue, 3 Sep 2019 22:47:27 +0000 (08:47 +1000)]
Merge pull request #15205 from colemanw/importableCommunicationStyle
Set contact communication_style_id as importable
Seamus Lee [Tue, 3 Sep 2019 22:45:17 +0000 (08:45 +1000)]
Merge pull request #15156 from eileenmcnaughton/dedupe5
Replace some calls to CRM_Core_Error::fatal with exceptions
Coleman Watts [Tue, 3 Sep 2019 17:33:47 +0000 (13:33 -0400)]
Set contact communication_style_id as importable
colemanw [Tue, 3 Sep 2019 18:45:56 +0000 (14:45 -0400)]
Merge pull request #15204 from pradpnayak/CacheTitle
Added field title for Cache table
Matthew Wire [Tue, 3 Sep 2019 09:55:52 +0000 (10:55 +0100)]
Merge pull request #15196 from eileenmcnaughton/dedupe_api
dev/core#1230 [Dedupe] Add new api option to getduplicates, permitting a new search to be forced.
Pradeep Nayak [Tue, 3 Sep 2019 09:08:55 +0000 (10:08 +0100)]
Added field title for Cache table
Eileen McNaughton [Tue, 3 Sep 2019 07:09:59 +0000 (19:09 +1200)]
Merge pull request #15198 from seamuslee001/member_report_upgrade_step
Ensure all report templates switch the filter field_name from join_da…
Seamus Lee [Tue, 3 Sep 2019 06:30:06 +0000 (16:30 +1000)]
Merge pull request #15200 from eileenmcnaughton/date_field
Re-remove pledge & member fields from the legacy date list
eileen [Tue, 3 Sep 2019 05:28:29 +0000 (17:28 +1200)]
Re-remove pledge & member fields from the legacy date list
Eileen McNaughton [Tue, 3 Sep 2019 05:25:24 +0000 (17:25 +1200)]
Merge pull request #15199 from civicrm/5.17
5.17 to master
Eileen McNaughton [Tue, 3 Sep 2019 05:24:51 +0000 (17:24 +1200)]
Merge pull request #15197 from eileenmcnaughton/5.17
[NFC] comment fixes
Eileen McNaughton [Tue, 3 Sep 2019 05:24:11 +0000 (17:24 +1200)]
Merge pull request #15194 from eileenmcnaughton/517_dates
Fix failure to save relative dates on legacy fields
Seamus Lee [Tue, 3 Sep 2019 02:07:50 +0000 (12:07 +1000)]
Ensure all report templates switch the filter field_name from join_date to be membership_join_date
eileen [Tue, 3 Sep 2019 01:47:36 +0000 (13:47 +1200)]
[NFC] comment fixes
Seamus Lee [Tue, 3 Sep 2019 01:22:56 +0000 (11:22 +1000)]
Merge pull request #15177 from seamuslee001/member_fields_datepicker_conversion
[Date picker][REF] Convert jcalendar date fields to date picker on me…
eileen [Mon, 2 Sep 2019 22:50:37 +0000 (10:50 +1200)]
Fix failure to save relative dates on legacy fields
Seamus Lee [Mon, 2 Sep 2019 23:50:07 +0000 (09:50 +1000)]
Alter smartGroup conversion array to match 5.15 standard of groups and add in unit test of problem with mulitple relative dates in the one smart group
Fix test that was just added by moving assigning of fieldPossibilities lower
Seamus Lee [Mon, 2 Sep 2019 22:22:33 +0000 (08:22 +1000)]
Fix join_date in batch forms and in report filters
Seamus Lee [Sat, 31 Aug 2019 07:09:05 +0000 (17:09 +1000)]
[Date picker][REF] Convert jcalendar date fields to date picker on member search screen
Ensure that relative fields are handled as per newer handling
Update to eileen's metadata date_query functions and fix template
Fix upgrade by including each of the 3 separate field names
eileen [Tue, 3 Sep 2019 00:13:36 +0000 (12:13 +1200)]
Add new api option to getduplicates, permitting a new search to be forced.
Per the inbuilt screen, sometimes there is a need to clear the cached duplicates & reload - e.g because more have been
created in the mean time.
Eileen McNaughton [Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)]
Merge pull request #15185 from eileenmcnaughton/dedupe10
Incorporate searchLimit in dedupe cacheKey
Eileen McNaughton [Mon, 2 Sep 2019 20:56:55 +0000 (08:56 +1200)]
Merge pull request #15160 from eileenmcnaughton/dedupe8
Fix inconsistencies in duplicate retrieval
Seamus Lee [Mon, 2 Sep 2019 20:54:59 +0000 (06:54 +1000)]
Merge pull request #15191 from eileenmcnaughton/pledge_high_low
Use metadata for pledgeDateRange fields
eileen [Sun, 1 Sep 2019 23:34:02 +0000 (11:34 +1200)]
Incorporate searchLimit in dedupe cacheKey
When accessing dedupes by the api call or on the dedupe screen it's possible to pass in
a searchLimit param. This works like the group limit in that it limits the number of
contacts for whom a match is sought. For example if there are 2million contacts in the database
and you have a search limit of 0 then it will look for duplicates for all 2 million. (unset
is the same as 0). If you have a search limit of 1000 it will look for matches for the first
1000 contacts that match the criteria (criteria could be the group or other criteria passed in
via the url although the api is the most obvious way to pass in criteria)
Note there is a separate limit (sometimes called batch limit) that limits results from within
the found matches.
To test the searchLimit it is possible to add limit=5 to the url generated in the
url by findContacts. Without this patch changing the limit once the search has been done
will not alter the results as the limit is not part of the cachekey - this patch
changes that.
Eileen McNaughton [Mon, 2 Sep 2019 20:49:11 +0000 (08:49 +1200)]
Merge pull request #15192 from demeritcowboy/locate-name-or-label-2
dev/core#1046 - simplify logic
Pradeep Nayak [Mon, 2 Sep 2019 20:08:43 +0000 (21:08 +0100)]
Changed ClassName for ACL clacc
DemeritCowboy [Mon, 2 Sep 2019 14:51:01 +0000 (10:51 -0400)]
simplify logic
eileen [Mon, 2 Sep 2019 12:51:25 +0000 (00:51 +1200)]
Use metadata for pledgeDateRange fields
This moves the date handling for date fields to a re-usable function
Eileen McNaughton [Mon, 2 Sep 2019 08:01:57 +0000 (20:01 +1200)]
Merge pull request #15186 from seamuslee001/member_fields_xml_change
Update XML files for membership fields to support date picker conversion
Eileen McNaughton [Mon, 2 Sep 2019 07:13:42 +0000 (19:13 +1200)]
Merge pull request #15182 from demeritcowboy/locate-name-or-label
dev/core#1046 - allow for the real "name" to be specified in xml
eileen [Mon, 2 Sep 2019 07:00:08 +0000 (19:00 +1200)]
[Import][ref] Minor code improvement - move setDefaults to processor
Seamus Lee [Mon, 2 Sep 2019 06:38:44 +0000 (16:38 +1000)]
Merge pull request #15183 from eileenmcnaughton/import_names
[REF] Import - minor cleanup - generate js on the processor class
Seamus Lee [Mon, 2 Sep 2019 04:21:18 +0000 (14:21 +1000)]
Update XML files for membership fields to support date picker conversion
Seamus Lee [Mon, 2 Sep 2019 03:44:31 +0000 (13:44 +1000)]
Merge pull request #15170 from seamuslee001/pledge_date_picker_conversion
Convert pledge date fields to use datepicker rather than jcalendar
eileen [Sun, 1 Sep 2019 22:10:54 +0000 (10:10 +1200)]
[REF] Import - generate js on the processor class
This moves the js calculation to the processor class for some of the function and simplifies it
so that the concatenation is done at the end.
Test cover is very solid on this
Seamus Lee [Sun, 1 Sep 2019 01:57:28 +0000 (11:57 +1000)]
Ensure that relative dates are handled in the newer way
Seamus Lee [Fri, 30 Aug 2019 22:49:45 +0000 (08:49 +1000)]
Convert pledge date fields to use datepicker rather than jcalendar
Add support for url variables
Standardise search form as per contribute form
Add in pledge payment xml change
DemeritCowboy [Sun, 1 Sep 2019 16:57:53 +0000 (12:57 -0400)]
dev/core#1046
colemanw [Sun, 1 Sep 2019 15:25:52 +0000 (11:25 -0400)]
Merge pull request #15180 from seamuslee001/pledge_xml_changes
Update Pledge XML to support date picker conversion
colemanw [Sun, 1 Sep 2019 15:25:19 +0000 (11:25 -0400)]
Merge pull request #15179 from eileenmcnaughton/import_names
Extend loadSavedMapping to check defaults
Seamus Lee [Sun, 1 Sep 2019 02:20:23 +0000 (12:20 +1000)]
[NFC] Update Pledge XML to support date picker conversion
Update unit tests to match new schema
eileen [Sun, 1 Sep 2019 00:05:53 +0000 (12:05 +1200)]
Extend loadSavedMapping to check defaults
By using the metadata already available on the function we don't need to use a class param
and can simplify and test
Seamus Lee [Sat, 31 Aug 2019 22:03:46 +0000 (08:03 +1000)]
Merge pull request #15176 from civicrm/5.17
5.17
Seamus Lee [Sat, 31 Aug 2019 20:24:26 +0000 (06:24 +1000)]
Merge pull request #15169 from pradpnayak/relDateFixes
1226, fixed Change log relative date search for creating smart group
colemanw [Sat, 31 Aug 2019 18:37:52 +0000 (14:37 -0400)]
Merge pull request #15175 from eileenmcnaughton/mini
Someimes ya just gotta say enough already
Pradeep Nayak [Fri, 30 Aug 2019 20:31:01 +0000 (21:31 +0100)]
1226, fixed Change log relative date search for creating smart group
eileen [Sat, 31 Aug 2019 10:09:34 +0000 (22:09 +1200)]
Someimes ya just gotta say enough already
Seamus Lee [Sat, 31 Aug 2019 07:06:18 +0000 (17:06 +1000)]
Merge pull request #15173 from eileenmcnaughton/mini
[REF] Very minor code cleanup on import code with good test cover
Eileen McNaughton [Sat, 31 Aug 2019 04:50:50 +0000 (16:50 +1200)]
Merge pull request #15172 from colemanw/sendResponse
[NFC] Remove redundant annotation
eileen [Sat, 31 Aug 2019 04:41:16 +0000 (16:41 +1200)]
[REF] Very minor code cleanup on import.
The value is equal to the phone id if one exists or the processor id - this just
uses the processor function to grab it
Coleman Watts [Sat, 31 Aug 2019 01:34:39 +0000 (21:34 -0400)]
[NFC] Remove redundant annotation
colemanw [Sat, 31 Aug 2019 00:52:46 +0000 (20:52 -0400)]
Merge pull request #15130 from eileenmcnaughton/import_rel
[ref] [ import] Extend tests & simpler retrieval to relationship_type_id
Seamus Lee [Fri, 30 Aug 2019 23:47:20 +0000 (09:47 +1000)]
Merge pull request #15163 from colemanw/eventClone
[REF] Move clone template functionality from api to bao
Seamus Lee [Fri, 30 Aug 2019 22:03:32 +0000 (08:03 +1000)]
Merge pull request #15167 from mattwire/testRenewMembership_note
Add note about testRenewMembership failing on certain days
Eileen McNaughton [Fri, 30 Aug 2019 21:56:20 +0000 (09:56 +1200)]
Merge pull request #15119 from seamuslee001/fix_dashboard_domain_fk
Ensure that civicrm_dashboard has a foreign key to civicrm_domain
Seamus Lee [Fri, 30 Aug 2019 21:43:38 +0000 (07:43 +1000)]
Merge pull request #15099 from christianwach/lab-1200
Ensure Dashboard respects multiple Domains
colemanw [Fri, 30 Aug 2019 17:30:31 +0000 (13:30 -0400)]
Merge pull request #15155 from eileenmcnaughton/merge_perm
Use merge duplicate contacts as api permission for merging
colemanw [Fri, 30 Aug 2019 17:29:44 +0000 (13:29 -0400)]
Merge pull request #15157 from eileenmcnaughton/dedupe6
Adjust permissions on dedupe exception api to 'merge duplicate contacts'
Matthew Wire (MJW Consulting) [Fri, 30 Aug 2019 15:55:53 +0000 (16:55 +0100)]
Add note about testRenewMembership failing on certain days
Florian Kohrt [Thu, 29 Aug 2019 21:54:45 +0000 (23:54 +0200)]
SMTP help text and URL are misleading to Organization Address and Contact Info instead of leading to From Email Addresses; see also #14055 and #14329
eileen [Thu, 29 Aug 2019 04:15:53 +0000 (16:15 +1200)]
Fix inconsistencies in duplicate retrieval
Alternative to
https://github.com/civicrm/civicrm-core/pull/15158
and
https://github.com/civicrm/civicrm-core/pull/15153
fixing both the inconsistency & performance & making code more legible
Eileen McNaughton [Thu, 29 Aug 2019 21:04:07 +0000 (09:04 +1200)]
Merge pull request #15164 from mlutfy/ppIpnTranslation
Fix PayPalImpl Contribution Status PseudoConstant for non-English
Mathieu Lutfy [Thu, 29 Aug 2019 18:12:55 +0000 (14:12 -0400)]
Fix PayPalImpl Contribution Status PseudoConstant for non-English (use name, not label)
Mathieu Lu [Thu, 29 Aug 2019 18:10:17 +0000 (14:10 -0400)]
Merge pull request #15161 from vakeesan26/dev/core#1218
dev/core#1218 Fix Word Replacements on manage case Roles
Coleman Watts [Thu, 29 Aug 2019 16:11:07 +0000 (12:11 -0400)]
[REF] Move clone template functionality from api to bao
Vakeesan [Thu, 29 Aug 2019 11:34:24 +0000 (12:34 +0100)]
fix for dev/core#1218
Eileen McNaughton [Thu, 29 Aug 2019 04:34:03 +0000 (16:34 +1200)]
Merge pull request #15114 from eileenmcnaughton/weird2
Make sure inherited memberships are not themselves inherited
eileen [Thu, 29 Aug 2019 01:49:32 +0000 (13:49 +1200)]
Use merge duplicate contacts as api permission for merging
eileen [Thu, 29 Aug 2019 02:08:25 +0000 (14:08 +1200)]
Adjust permissions on dedupe exception api to 'merge duplicate contacts'
eileen [Thu, 29 Aug 2019 02:00:23 +0000 (14:00 +1200)]
Remove some calls to CRM_Core_Error::fatal for exceptions
Seamus Lee [Thu, 29 Aug 2019 00:53:11 +0000 (10:53 +1000)]
Merge pull request #15152 from eileenmcnaughton/dedupe
Open up permissions on Dedupe.getduplicates
eileen [Wed, 28 Aug 2019 22:59:18 +0000 (10:59 +1200)]
Open up permissions on Dedupe.getduplicates
Currently the action Dedupe.getduplicates is defaulting to 'administer CiviCRM'.
The function manages permissions internally (ie. you can't retrieve contacts you don't have permission to see)
so the function itself can have fairly open permissions - hence I went for 'access CiviCRM' rather than
'merge duplicate contacts' - it might even be argued this should be open & rely solely on contact ACLs but
I have not gone that far
This function is part of moving towards api based rather than form based logic. It is not in use in core yet
outside tests.
Tim Otten [Wed, 28 Aug 2019 21:36:06 +0000 (14:36 -0700)]
Merge pull request #15145 from colemanw/js
Better error handling in CRM_Utils_JS::decode
colemanw [Wed, 28 Aug 2019 12:14:33 +0000 (08:14 -0400)]
Merge pull request #15150 from demeritcowboy/teststatusbycasetype
[Test] Bring to life dormant test
Monish Deb [Wed, 28 Aug 2019 11:38:45 +0000 (17:08 +0530)]
Merge pull request #14892 from eileenmcnaughton/lines
dev/financial#40 add missing financial item when altering a radio amount
Monish Deb [Wed, 28 Aug 2019 11:38:35 +0000 (17:08 +0530)]
Merge pull request #14408 from eileenmcnaughton/payment
Switch recordAdditionalPayment fully over to api