civicrm-core.git
5 years agoUse shared function to add mapping form now dependencies are gone
eileen [Fri, 6 Sep 2019 00:18:56 +0000 (12:18 +1200)]
Use shared function to add mapping form now dependencies are gone

5 years agoDecommission loadSavedMapping now it is all cleaned up
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

5 years agoMove calculation for do_not_import js to processor
eileen [Fri, 6 Sep 2019 00:02:24 +0000 (12:02 +1200)]
Move calculation for do_not_import js to processor

5 years agoMove calc for do-not-import default to processor
eileen [Thu, 5 Sep 2019 23:42:21 +0000 (11:42 +1200)]
Move calc for do-not-import default to processor

5 years agoMerge pull request #15224 from eileenmcnaughton/headers
colemanw [Fri, 6 Sep 2019 01:38:09 +0000 (21:38 -0400)]
Merge pull request #15224 from eileenmcnaughton/headers

Use metadata for dataPatterns

5 years agoMerge pull request #15154 from eileenmcnaughton/dedupe3
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

5 years agoUse metadata for dataPatterns
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

5 years agoMerge pull request #15137 from andrewpthompson/joomla4-header-css
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

5 years agoMerge pull request #15220 from eileenmcnaughton/headers
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'

5 years agoMerge pull request #15147 from demeritcowboy/activityTName2
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

5 years agoCleanup get handling to 'guess the column.
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.

5 years agoAdd test for getting columns from header
eileen [Thu, 5 Sep 2019 03:21:42 +0000 (15:21 +1200)]
Add test for getting columns from header

5 years agoMerge pull request #15117 from eileenmcnaughton/member_renew
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

5 years agoMerge pull request #15219 from eileenmcnaughton/import_next
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

5 years agoMerge pull request #15187 from eileenmcnaughton/dedupe11
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

5 years agoMerge pull request #15188 from eileenmcnaughton/dedupe12
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'

5 years agoMerge pull request #15222 from 19ATF77/Constituent_Summary_Fix
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

5 years agoMerge pull request #15115 from eileenmcnaughton/import_metadata
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

5 years agoFixes inconsitency between constituency summary and constituency detail
19ATF77 [Thu, 5 Sep 2019 16:39:02 +0000 (17:39 +0100)]
Fixes inconsitency between constituency summary and constituency detail

5 years agoMerge pull request #15190 from eileenmcnaughton/import_bug
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

5 years agoMerge pull request #15159 from andrewpthompson/master
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

5 years agoMerge pull request #15102 from mlutfy/fixPriceSetLabelHtml
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

5 years agoMerge pull request #15217 from seamuslee001/group_nesting_group_org_test
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

5 years agoremove if that no longer makes sense
eileen [Thu, 5 Sep 2019 02:36:00 +0000 (14:36 +1200)]
remove if that no longer makes sense

5 years agoRemove jsSet & just construct the if better.
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

5 years agoMerge pull request #15118 from eileenmcnaughton/export
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'

5 years agoMerge pull request #15218 from eileenmcnaughton/import_again
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.

5 years agoMove 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....

5 years agoMerge pull request #15216 from demeritcowboy/attachment-url-2
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

5 years agoMerge pull request #15181 from seamuslee001/mailing_search_date_picker_conversion
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…

5 years agofix typo in second test and update to match first url workaround
DemeritCowboy [Wed, 4 Sep 2019 22:25:45 +0000 (18:25 -0400)]
fix typo in second test and update to match first url workaround

5 years agoMerge pull request #15053 from eileenmcnaughton/paypal
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.

5 years agoEnable apiv4 testing for GroupNesting and GroupOrganization entities
Seamus Lee [Wed, 4 Sep 2019 23:33:18 +0000 (09:33 +1000)]
Enable apiv4 testing for GroupNesting and GroupOrganization entities

5 years agoMerge pull request #15215 from eileenmcnaughton/import_next
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

5 years agodev/membership#13 Add handling for missing MembershipPayment record.
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

