civicrm-core.git
5 years agoConvert deprecated OptionGroup::getLabel to PseudoConstant::getLabel for case
Matthew Wire (MJW Consulting) [Tue, 15 Jan 2019 11:18:30 +0000 (11:18 +0000)]
Convert deprecated OptionGroup::getLabel to PseudoConstant::getLabel for case

5 years agoMerge pull request #13491 from colemanw/campaign
colemanw [Fri, 25 Jan 2019 14:40:25 +0000 (09:40 -0500)]
Merge pull request #13491 from colemanw/campaign

Convert Campaign widgets to entityRef

5 years agoMerge pull request #13493 from colemanw/entityRefFilters
colemanw [Fri, 25 Jan 2019 14:26:07 +0000 (09:26 -0500)]
Merge pull request #13493 from colemanw/entityRefFilters

dev/core#677 EntityRef filters fixes

5 years agoMerge pull request #13503 from colemanw/numberWidget
Joe Murray [Thu, 24 Jan 2019 19:28:04 +0000 (14:28 -0500)]
Merge pull request #13503 from colemanw/numberWidget

Survey form - use number widget for number fields

5 years agoSurvey form - use number widget for number fields
Coleman Watts [Tue, 22 Jan 2019 14:46:41 +0000 (09:46 -0500)]
Survey form - use number widget for number fields

5 years agoMerge pull request #13421 from chamilwijesooriya/issue-650
colemanw [Thu, 24 Jan 2019 17:34:45 +0000 (12:34 -0500)]
Merge pull request #13421 from chamilwijesooriya/issue-650

dev/core#650 Use popups for links

5 years agoMerge pull request #13490 from colemanw/Fix
Joe Murray [Thu, 24 Jan 2019 17:03:30 +0000 (12:03 -0500)]
Merge pull request #13490 from colemanw/Fix

Fix broken date fields in survey response form

5 years agoMerge pull request #12647 from compucorp/fix-case-type-issues
colemanw [Thu, 24 Jan 2019 00:14:14 +0000 (19:14 -0500)]
Merge pull request #12647 from compucorp/fix-case-type-issues

Case type management fixes

5 years agoMerge pull request #13480 from pradpnayak/AdvanceSearch
Monish Deb [Wed, 23 Jan 2019 10:26:21 +0000 (15:56 +0530)]
Merge pull request #13480 from pradpnayak/AdvanceSearch

dev/core/issues/506, Fatal error on advance search when using cases from display results as

5 years agoMerge pull request #13495 from seamuslee001/lab_core_676
Tim Otten [Wed, 23 Jan 2019 00:46:02 +0000 (16:46 -0800)]
Merge pull request #13495 from seamuslee001/lab_core_676

dev/core#676 Disable GeoCoding Tests for PR jobs and re-enable Mailin…

5 years agodev/core#676 Disable GeoCoding Tests for PR jobs and re-enable Mailing Test jobs...
Seamus Lee [Tue, 22 Jan 2019 19:25:53 +0000 (06:25 +1100)]
dev/core#676 Disable GeoCoding Tests for PR jobs and re-enable Mailing Test jobs for PRs previously disabled now fixed

5 years agoMerge pull request #13492 from pradpnayak/typoErrors
Seamus Lee [Tue, 22 Jan 2019 19:16:27 +0000 (11:16 -0800)]
Merge pull request #13492 from pradpnayak/typoErrors

Removed '>' from comment

5 years agoMerge pull request #13461 from christianwach/lab-666
colemanw [Tue, 22 Jan 2019 18:33:24 +0000 (13:33 -0500)]
Merge pull request #13461 from christianwach/lab-666

Fix trailing ampersands when empty array passed as query param

5 years agoHide gender & deceased filters for non-individual entityRef
Coleman Watts [Tue, 22 Jan 2019 17:35:13 +0000 (12:35 -0500)]
Hide gender & deceased filters for non-individual entityRef

5 years agoFix entityRef contact type filter
Coleman Watts [Tue, 22 Jan 2019 17:02:25 +0000 (12:02 -0500)]
Fix entityRef contact type filter

