CiviCRM [Fri, 6 Sep 2019 06:38:10 +0000 (06:38 +0000)]
Set version to 5.19.alpha1
CiviCRM [Fri, 6 Sep 2019 06:29:35 +0000 (06:29 +0000)]
Set version to 5.18.beta1
Eileen McNaughton [Fri, 6 Sep 2019 04:38:45 +0000 (16:38 +1200)]
Merge pull request #15227 from eileenmcnaughton/dedupe
dev/core#1230 Permission nuancing, fix another place where merge duplicate contacts should be enough
Eileen McNaughton [Fri, 6 Sep 2019 03:41:09 +0000 (15:41 +1200)]
Merge pull request #15226 from eileenmcnaughton/headers3
[Ref] [Import] Final round in the cleanup Load Mapping form epic
Monish Deb [Fri, 6 Sep 2019 03:40:23 +0000 (09:10 +0530)]
Merge pull request #15143 from eileenmcnaughton/p4
Stop adding a refund payment from creating extraneous financial items
Eileen McNaughton [Fri, 6 Sep 2019 03:10:28 +0000 (15:10 +1200)]
Merge pull request #15171 from colemanw/daoCache
dev/core#1222 Clear static DAO cache when writing to DAO
eileen [Fri, 6 Sep 2019 02:09:42 +0000 (14:09 +1200)]
dev/core#1230 Permission nuancing, fix another place where merge duplicate contacts should be enough
It seems fine for Rule.create & delete to require administer CiviCRM but merge duplicate contacts should be enough for get
eileen [Fri, 6 Sep 2019 00:18:56 +0000 (12:18 +1200)]
Use shared function to add mapping form now dependencies are gone
eileen [Fri, 6 Sep 2019 00:13:57 +0000 (12:13 +1200)]
Decommission loadSavedMapping now it is all cleaned up
The final result is that the 134 lines here https://github.com/civicrm/civicrm-core/blob/5.16/CRM/Contact/Import/Form/MapField.php#L407-L543
are now just 2 lines & we don't need a separte function
Although this does now free us to replace the 30 lines above with a call to the shared function
eileen [Fri, 6 Sep 2019 00:02:24 +0000 (12:02 +1200)]
Move calculation for do_not_import js to processor
eileen [Thu, 5 Sep 2019 23:42:21 +0000 (11:42 +1200)]
Move calc for do-not-import default to processor
colemanw [Fri, 6 Sep 2019 01:38:09 +0000 (21:38 -0400)]
Merge pull request #15224 from eileenmcnaughton/headers
Use metadata for dataPatterns
Coleman Watts [Fri, 30 Aug 2019 23:45:28 +0000 (19:45 -0400)]
Clear static DAO cache when writing to DAO
Eileen McNaughton [Fri, 6 Sep 2019 00:59:09 +0000 (12:59 +1200)]
Merge pull request #15154 from eileenmcnaughton/dedupe3
dev/core#1230 [Dedupe] Do not geocode while merging, rely on existing values
eileen [Thu, 5 Sep 2019 23:36:53 +0000 (11:36 +1200)]
Use metadata for dataPatterns
This is a bit harder to add a test for than columnHeaders but the principle of the change is very much the
same so I'm thinking it can get a free ride on that test
Eileen McNaughton [Thu, 5 Sep 2019 22:52:47 +0000 (10:52 +1200)]
Merge pull request #15137 from andrewpthompson/joomla4-header-css
(dev/joomla#24) Stop CiviCRM's joomla.css from modifying Joomla 4 header background colour
Eileen McNaughton [Thu, 5 Sep 2019 22:40:34 +0000 (10:40 +1200)]
Merge pull request #15220 from eileenmcnaughton/headers
[Import] [REF] code cleanup & test on the code to 'guess the intended field from the column name'
Eileen McNaughton [Thu, 5 Sep 2019 22:37:02 +0000 (10:37 +1200)]
Merge pull request #15147 from demeritcowboy/activityTName2
dev/core#1123 - Changing the label for Inbound Email bypasses edit permission
eileen [Thu, 5 Sep 2019 03:34:59 +0000 (15:34 +1200)]
Cleanup get handling to 'guess the column.
This gets us away from using the form session to pass around metadata & makes it testable.
eileen [Thu, 5 Sep 2019 03:21:42 +0000 (15:21 +1200)]
Add test for getting columns from header
Seamus Lee [Thu, 5 Sep 2019 21:55:20 +0000 (07:55 +1000)]
Merge pull request #15117 from eileenmcnaughton/member_renew
[REF] extract send receipt in MembershipRenewal fn
Seamus Lee [Thu, 5 Sep 2019 21:53:40 +0000 (07:53 +1000)]
Merge pull request #15219 from eileenmcnaughton/import_next
[Ref] [Import] more code cleanup
Seamus Lee [Thu, 5 Sep 2019 21:52:10 +0000 (07:52 +1000)]
Merge pull request #15187 from eileenmcnaughton/dedupe11
dev/core#1230 Loosen permissions to Dedupe.getstatistics api
Seamus Lee [Thu, 5 Sep 2019 21:47:01 +0000 (07:47 +1000)]
Merge pull request #15188 from eileenmcnaughton/dedupe12
dev/core#1230 Dedupe permissions - allow safe mode merging based on 'merge duplicate contacts'
Eileen McNaughton [Thu, 5 Sep 2019 21:33:01 +0000 (09:33 +1200)]
Merge pull request #15222 from 19ATF77/Constituent_Summary_Fix
Fixes inconsitency between constituency summary and constituency detail
Eileen McNaughton [Thu, 5 Sep 2019 20:25:54 +0000 (08:25 +1200)]
Merge pull request #15115 from eileenmcnaughton/import_metadata
Fix fatal when saving import mapping with a relationship but 'Primary' location type
19ATF77 [Thu, 5 Sep 2019 16:39:02 +0000 (17:39 +0100)]
Fixes inconsitency between constituency summary and constituency detail
Matthew Wire [Thu, 5 Sep 2019 15:17:44 +0000 (16:17 +0100)]
Merge pull request #15190 from eileenmcnaughton/import_bug
dev/core#1187 Fix bug where import will not do 2 phone types of the same location
Eileen McNaughton [Thu, 5 Sep 2019 10:25:07 +0000 (22:25 +1200)]
Merge pull request #15159 from andrewpthompson/master
(dev/joomla#10) Remove Joomla-specific error display and use native CiviCRM
Eileen McNaughton [Thu, 5 Sep 2019 07:59:28 +0000 (19:59 +1200)]
Merge pull request #15102 from mlutfy/fixPriceSetLabelHtml
Fix an HTML error in Calculate.tpl
Eileen McNaughton [Thu, 5 Sep 2019 07:10:47 +0000 (19:10 +1200)]
Merge pull request #15217 from seamuslee001/group_nesting_group_org_test
[TEST] Enable apiv4 testing for GroupNesting and GroupOrganization entities
eileen [Thu, 5 Sep 2019 02:36:00 +0000 (14:36 +1200)]
remove if that no longer makes sense
eileen [Thu, 5 Sep 2019 02:35:22 +0000 (14:35 +1200)]
Remove jsSet & just construct the if better.
jsSet is always TRUE when if ([] != ts('- do not import -')) {
so we don't need it
Seamus Lee [Thu, 5 Sep 2019 03:18:51 +0000 (13:18 +1000)]
Merge pull request #15118 from eileenmcnaughton/export
Fix export header for 'Contact ID'
Seamus Lee [Thu, 5 Sep 2019 03:18:23 +0000 (13:18 +1000)]
Merge pull request #15218 from eileenmcnaughton/import_again
[REF] Move calculation of js for import fields WITH relationship keys to processor.
eileen [Thu, 5 Sep 2019 00:12:38 +0000 (12:12 +1200)]
Move calculation of js for import fields WITH relationship keys to processor.
As should be obvious we can collapse a lot more out with the next commit now....
Eileen McNaughton [Thu, 5 Sep 2019 01:39:35 +0000 (13:39 +1200)]
Merge pull request #15216 from demeritcowboy/attachment-url-2
dev/core#938 - remove duplicate lines
Eileen McNaughton [Thu, 5 Sep 2019 00:03:49 +0000 (12:03 +1200)]
Merge pull request #15181 from seamuslee001/mailing_search_date_picker_conversion
[Datepicker][REF] Convert mailing date field on mailing search screen…
DemeritCowboy [Wed, 4 Sep 2019 22:25:45 +0000 (18:25 -0400)]
fix typo in second test and update to match first url workaround
Eileen McNaughton [Thu, 5 Sep 2019 00:01:27 +0000 (12:01 +1200)]
Merge pull request #15053 from eileenmcnaughton/paypal
dev/membership#13 Add handling for missing MembershipPayment record.
Seamus Lee [Wed, 4 Sep 2019 23:33:18 +0000 (09:33 +1000)]
Enable apiv4 testing for GroupNesting and GroupOrganization entities
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 [Fri, 16 Aug 2019 23:00:32 +0000 (11:00 +1200)]
dev/membership#13 Add handling for missing MembershipPayment record.
We have an intermittent regression on extending memberships off paypal payments. This adds debug messages
and handling / tests for the scenario I suspect may be in play.
The 'decision' the code makes about how to create recurring transactions is all dependent on the 'template transaction'
- if that is not correct the follow on payments will not be.
This PR allows the membershipID input from paypal to be passed through and used. This will override any
intended changes - but that just restores previous behaviour and we do not have good handling for these
https://lab.civicrm.org/dev/membership/issues/13
Seamus Lee [Sun, 1 Sep 2019 01:27:48 +0000 (11:27 +1000)]
[Datepicker][REF] Convert mailing date field on mailing search screen to date picker
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
eileen [Tue, 27 Aug 2019 07:07:39 +0000 (19:07 +1200)]
Stop adding a refund payment from creating extraneous financial items
Per
https://github.com/civicrm/civicrm-core/pull/15143#issuecomment-
527245150
and https://github.com/civicrm/civicrm-core/pull/13114/files#diff-8967f6e57d6209aa277ded6512413608L326
it seems agreed the financial items should not be created on refund.
This removes them & updates the test
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 [Mon, 2 Sep 2019 06:35:19 +0000 (18:35 +1200)]
Dedupe permissions - allow safe mode merging based on 'merge duplicate contacts'
Ensure force merge permission for force merging (not at the api layer as api v4 won't use that
eileen [Mon, 2 Sep 2019 08:51:08 +0000 (20:51 +1200)]
dev/core#1187 Fix bug where import will not do 2 phone types of the same location
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