5 years ago[Datepicker][REF] Convert mailing date field on mailing search screen to date picker
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

5 years agoRemove a bunch of now-unused variables, will improve performance too as one involved...
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

5 years agoEnsure subtype is set on processor
eileen [Wed, 4 Sep 2019 22:07:15 +0000 (10:07 +1200)]
Ensure subtype is set on processor

5 years agoMove default fetching to Processor class
eileen [Wed, 4 Sep 2019 22:04:42 +0000 (10:04 +1200)]
Move default fetching to Processor class

5 years agoImprove tests on loading relationship data
eileen [Wed, 4 Sep 2019 21:58:59 +0000 (09:58 +1200)]
Improve tests on loading relationship data

5 years agoMerge pull request #14621 from pradpnayak/CleanUps
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

5 years agoMerge pull request #15212 from mmyriam/mmyriam-case-tag-search-patch-1
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

5 years agoMerge pull request #15214 from civicrm/5.17
Eileen McNaughton [Wed, 4 Sep 2019 21:19:58 +0000 (09:19 +1200)]
Merge pull request #15214 from civicrm/5.17

5.17

5 years agoMerge pull request #15213 from agh1/5.17.0-releasenotes-final
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

5 years agoMerge pull request #15189 from eileenmcnaughton/import_tiny
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

5 years agoMerge pull request #15211 from caltha-eu/patch.ts-deceased
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

5 years agoFix search for case tags that are part of tag sets
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

5 years ago5.17.0 release notes: late changes and tidy-up
Andrew Hunt [Wed, 4 Sep 2019 14:50:41 +0000 (10:50 -0400)]
5.17.0 release notes: late changes and tidy-up

5 years ago(patch.ts-deceased) Add ts() to deceased
scardinius [Wed, 4 Sep 2019 12:15:08 +0000 (14:15 +0200)]
(patch.ts-deceased) Add ts() to deceased

5 years agoMerge pull request #15209 from yashodha/dev1065
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

5 years ago(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

5 years agoMerge pull request #15208 from civicrm/5.17
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

5 years agoMerge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes
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

5 years agoMerge pull request #15203 from eileenmcnaughton/index_contact
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

5 years agoMerge pull request #15165 from fkohrt/master
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

5 years agoUpdate 5.16.4.md
Tim Otten [Tue, 3 Sep 2019 06:35:02 +0000 (23:35 -0700)]
Update 5.16.4.md

5 years agorelease-notes - Add 5.16.4
Tim Otten [Tue, 3 Sep 2019 06:31:19 +0000 (23:31 -0700)]
release-notes - Add 5.16.4

5 years agoMerge pull request #15193 from pradpnayak/ChangeACLCacheCLass
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

5 years agoAdd index to civicrm_contact.created_date & modified_date
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)

5 years agoMerge pull request #15205 from colemanw/importableCommunicationStyle
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

5 years agoMerge pull request #15156 from eileenmcnaughton/dedupe5
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

5 years agoSet contact communication_style_id as importable
Coleman Watts [Tue, 3 Sep 2019 17:33:47 +0000 (13:33 -0400)]
Set contact communication_style_id as importable

5 years agoMerge pull request #15204 from pradpnayak/CacheTitle
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

5 years agoMerge pull request #15196 from eileenmcnaughton/dedupe_api
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.

5 years agoAdded field title for Cache table
Pradeep Nayak [Tue, 3 Sep 2019 09:08:55 +0000 (10:08 +0100)]
Added field title for Cache table

5 years agoMerge pull request #15198 from seamuslee001/member_report_upgrade_step
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…

5 years agoMerge pull request #15200 from eileenmcnaughton/date_field
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

5 years agoRe-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

5 years agoMerge pull request #15199 from civicrm/5.17
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

5 years agoMerge pull request #15197 from eileenmcnaughton/5.17
Eileen McNaughton [Tue, 3 Sep 2019 05:24:51 +0000 (17:24 +1200)]
Merge pull request #15197 from eileenmcnaughton/5.17