5 years agoRemoved '>' from comment
Pradeep Nayak [Tue, 22 Jan 2019 17:08:48 +0000 (17:08 +0000)]
Removed '>' from comment

5 years agoConvert addCampaignToComponent widget to entityRef
Coleman Watts [Tue, 22 Jan 2019 14:39:43 +0000 (09:39 -0500)]
Convert addCampaignToComponent widget to entityRef

5 years agoCampaign entityRef improvements
Coleman Watts [Tue, 22 Jan 2019 14:39:39 +0000 (09:39 -0500)]
Campaign entityRef improvements

5 years agoUse entityRef for campaigns on Survey & Petition forms
Coleman Watts [Tue, 22 Jan 2019 01:13:09 +0000 (20:13 -0500)]
Use entityRef for campaigns on Survey & Petition forms

5 years agoAllow entityRef widget to create campaigns
Coleman Watts [Tue, 22 Jan 2019 01:12:30 +0000 (20:12 -0500)]
Allow entityRef widget to create campaigns

5 years agoFix broken date fields in survey response form
Coleman Watts [Mon, 21 Jan 2019 18:11:54 +0000 (13:11 -0500)]
Fix broken date fields in survey response form

5 years agoMerge pull request #13456 from mfb/geocode-country_id
colemanw [Mon, 21 Jan 2019 16:51:32 +0000 (11:51 -0500)]
Merge pull request #13456 from mfb/geocode-country_id

geocode job: Provide country_id to geocoders.

5 years agoMerge pull request #13482 from jgillmanjr/front_contribution_page
colemanw [Mon, 21 Jan 2019 16:49:48 +0000 (11:49 -0500)]
Merge pull request #13482 from jgillmanjr/front_contribution_page

Test-drive contribution pages to the front

5 years agoMerge pull request #13427 from chamilwijesooriya/issue-652
colemanw [Mon, 21 Jan 2019 16:41:32 +0000 (11:41 -0500)]
Merge pull request #13427 from chamilwijesooriya/issue-652

GitLab issue 652 Copying activity file custom data doesn't copy mime …

5 years agoMerge pull request #13486 from deb1990/core-670-fix-activity-tags
colemanw [Mon, 21 Jan 2019 14:25:01 +0000 (09:25 -0500)]
Merge pull request #13486 from deb1990/core-670-fix-activity-tags

(WIP) dev/core#670 - Fix Saving of Case Activity tags

5 years agodev/core#670 - Fix saving of tags in case activity
Debarshi Bhaumik [Fri, 18 Jan 2019 06:36:23 +0000 (12:06 +0530)]
dev/core#670 - Fix saving of tags in case activity

5 years agoMerge pull request #13437 from mattwire/ref_simplifybillingblock_template
colemanw [Sun, 20 Jan 2019 21:23:13 +0000 (16:23 -0500)]
Merge pull request #13437 from mattwire/ref_simplifybillingblock_template

Simplify billingblock in Contribution/Form/Main template

5 years agoMerge pull request #13473 from deb1990/C51-384-add-case-token-in-email
colemanw [Sun, 20 Jan 2019 21:19:06 +0000 (16:19 -0500)]
Merge pull request #13473 from deb1990/C51-384-add-case-token-in-email

C51-384: Added case tokens on Email Activity Modal

5 years agoMerge pull request #13457 from mattwire/contact_note
colemanw [Sun, 20 Jan 2019 21:13:35 +0000 (16:13 -0500)]
Merge pull request #13457 from mattwire/contact_note

REF Remove undefined variable when creating note

5 years agoMerge pull request #13481 from laryn/patch-1
colemanw [Thu, 17 Jan 2019 16:37:09 +0000 (11:37 -0500)]
Merge pull request #13481 from laryn/patch-1

Add main nav icon for CiviCRM (Backdrop)

5 years agoRemoved extra space
Jason Gillman Jr [Thu, 17 Jan 2019 15:59:24 +0000 (10:59 -0500)]
Removed extra space

