Coleman Watts [Sun, 31 Mar 2019 13:29:28 +0000 (09:29 -0400)]
[NFC] Cleanup DAO factory classes for code standards
Eileen McNaughton [Fri, 29 Mar 2019 22:14:34 +0000 (11:14 +1300)]
Merge pull request #13917 from seamuslee001/photo_fatal_to_execption
Covert the CRM_Core_Error::fatal calls to exceptions when trying to a…
Seamus Lee [Fri, 29 Mar 2019 20:48:06 +0000 (07:48 +1100)]
Covert the CRM_Core_Error::fatal calls to exceptions when trying to access Contact Photos
Matthew Wire [Fri, 29 Mar 2019 20:22:53 +0000 (20:22 +0000)]
Merge pull request #13852 from pradpnayak/RecurringMemIssue
dev/core/issues/806, Fixed DB error already exist when recording recurring payment having tax
colemanw [Fri, 29 Mar 2019 18:35:47 +0000 (14:35 -0400)]
Merge pull request #13895 from eileenmcnaughton/format
Fix mis-formatting of Email greeting id, Address greeting id etc
Seamus Lee [Fri, 29 Mar 2019 09:29:25 +0000 (20:29 +1100)]
Merge pull request #13910 from seamuslee001/note_no_contact_id
Do not cause a fatal error if no contact_id field for a note is fille…
Seamus Lee [Fri, 29 Mar 2019 09:19:36 +0000 (20:19 +1100)]
Merge pull request #13912 from colemanw/shortAng
NFC - Short array syntax - auto-convert ang dir
Eileen McNaughton [Fri, 29 Mar 2019 07:37:39 +0000 (20:37 +1300)]
Merge pull request #13911 from colemanw/shortCivi
NFC - Short array syntax - auto-convert Civi dir
Coleman Watts [Fri, 29 Mar 2019 01:14:10 +0000 (21:14 -0400)]
NFC - Short array syntax - auto-convert ang dir
Coleman Watts [Fri, 29 Mar 2019 01:10:29 +0000 (21:10 -0400)]
NFC - Short array syntax - auto-convert Civi dir
Seamus Lee [Fri, 29 Mar 2019 01:04:55 +0000 (12:04 +1100)]
Merge pull request #13909 from colemanw/apiShortSyntax
[NFC] Short array syntax - auto-convert api dir
Coleman Watts [Thu, 28 Mar 2019 23:47:17 +0000 (19:47 -0400)]
Short array syntax - auto-convert api dir
Seamus Lee [Thu, 28 Mar 2019 23:43:23 +0000 (10:43 +1100)]
Do not cause a fatal error if no contact_id field for a note is filled in when viewing contact notes
Eileen McNaughton [Thu, 28 Mar 2019 23:03:22 +0000 (12:03 +1300)]
Merge pull request #13908 from eileenmcnaughton/report_filter
Add unit test for https://github.com/civicrm/civicrm-core/pull/13158
Eileen McNaughton [Thu, 28 Mar 2019 22:49:30 +0000 (11:49 +1300)]
Merge pull request #13698 from mattwire/contributionrecur_payprocid_pseudoconstant
Add pseudoconstant support for payment_processor_id on ContributionRecur
Eileen McNaughton [Thu, 28 Mar 2019 22:41:55 +0000 (11:41 +1300)]
Merge pull request #13840 from seamuslee001/htmlpurifier_composer
Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer
Eileen McNaughton [Thu, 28 Mar 2019 22:07:59 +0000 (11:07 +1300)]
Merge pull request #12457 from omarabuhussein/dev/core#253
dev/core#253: Cancelling or An Error during event registration payment should cancel all additional participates
eileen [Thu, 28 Mar 2019 21:39:26 +0000 (10:39 +1300)]
Add unit test for https://github.com/civicrm/civicrm-core/pull/13158
Eileen McNaughton [Thu, 28 Mar 2019 21:38:17 +0000 (10:38 +1300)]
Merge pull request #13158 from elisseck/dev/core/544
dev/core/544 Add report support for filter on multiple contact subtypes
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 14:41:26 +0000 (14:41 +0000)]
Add pseudoconstant support for payment_processor_id on CRM_Contribute_BAO_ContributionRecur
Eileen McNaughton [Thu, 28 Mar 2019 20:24:27 +0000 (09:24 +1300)]
Merge pull request #13873 from eileenmcnaughton/mutliple_activity_types
Mutliple activity type filters on activity tab on contact records
Eileen McNaughton [Thu, 28 Mar 2019 20:22:00 +0000 (09:22 +1300)]
Merge pull request #13819 from mfb/temp-table
Use TempTable methods
Eileen McNaughton [Thu, 28 Mar 2019 20:03:34 +0000 (09:03 +1300)]
Merge pull request #13900 from greenpeace-cee/fix-get-custom-field
dev/core#755 - CRM/Core - Fix missing group name in custom field cache
lordt [Thu, 28 Mar 2019 19:49:11 +0000 (20:49 +0100)]
#829 Swaziland has changed its name to Eswatini (#13902)
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
eileen [Thu, 21 Mar 2019 01:22:03 +0000 (14:22 +1300)]
Support a multiple select for activity types to include & exclude
colemanw [Thu, 28 Mar 2019 13:48:57 +0000 (09:48 -0400)]
Merge pull request #13855 from eileenmcnaughton/activity_date_picker
Convert activity tab to use datepicker
Eileen McNaughton [Thu, 28 Mar 2019 04:53:25 +0000 (17:53 +1300)]
Merge pull request #13596 from jackrabbithanna/726-address-api-states
CiviCRM API, lookup state_province_id options based on country parame…
Eileen McNaughton [Thu, 28 Mar 2019 00:54:44 +0000 (13:54 +1300)]
Merge pull request #13904 from eileenmcnaughton/test
Add Unit test for export with incomplete data
Coleman Watts [Wed, 27 Mar 2019 23:48:00 +0000 (19:48 -0400)]
Fix api validate of states and improve test
Seamus Lee [Wed, 27 Mar 2019 22:25:31 +0000 (09:25 +1100)]
Update test to alter to changed output based on new htmlpurifier
Seamus Lee [Sun, 17 Mar 2019 19:53:05 +0000 (06:53 +1100)]
Update Config and class loader paths
Seamus Lee [Fri, 15 Mar 2019 23:28:16 +0000 (10:28 +1100)]
Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer
Patrick Figel [Wed, 27 Mar 2019 20:46:50 +0000 (21:46 +0100)]
dev/core#755 - CRM/Core - Fix missing group name in custom field cache
CRM_Core_BAO_CustomField::getCustomFieldID caches custom fields based
on the field name, meaning if a custom field of the same name exists
in more than one group, the method will always return the first field
that was cached. This change adds the $groupName parameter to the
cache key.
This also adds a missing test for the $fullString parameter and
renames the $groupTitle parameter to $groupName in preparation
for future changes.
Eileen McNaughton [Wed, 27 Mar 2019 20:13:09 +0000 (09:13 +1300)]
Merge pull request #13905 from civicrm/5.12
5.12 to master
Eileen McNaughton [Wed, 27 Mar 2019 20:12:44 +0000 (09:12 +1300)]
Merge pull request #13903 from agh1/userdashcontrib-5-12
Intra-RC regression: User dashboard: show most recent contributions, not earliest
eileen [Wed, 27 Mar 2019 20:03:57 +0000 (09:03 +1300)]
Add Unit test for export with incomplete data
Eileen McNaughton [Wed, 27 Mar 2019 20:07:09 +0000 (09:07 +1300)]
Merge pull request #13889 from pradpnayak/ExportBug
dev/core/issues/819, Fixed fatal error on export screen
Andrew Hunt [Wed, 27 Mar 2019 17:31:37 +0000 (13:31 -0400)]
User dash: adjust test to make sure contributions are chronological
Eileen McNaughton [Wed, 27 Mar 2019 17:28:32 +0000 (06:28 +1300)]
Merge pull request #13864 from eileenmcnaughton/rule_group
Expose sort_name as a dedupe-matchable field
Andrew Hunt [Wed, 27 Mar 2019 15:43:34 +0000 (11:43 -0400)]
User dash: show most recent contributions, not earliest
colemanw [Wed, 27 Mar 2019 16:39:29 +0000 (12:39 -0400)]
Merge pull request #13896 from eileenmcnaughton/ar
[NFC] IDE formatting only
colemanw [Wed, 27 Mar 2019 14:13:00 +0000 (10:13 -0400)]
Merge pull request #13898 from eileenmcnaughton/merge_summary_2
dev/core#824 Render contact type icons in std way on merge screen
Eileen McNaughton [Wed, 27 Mar 2019 05:34:04 +0000 (18:34 +1300)]
Merge pull request #13883 from agh1/grantdetailgroupby
PHP Error on Grant Detail Report
Eileen McNaughton [Wed, 27 Mar 2019 05:25:40 +0000 (18:25 +1300)]
Merge pull request #13892 from aydun/pdf_refactor
Refactor CRM_Contact_Form_Task_PDFLetterCommon
eileen [Wed, 27 Mar 2019 04:43:15 +0000 (17:43 +1300)]
Render contact type icons in std way on merge screen
The merge screen currently shows contact types as a row but that is meaningless as we don't currently
permit them to be changed when merging. Rendering as an icon is more consistent with elsewhere
and potentially the hover makes it easy to see salient information about the contact.
eileen [Wed, 27 Mar 2019 03:56:02 +0000 (16:56 +1300)]
Rationalise summary part of the merge screen.
This does 3 things
1) reduces contact get queries from 3 to 1 since the 2 in the tpl layer are removed
2) adds created date to the merge summary information
3) makes it easier for extensions to replace/ extend this data (although core makes no
commitment to the tpl remaining unchanged so extension writers need to carry that risk)
Eileen McNaughton [Wed, 27 Mar 2019 02:23:04 +0000 (15:23 +1300)]
Merge pull request #13894 from civicrm/5.12
5.12
eileen [Wed, 27 Mar 2019 02:20:35 +0000 (15:20 +1300)]
Array formatting
eileen [Wed, 27 Mar 2019 02:07:02 +0000 (15:07 +1300)]
Fix mis-formatting of Email greeting id, Address greeting id etc
The formatting was inappropriately relying on the field's title in the IF clause. I added the location_entity to
the row so it would no longer have to guess
Seamus Lee [Wed, 27 Mar 2019 00:42:19 +0000 (11:42 +1100)]
Merge pull request #13893 from colemanw/dev/core#821
[Regression] dev/core#821 - Fix entityRef filter value selection
Coleman Watts [Tue, 26 Mar 2019 14:16:11 +0000 (10:16 -0400)]
dev/core#821 - Fix entityRef filter value selection
Aidan Saunders [Tue, 26 Mar 2019 09:29:03 +0000 (09:29 +0000)]
Move some of the content from CRM_Contact_Form_Task_PDFLetterCommon
into a new base class CRM_Core_Form_Task_PDFLetterCommon
Move handling of templates from processMessageTemplate() to processTemplate()
Mathieu Lu [Mon, 25 Mar 2019 22:05:37 +0000 (18:05 -0400)]
Merge pull request #13787 from eileenmcnaughton/label_button
Allow payment processor to determine the text around 'continue'
eileen [Wed, 20 Mar 2019 02:59:09 +0000 (15:59 +1300)]
Expose sort_name as a dedupe-matchable field
This opens up the option of us using a hook to do some standardisation - e.g getting rid of 'The'
in the sort name & it helping with both sorting and with deduping
colemanw [Mon, 25 Mar 2019 21:04:01 +0000 (17:04 -0400)]
Merge pull request #13863 from eileenmcnaughton/pre_test
Fix Contact.create calls to respect passed in variables & variables set via hook for sort_name & display_name
Eileen McNaughton [Mon, 25 Mar 2019 20:33:25 +0000 (09:33 +1300)]
Merge pull request #13857 from eileenmcnaughton/line_item_assignment
Minor code cleanups around invoicing assignment
Eileen McNaughton [Mon, 25 Mar 2019 19:49:44 +0000 (08:49 +1300)]
Merge pull request #13567 from pradpnayak/DateFilter
dev/core#709, fixed date filter for custom fields
Eileen McNaughton [Mon, 25 Mar 2019 19:33:59 +0000 (08:33 +1300)]
Merge pull request #13888 from pradpnayak/AdvMailin
Added unit test for dev/core/issues/726
Pradeep Nayak [Mon, 25 Mar 2019 13:47:29 +0000 (13:47 +0000)]
dev/core/issues/819, Fixed fatal error on export screen
Pradeep Nayak [Mon, 25 Mar 2019 12:28:42 +0000 (12:28 +0000)]
Added unit test for dev/core/issues/726
Pradeep Nayak [Mon, 25 Mar 2019 10:45:32 +0000 (10:45 +0000)]
dev/core/issues/709, fixed date filter for custom fields
Eileen McNaughton [Mon, 25 Mar 2019 09:40:46 +0000 (22:40 +1300)]
Merge pull request #13886 from eileenmcnaughton/clean_fn
Remove switch statement that no longer switches
Eileen McNaughton [Mon, 25 Mar 2019 09:31:36 +0000 (22:31 +1300)]
Merge pull request #13885 from eileenmcnaughton/pp
Use label not name for payment processor type
eileen [Mon, 25 Mar 2019 08:02:48 +0000 (21:02 +1300)]
Remove switch statement that no longer switches
Eileen McNaughton [Mon, 25 Mar 2019 07:17:14 +0000 (20:17 +1300)]
Merge pull request #13884 from eileenmcnaughton/search_lastish
dev/core#502 fix bug on sorting by address fields when viewing search results by profile
eileen [Mon, 25 Mar 2019 02:17:16 +0000 (15:17 +1300)]
Use label not name for payment processor type
eileen [Sun, 24 Mar 2019 23:00:17 +0000 (12:00 +1300)]
dev/core#502 fix bug on sorting by address fields when viewing search results by profile
Fixes a bug whereby a fatal error occurs if you attempt to export contacts after sorting by postal_code from
an search profile
Eileen McNaughton [Sun, 24 Mar 2019 20:33:08 +0000 (09:33 +1300)]
Merge pull request #13785 from demeritcowboy/devcore784
dev/core#784 - On civicase case type editing screen creating a new relationship type on the fly inserts a blank row
demeritcowboy [Tue, 19 Mar 2019 22:17:28 +0000 (18:17 -0400)]
remove unneeded var
DemeritCowboy [Thu, 7 Mar 2019 15:36:12 +0000 (10:36 -0500)]
dev/core#784
Eileen McNaughton [Sat, 23 Mar 2019 21:19:36 +0000 (10:19 +1300)]
Merge pull request #13640 from pradpnayak/notevalidation
dev/core/issues/740, Show form on validation error
Eileen McNaughton [Sat, 23 Mar 2019 20:51:11 +0000 (09:51 +1300)]
Merge pull request #13850 from eileenmcnaughton/bounce
dev/core#560 Update Cancel Billing & update billing to use status bounce rather than fatal
Eileen McNaughton [Sat, 23 Mar 2019 20:49:48 +0000 (09:49 +1300)]
Merge pull request #13068 from alifrumin/formLink
send action links on any page that extends CRM_Core_Page_basic thru hook_civicrm_links
Eileen McNaughton [Sat, 23 Mar 2019 20:43:35 +0000 (09:43 +1300)]
Merge pull request #12639 from aniesshsethh/issue_314
dev/core#314 Event self-service Transfer picks up the deleted contact ID basically transferring to the wrong contact
Andrew Hunt [Fri, 22 Mar 2019 17:26:38 +0000 (13:26 -0400)]
Grant detail report tidy up display
Andrew Hunt [Fri, 22 Mar 2019 17:12:27 +0000 (13:12 -0400)]
Grant detail report: drop redundant where() and select()
Andrew Hunt [Fri, 22 Mar 2019 17:09:56 +0000 (13:09 -0400)]
Grant detail report standardize from(), add phone, email and custom
Andrew Hunt [Fri, 22 Mar 2019 16:54:13 +0000 (12:54 -0400)]
Grant detail report use getColumns, allow order by
Andrew Hunt [Fri, 22 Mar 2019 16:53:04 +0000 (12:53 -0400)]
Grant detail groupBy() redundant, did ORDER BY, treated string as array
Eileen McNaughton [Fri, 22 Mar 2019 12:37:21 +0000 (01:37 +1300)]
Merge pull request #13882 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 12:37:00 +0000 (01:37 +1300)]
Merge pull request #13881 from jitendrapurohit/core-812-rc
dev/core#812 - Fix null display of contribution row on …
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.
colemanw [Fri, 22 Mar 2019 11:08:12 +0000 (07:08 -0400)]
Merge pull request #13798 from eileenmcnaughton/contribution_validate
Improve ContributionPage.validate api
Jitendra Purohit [Fri, 22 Mar 2019 09:54:47 +0000 (15:24 +0530)]
dev/core#812 - RC equivalent for null display of contribution row on contact summary page
Eileen McNaughton [Fri, 22 Mar 2019 09:29:30 +0000 (22:29 +1300)]
Merge pull request #13872 from seamuslee001/composer_2_0_compatability
Fix up composer for composer 2.0 compatibility
Eileen McNaughton [Fri, 22 Mar 2019 09:29:01 +0000 (22:29 +1300)]
Merge pull request #13880 from eileenmcnaughton/temp_repeat
Use TempTable methods.
Seamus Lee [Fri, 22 Mar 2019 08:12:01 +0000 (19:12 +1100)]
Merge pull request #13878 from eileenmcnaughton/test_fix
[nfc] Reset entire session object between tests
Eileen McNaughton [Fri, 22 Mar 2019 02:35:22 +0000 (15:35 +1300)]
Merge pull request #13877 from eileenmcnaughton/import_count
Fix php 7.2 count notice
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.
Eileen McNaughton [Fri, 22 Mar 2019 00:21:25 +0000 (13:21 +1300)]
Merge pull request #13879 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 00:18:26 +0000 (13:18 +1300)]
Merge pull request #13541 from compucorp/case-activity-assigmt-restriction
dev/core#641: Case Activity Assignment Restriction
Eileen McNaughton [Fri, 22 Mar 2019 00:18:11 +0000 (13:18 +1300)]
Merge pull request #13876 from colemanw/menuRestore
dev/core#814 Fix menu restore link
eileen [Fri, 22 Mar 2019 00:04:40 +0000 (13:04 +1300)]
Reset entire session object between tests>
#13553 has been struggling with bugs that seem to be leakage of the session object between
tests - this seems like a good place to flush it
eileen [Thu, 21 Mar 2019 23:54:20 +0000 (12:54 +1300)]
Fix php 7.2 count notice
Coleman Watts [Thu, 21 Mar 2019 16:32:56 +0000 (12:32 -0400)]
Fix menu restore link
eileen [Fri, 8 Mar 2019 00:35:06 +0000 (13:35 +1300)]
Allow payment processor to determine the text around 'continue'
This text traditionally depends on the outdated payment processor 'mode' concept. Since the 'right' text depends
on what the payment processor plans to do moving it out to the processor classes makes sense
We could also do the same with 'button'
Eileen McNaughton [Thu, 21 Mar 2019 23:00:18 +0000 (12:00 +1300)]
Merge pull request #13697 from greenpeace-cee/fix-event-search
CRM/Event - Fix participant note search parameter being ignored
Eileen McNaughton [Thu, 21 Mar 2019 19:08:20 +0000 (08:08 +1300)]
Merge pull request #13865 from eileenmcnaughton/dedupe_temp
Use tempTable class in creation of dedupe table.
Eileen McNaughton [Thu, 21 Mar 2019 18:58:25 +0000 (07:58 +1300)]
Merge pull request #13875 from colemanw/BAO_Participant
BAO_Participant - Use default status if not specified for create
colemanw [Thu, 21 Mar 2019 16:53:22 +0000 (12:53 -0400)]
Merge pull request #13874 from eileenmcnaughton/cleanup
Remove now-obsolete additionalFromClause parameter from prepareOrderBy