[NFC] comment fixes

5 years agoMerge pull request #15194 from eileenmcnaughton/517_dates
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

5 years agoEnsure all report templates switch the filter field_name from join_date to be members...
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

5 years ago[NFC] comment fixes
eileen [Tue, 3 Sep 2019 01:47:36 +0000 (13:47 +1200)]
[NFC] comment fixes

5 years agoMerge pull request #15177 from seamuslee001/member_fields_datepicker_conversion
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…

5 years agoFix failure to save relative dates on legacy fields
eileen [Mon, 2 Sep 2019 22:50:37 +0000 (10:50 +1200)]
Fix failure to save relative dates on legacy fields

5 years agoAlter smartGroup conversion array to match 5.15 standard of groups and add in unit...
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

5 years agoFix join_date in batch forms and in report filters
Seamus Lee [Mon, 2 Sep 2019 22:22:33 +0000 (08:22 +1000)]
Fix join_date in batch forms and in report filters

5 years ago[Date picker][REF] Convert jcalendar date fields to date picker on member search...
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

5 years agoAdd new api option to getduplicates, permitting a new search to be forced.
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.

5 years agoMerge pull request #15185 from eileenmcnaughton/dedupe10
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

5 years agoMerge pull request #15160 from eileenmcnaughton/dedupe8
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

5 years agoMerge pull request #15191 from eileenmcnaughton/pledge_high_low
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

5 years agoIncorporate searchLimit in dedupe cacheKey
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.

5 years agoMerge pull request #15192 from demeritcowboy/locate-name-or-label-2
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

5 years agoChanged ClassName for ACL clacc
Pradeep Nayak [Mon, 2 Sep 2019 20:08:43 +0000 (21:08 +0100)]
Changed ClassName for ACL clacc

5 years agosimplify logic
DemeritCowboy [Mon, 2 Sep 2019 14:51:01 +0000 (10:51 -0400)]
simplify logic

5 years agoUse metadata for pledgeDateRange fields
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

5 years agoDedupe permissions - allow safe mode merging based on 'merge duplicate contacts'
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

5 years agodev/core#1187 Fix bug where import will not do 2 phone types of the same location
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

5 years agoMerge pull request #15186 from seamuslee001/member_fields_xml_change
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

5 years agoMerge pull request #15182 from demeritcowboy/locate-name-or-label
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

5 years ago[Import][ref] Minor code improvement - move setDefaults to processor
eileen [Mon, 2 Sep 2019 07:00:08 +0000 (19:00 +1200)]
[Import][ref] Minor code improvement -  move setDefaults to processor

5 years agoMerge pull request #15183 from eileenmcnaughton/import_names
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

5 years agoUpdate XML files for membership fields to support date picker conversion
Seamus Lee [Mon, 2 Sep 2019 04:21:18 +0000 (14:21 +1000)]
Update XML files for membership fields to support date picker conversion

5 years agoLoosen permissions to Dedupe.getstatistics api
eileen [Mon, 2 Sep 2019 05:30:20 +0000 (17:30 +1200)]
Loosen permissions to Dedupe.getstatistics api

This api should have the same level of permission as Dedupe.getduplicates - it gets data about
cached duplicates. Note that getduplicates has 'access CiviCRM' & relys on ACLs to  restrict
which contacts can be accessed through it

5 years agoMerge pull request #15170 from seamuslee001/pledge_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

5 years ago[REF] Import - generate js on the processor class
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

5 years agoEnsure that relative dates are handled in the newer way
Seamus Lee [Sun, 1 Sep 2019 01:57:28 +0000 (11:57 +1000)]
Ensure that relative dates are handled in the newer way

5 years agoConvert pledge date fields to use datepicker rather than jcalendar
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

5 years agodev/core#1046
DemeritCowboy [Sun, 1 Sep 2019 16:57:53 +0000 (12:57 -0400)]
dev/core#1046