5 years agoMerge pull request #13479 from pradpnayak/cruftCode
Monish Deb [Thu, 17 Jan 2019 14:18:30 +0000 (19:48 +0530)]
Merge pull request #13479 from pradpnayak/cruftCode

removed unwanted parameter from getLineItems()

5 years agoAdd main nav icon for CiviCRM
Laryn - CEDC.org [Thu, 17 Jan 2019 05:54:55 +0000 (23:54 -0600)]
Add main nav icon for CiviCRM

(since Backdrop core now has main nav icons)

5 years agoSpecify front end (where applicable) when getNotifyUrl is called
Jason Gillman Jr [Thu, 17 Jan 2019 05:51:41 +0000 (00:51 -0500)]
Specify front end (where applicable) when getNotifyUrl is called

5 years agoForce test contribution pages to front end
Jason Gillman Jr [Thu, 17 Jan 2019 05:23:22 +0000 (00:23 -0500)]
Force test contribution pages to front end

5 years agoMerge pull request #13452 from eileenmcnaughton/depre
Seamus Lee [Thu, 17 Jan 2019 01:13:12 +0000 (12:13 +1100)]
Merge pull request #13452 from eileenmcnaughton/depre

Deprecate unused function

5 years agodev/core/issues/506, Fatal error on advance search when using cases from display...
Pradeep Nayak [Thu, 17 Jan 2019 01:11:23 +0000 (01:11 +0000)]
dev/core/issues/506, Fatal error on advance search when using cases from display results as

5 years agoremoved unwanted parameter from getLineItems()
Pradeep Nayak [Thu, 17 Jan 2019 00:34:52 +0000 (00:34 +0000)]
removed unwanted parameter from getLineItems()

5 years agoMerge pull request #13317 from eileenmcnaughton/order_pseudo
Eileen McNaughton [Thu, 17 Jan 2019 00:15:41 +0000 (13:15 +1300)]
Merge pull request #13317 from eileenmcnaughton/order_pseudo

Fix order api to support a pseudoConstant for financial_type_id

5 years agoFix order api to support a pseudoConstant for financial_type_id
eileen [Wed, 19 Dec 2018 05:06:50 +0000 (18:06 +1300)]
Fix order api to support a pseudoConstant for financial_type_id

Adds functionality & test to support 'Event Fee' instead of '4' for Order.create financial_type_id.

This improves consistency with Contribution.create api and others

5 years agoMerge pull request #13474 from JMAConsulting/dev-financial-39
Eileen McNaughton [Wed, 16 Jan 2019 21:47:51 +0000 (10:47 +1300)]
Merge pull request #13474 from JMAConsulting/dev-financial-39

dev/financial#39: Drop checkMD5 support from Authorize.net

5 years agoMerge pull request #13475 from civicrm/5.10
Eileen McNaughton [Wed, 16 Jan 2019 21:46:55 +0000 (10:46 +1300)]
Merge pull request #13475 from civicrm/5.10

5.10 to master

5 years agoMerge pull request #13451 from eileenmcnaughton/everyone_510
Tim Otten [Wed, 16 Jan 2019 21:42:36 +0000 (13:42 -0800)]
Merge pull request #13451 from eileenmcnaughton/everyone_510

(dev/core#660) Address regression whereby Anonymous users can no longer register for an event if they have ACLs to see a contact

5 years agodev/financial#39: Drop checkMD5 support from Authorize.net
Monish Deb [Wed, 16 Jan 2019 13:35:04 +0000 (19:05 +0530)]
dev/financial#39: Drop checkMD5 support from Authorize.net

5 years agoMerge pull request #13324 from agileware/CIVICRM-947
Monish Deb [Wed, 16 Jan 2019 13:21:09 +0000 (18:51 +0530)]
Merge pull request #13324 from agileware/CIVICRM-947

Email sent from CiviCRM for a new Case and Activity does not evaluate the $activityTypeName or $manageCaseURL tokens

5 years agoMerge pull request #13471 from seamuslee001/nfc_note_tests
Monish Deb [Wed, 16 Jan 2019 13:20:14 +0000 (18:50 +0530)]
Merge pull request #13471 from seamuslee001/nfc_note_tests

(NFC) Add unit test of creating notes from the contact.create API

5 years agoC51-384: Added case tokens on Email Modal
Debarshi Bhaumik [Wed, 16 Jan 2019 09:22:50 +0000 (14:52 +0530)]
C51-384: Added case tokens on Email Modal

5 years ago(NFC) Add unit test of creating notes from the contact.create API
Seamus Lee [Wed, 16 Jan 2019 06:00:19 +0000 (17:00 +1100)]
(NFC) Add unit test of creating notes from the contact.create API

5 years agoMerge pull request #13439 from jgillmanjr/paypal-standard-ipn-tz-fix
Seamus Lee [Wed, 16 Jan 2019 05:17:40 +0000 (16:17 +1100)]
Merge pull request #13439 from jgillmanjr/paypal-standard-ipn-tz-fix

Convert Paypal Standard IPN payment_date to system's time zone

5 years agoMerge pull request #13442 from eileenmcnaughton/paymen_line
Monish Deb [Wed, 16 Jan 2019 04:29:38 +0000 (09:59 +0530)]
Merge pull request #13442 from eileenmcnaughton/paymen_line

Remove inappropriate exception handling.

5 years agoMerge pull request #13466 from colemanw/tsFix
Eileen McNaughton [Wed, 16 Jan 2019 01:48:18 +0000 (14:48 +1300)]
Merge pull request #13466 from colemanw/tsFix

Translate untranslated string

5 years agoMerge pull request #13458 from mattwire/unused_var_caseformcustomdata
Eileen McNaughton [Tue, 15 Jan 2019 23:21:40 +0000 (12:21 +1300)]
Merge pull request #13458 from mattwire/unused_var_caseformcustomdata

REF Remove duplicate call to session singleton

5 years agoMerge pull request #13453 from eileenmcnaughton/report_tpl
colemanw [Tue, 15 Jan 2019 22:46:06 +0000 (17:46 -0500)]
Merge pull request #13453 from eileenmcnaughton/report_tpl

Escape the header title & section title in reports to better support extensions

5 years agoMerge pull request #13465 from mlutfy/setLocale
colemanw [Tue, 15 Jan 2019 22:40:52 +0000 (17:40 -0500)]
Merge pull request #13465 from mlutfy/setLocale

setLocale: precaution for when setLocale is called on an unilingual site

5 years agoTranslate untranslated string
Coleman Watts [Tue, 15 Jan 2019 22:30:33 +0000 (17:30 -0500)]
Translate untranslated string

5 years agoActivity emails: Fix activityTypeName template var & fix priority_id label
Alok Patel [Fri, 12 Oct 2018 06:16:14 +0000 (11:46 +0530)]
Activity emails: Fix activityTypeName template var & fix priority_id label

5 years agoMerge pull request #13455 from eileenmcnaughton/payment_email_test
Seamus Lee [Tue, 15 Jan 2019 19:52:18 +0000 (06:52 +1100)]
Merge pull request #13455 from eileenmcnaughton/payment_email_test

Add unit test for emailing receipts from additional payment page

5 years agosetLocale: precaution for when setLocale is called on an unilingual site
Mathieu Lutfy [Tue, 15 Jan 2019 19:14:53 +0000 (14:14 -0500)]
setLocale: precaution for when setLocale is called on an unilingual site

5 years agoFix trailing ampersands when empty array passed as query param
Christian Wach [Tue, 15 Jan 2019 12:28:17 +0000 (12:28 +0000)]
Fix trailing ampersands when empty array passed as query param

5 years agoRemove undefined variable when creating note
Matthew Wire (MJW Consulting) [Tue, 15 Jan 2019 11:02:08 +0000 (11:02 +0000)]
Remove undefined variable when creating note

5 years agoRemove duplicate call to session singleton
Matthew Wire (MJW Consulting) [Tue, 15 Jan 2019 10:48:11 +0000 (10:48 +0000)]
Remove duplicate call to session singleton

5 years agoRemove foreign key on civicrm_acl_contact_id.user_id.
eileen [Tue, 15 Jan 2019 00:48:18 +0000 (13:48 +1300)]
Remove foreign key on civicrm_acl_contact_id.user_id.

This won't actually remove it from installs - we need to address that separately via ensuring people can and do run
the System.updateIndices api call but it removes it from new installs and from
tests, hence the test should pass

5 years agoFix mishandling / loss of check_permission flag
eileen [Mon, 14 Jan 2019 23:48:36 +0000 (12:48 +1300)]
Fix mishandling / loss of check_permission flag

5 years agoAdd test to demonstrate fatal error when accessing permitted users that are cached...
eileen [Mon, 14 Jan 2019 23:44:50 +0000 (12:44 +1300)]
Add test to demonstrate fatal error when accessing permitted users that are cached using the acl_cache.

This has arisen during investigation of a possible regression - it turns out that if you give the 'everyone' group
access to a contact using ACLs (or hooks I believe) they get a fatal error on any attempt at event or other registration.

The issue is that when attempting to check for duplicates the call is made using check_permission. This in itself is a possible
regression as the CRM_Dedupe_Finder::dupesByParams function now drops the check_permission key when it is equal to 0 from

https://github.com/civicrm/civicrm-core/commit/4f33e78b901fb7cdb38a3026f88b59a2f9fd2c68

So we have an issue that
1) we are now applying check_permission when doing a dupe_check from front end forms - this probably is resulting in 5.9
sites getting too many duplicates are they would always be null for anon users
2) if we DO do a permissions check when an acl or hook has been used to give anon users permission to access
contacts then they will get a fatal error. This is because it sets contact_id to 0 and attempts to insert it into the
acl_contact_cache.

I think we need to either remove the array_filter line that we think we may not need per code comments
or add specific handling for the check_permission flag

AND drop the foreign key constraint on the civicm_acl_contact_cache table. This means they will
no longer be removed when a contact is deleted but this is a clean up issue rather than one with
functionaly implications & we *should* have some form of cleanup in play on that table. In addition,
removing the constraint will reduce write contention

5 years agogeocode job: Provide country_id to geocoders.
mark burdett [Tue, 15 Jan 2019 08:11:38 +0000 (00:11 -0800)]
geocode job: Provide country_id to geocoders.

5 years agoAdd unit test for payment email from AdditionalPayment form, rationalise some paramet...
eileen [Tue, 15 Jan 2019 05:44:19 +0000 (18:44 +1300)]
Add unit test for payment email from AdditionalPayment form, rationalise some parameters to do this.

Note that the goal is to move this function off this class to somewhere api accessible so breaking the connections
with the form makes sense & in fact some like the fromEmails handling are really just badly copied & pasted from elsewhere
(ie. the fromEmailIds doesn't exist & is created on the fly to house the email being passed in

5 years agoMerge pull request #13444 from eileenmcnaughton/payment_smarty
Seamus Lee [Tue, 15 Jan 2019 03:16:03 +0000 (14:16 +1100)]
Merge pull request #13444 from eileenmcnaughton/payment_smarty

[REF] Replace ->assign with CRM_Core_Smarty::singleton()->assign in preparation for making function shareable

5 years agoEscape the header title & section title in reports.
eileen [Tue, 15 Jan 2019 02:43:34 +0000 (15:43 +1300)]
Escape the header title & section title in reports.

In extended reports I'm making it possible for column titles to be user edited. since they will represent user input it
makes sense to escape on output. I think core makes sense as the place to do this as it is best practice
to escape all output in the smarty layer and I have tested that it still works fine

5 years agoDeprecate unused function
eileen [Mon, 14 Jan 2019 10:39:48 +0000 (23:39 +1300)]
Deprecate unused function

5 years agoMerge pull request #13450 from civicrm/5.10
Eileen McNaughton [Mon, 14 Jan 2019 23:05:52 +0000 (12:05 +1300)]
Merge pull request #13450 from civicrm/5.10

5.10 to master

5 years agoMerge pull request #13448 from eileenmcnaughton/everyone_510
Eileen McNaughton [Mon, 14 Jan 2019 23:03:01 +0000 (12:03 +1300)]
Merge pull request #13448 from eileenmcnaughton/everyone_510

Fix unreleased regression on building GroupContact clause

5 years agoMerge pull request #13449 from colemanw/caseDateSearch
Eileen McNaughton [Mon, 14 Jan 2019 23:01:43 +0000 (12:01 +1300)]
Merge pull request #13449 from colemanw/caseDateSearch

Fix broken case activity date filter

5 years agoFix unreleased regression whereby acls are skipped for groups
eileen [Mon, 14 Jan 2019 10:39:03 +0000 (23:39 +1300)]
Fix unreleased regression whereby acls are skipped for groups

5 years agoQuick comment describing need for IPN TZ adjustment
Jason Gillman Jr [Mon, 14 Jan 2019 15:57:34 +0000 (10:57 -0500)]
Quick comment describing need for IPN TZ adjustment

5 years agoUtilize getTimeZoneString() method
Seamus Lee [Sat, 12 Jan 2019 22:41:43 +0000 (17:41 -0500)]
Utilize getTimeZoneString() method

Co-Authored-By: jgillmanjr <jason@rrfaae.com>
5 years agoConvert Paypal Standard IPN payment_date to system's time zone
Jason Gillman Jr [Sat, 12 Jan 2019 05:40:14 +0000 (00:40 -0500)]
Convert Paypal Standard IPN payment_date to system's time zone

5 years agoFix broken case activity date filter
Coleman Watts [Mon, 14 Jan 2019 17:22:07 +0000 (12:22 -0500)]
Fix broken case activity date filter

5 years agoMerge pull request #13438 from colemanw/timeIcon
colemanw [Mon, 14 Jan 2019 14:54:46 +0000 (09:54 -0500)]
Merge pull request #13438 from colemanw/timeIcon

Use icon for timepicker placeholder

5 years agoAdd unit test to cover granting everyone' group permission to access a group
eileen [Mon, 14 Jan 2019 09:04:45 +0000 (22:04 +1300)]
Add unit test to cover granting everyone' group permission to access a group

5 years agoRemove inappropriate exception handling.
eileen [Sun, 13 Jan 2019 21:13:43 +0000 (10:13 +1300)]
Remove inappropriate exception handling.

Per discussion in https://github.com/civicrm/civicrm-core/commit/570243c292fa7bceea74ce233feceb3f69211e54#r31805899

the core logic has been changed to now accept a payment regardless of contribution status. This reflects the
fact that a payment could be received for a fully paid contribution and we still need to record it.

This exception is inappropriately narrow (& likely in the wrong place since it should probably be closer to
where the decision is made about adding a payment rather than when it is being processed

5 years agoMerge pull request #13447 from eileenmcnaughton/dumb_stuff
Seamus Lee [Mon, 14 Jan 2019 07:28:21 +0000 (18:28 +1100)]
Merge pull request #13447 from eileenmcnaughton/dumb_stuff

[tidy-up] remove a couple of useless bits of code

5 years agoMerge pull request #13443 from eileenmcnaughton/move_payment
Seamus Lee [Mon, 14 Jan 2019 06:09:26 +0000 (17:09 +1100)]
Merge pull request #13443 from eileenmcnaughton/move_payment

[REF] Create pseudo bao CRM_Financial_BAO_Payment & move create function to  it

5 years agoMerge pull request #13446 from civicrm/5.10
Eileen McNaughton [Mon, 14 Jan 2019 05:23:14 +0000 (18:23 +1300)]
Merge pull request #13446 from civicrm/5.10

5.10

5 years agoRemove verify_mandatory that does nothing due to nothing to verify
eileen [Mon, 14 Jan 2019 05:22:49 +0000 (18:22 +1300)]
Remove verify_mandatory that does nothing due to nothing to verify

5 years agoRemove unused parameter
eileen [Mon, 14 Jan 2019 05:22:05 +0000 (18:22 +1300)]
Remove unused parameter

5 years agoMerge pull request #13445 from seamuslee001/dev-656
Seamus Lee [Mon, 14 Jan 2019 02:01:53 +0000 (13:01 +1100)]
Merge pull request #13445 from seamuslee001/dev-656

(dev/core#656) unreleased regression - attendee report generates unde…

5 years ago(dev/core#656) unreleased regression - attendee report generates undefined property...
yashodha [Thu, 10 Jan 2019 12:07:34 +0000 (17:37 +0530)]
(dev/core#656) unreleased regression - attendee report generates undefined property notice

5 years agoReplace ->assign with CRM_Core_Smarty::singleton()->assign in preparation for making...
eileen [Sun, 13 Jan 2019 22:59:15 +0000 (11:59 +1300)]
Replace ->assign with CRM_Core_Smarty::singleton()->assign in preparation for making function shareable

Per PR 1330 there is an intention to make this form receipting function a shared function. Part of making it sharable is making it static.

This is a preparatory refactor towards that end, getting rid of the 'this' in assigning variables to smarty

5 years agoCreate pseudo bao CRM_Financial_BAO_Payment & move create function to it.
eileen [Sun, 13 Jan 2019 22:30:11 +0000 (11:30 +1300)]
Create pseudo bao CRM_Financial_BAO_Payment & move create function to it.

This is per discussions coming off https://github.com/civicrm/civicrm-core/pull/13330

Note that this ONLY moves the code - that PR does other things as well that still need to be worked through

5 years agoUse icon for timepicker placeholder
Coleman Watts [Sat, 12 Jan 2019 01:04:56 +0000 (20:04 -0500)]
Use icon for timepicker placeholder

5 years agoMerge pull request #13412 from mattwire/extract_customData
Seamus Lee [Fri, 11 Jan 2019 20:46:29 +0000 (07:46 +1100)]
Merge pull request #13412 from mattwire/extract_customData

REF Convert forms to standard customData template

5 years agoDon't call getEntitySubTypeId if a subType is not defined
Matthew Wire (MJW Consulting) [Fri, 11 Jan 2019 18:55:07 +0000 (18:55 +0000)]
Don't call getEntitySubTypeId if a subType is not defined

5 years agoSimplify billingblock in Contribution/Form/Main template
Matthew Wire (MJW Consulting) [Fri, 11 Jan 2019 18:44:56 +0000 (18:44 +0000)]
Simplify billingblock in Contribution/Form/Main template

5 years agoMerge pull request #13134 from agileware/CIVICRM-1006
colemanw [Fri, 11 Jan 2019 16:10:20 +0000 (11:10 -0500)]
Merge pull request #13134 from agileware/CIVICRM-1006

dev/core#500 Fix user-specific Case filtering on dashboard and searches to exclude cases from inactive relationships

5 years agoMerge pull request #13433 from colemanw/actSub
Yashodha Chaku [Fri, 11 Jan 2019 13:22:44 +0000 (18:52 +0530)]
Merge pull request #13433 from colemanw/actSub

Fix undefined index warning

5 years agoMerge pull request #13377 from eileenmcnaughton/activity_extract2
colemanw [Fri, 11 Jan 2019 00:54:50 +0000 (19:54 -0500)]
Merge pull request #13377 from eileenmcnaughton/activity_extract2

Fix activity.getcount function to filter out unpermitted activities.

5 years agoMerge pull request #13409 from yashodha/dev-646
Seamus Lee [Thu, 10 Jan 2019 20:05:40 +0000 (07:05 +1100)]
Merge pull request #13409 from yashodha/dev-646

(dev/core#646) Event date sorting doesn't work for ical listing

5 years agoFix undefined index warning
Coleman Watts [Thu, 10 Jan 2019 17:05:23 +0000 (12:05 -0500)]
Fix undefined index warning

5 years agoGitLab issue 650 Use popups for links
Chamil Wijesooriya [Tue, 8 Jan 2019 17:00:21 +0000 (17:00 +0000)]
GitLab issue 650 Use popups for links
Changed class to action-item

5 years agoMerge pull request #13430 from civicrm/5.10
Seamus Lee [Thu, 10 Jan 2019 10:08:16 +0000 (21:08 +1100)]
Merge pull request #13430 from civicrm/5.10

5.10