civicrm-core.git
6 years agoConvert EventFees to datepicker
Matthew Wire (MJW Consulting) [Fri, 19 Oct 2018 15:25:52 +0000 (16:25 +0100)]
Convert EventFees to datepicker

6 years agoMerge pull request #12975 from mattwire/datepicker_manageevent_registration
Seamus Lee [Sun, 21 Oct 2018 00:51:08 +0000 (11:51 +1100)]
Merge pull request #12975 from mattwire/datepicker_manageevent_registration

Convert ManageEvent Registration Tab to datepicker

6 years agoMerge pull request #12976 from civicrm/5.7
Eileen McNaughton [Sat, 20 Oct 2018 22:08:21 +0000 (11:08 +1300)]
Merge pull request #12976 from civicrm/5.7

5.7 to master

6 years agoMerge pull request #12972 from mattwire/datepicker_relationshipform
Eileen McNaughton [Sat, 20 Oct 2018 22:01:08 +0000 (11:01 +1300)]
Merge pull request #12972 from mattwire/datepicker_relationshipform

Convert relationship form to datepicker

6 years agoMerge pull request #12941 from colemanw/summaryTabs57
Eileen McNaughton [Sat, 20 Oct 2018 21:52:58 +0000 (10:52 +1300)]
Merge pull request #12941 from colemanw/summaryTabs57

Cleanup contact summary tabs code

6 years agoConvert ManageEvent Registration to datepicker
Matthew Wire (MJW Consulting) [Fri, 19 Oct 2018 20:29:48 +0000 (21:29 +0100)]
Convert ManageEvent Registration to datepicker

6 years agoMerge pull request #12960 from eileenmcnaughton/member_settings
Eileen McNaughton [Sat, 20 Oct 2018 20:51:08 +0000 (09:51 +1300)]
Merge pull request #12960 from eileenmcnaughton/member_settings

Fix notices on Membership Settings form.

6 years agoMerge pull request #12958 from pradpnayak/Tags
colemanw [Sat, 20 Oct 2018 15:16:39 +0000 (11:16 -0400)]
Merge pull request #12958 from pradpnayak/Tags

Remove contact tags when none selected on edit screen

6 years agoRemove contact tags when none selected on edit screen
Pradeep Nayak [Thu, 18 Oct 2018 14:38:01 +0000 (15:38 +0100)]
Remove contact tags when none selected on edit screen

6 years agoConvert relationship form to datepicker
Matthew Wire (MJW Consulting) [Fri, 19 Oct 2018 15:07:44 +0000 (16:07 +0100)]
Convert relationship form to datepicker

6 years agoMerge pull request #12968 from christianwach/issue-459
Tim Otten [Fri, 19 Oct 2018 18:13:47 +0000 (11:13 -0700)]
Merge pull request #12968 from christianwach/issue-459

Fix "crmURL" parameters in various templates

6 years agoMerge pull request #12959 from totten/master-theme-lite
Tim Otten [Fri, 19 Oct 2018 17:47:57 +0000 (10:47 -0700)]
Merge pull request #12959 from totten/master-theme-lite

CRM_Core_Resources - Allow container to swap the implementation

6 years agoMerge pull request #12967 from eileenmcnaughton/report57
Tim Otten [Fri, 19 Oct 2018 17:13:34 +0000 (10:13 -0700)]
Merge pull request #12967 from eileenmcnaughton/report57

Contact summary report with location type selected :Fixed fatal error for function not found

6 years agoMerge pull request #12962 from seamuslee001/dev_core_448_57
Tim Otten [Fri, 19 Oct 2018 17:11:26 +0000 (10:11 -0700)]
Merge pull request #12962 from seamuslee001/dev_core_448_57

dev/core#448 Fix issue where when building mailings with smart groups, removed members of the smart group were being included

6 years agoFix "crmURL" parameters in various templates
Christian Wach [Fri, 19 Oct 2018 13:21:02 +0000 (14:21 +0100)]
Fix "crmURL" parameters in various templates

6 years agoMerge pull request #12966 from seamuslee001/activity_report_group_fgb
Eileen McNaughton [Fri, 19 Oct 2018 02:04:19 +0000 (15:04 +1300)]
Merge pull request #12966 from seamuslee001/activity_report_group_fgb

Disable ONLY_FULL_GROUP_BY sql mode when doing add2group function on …

6 years agoMerge pull request #12964 from civicrm/5.7
Eileen McNaughton [Fri, 19 Oct 2018 00:22:47 +0000 (13:22 +1300)]
Merge pull request #12964 from civicrm/5.7

5.7 to master

6 years agoMerge pull request #12963 from eileenmcnaughton/activity57
Eileen McNaughton [Fri, 19 Oct 2018 00:19:42 +0000 (13:19 +1300)]
Merge pull request #12963 from eileenmcnaughton/activity57

Fix regression on activity detail report add to group

6 years agoFixed fatal error for function not found
Pradeep Nayak [Thu, 18 Oct 2018 09:23:00 +0000 (10:23 +0100)]
Fixed fatal error for function not found

6 years agoDisable ONLY_FULL_GROUP_BY sql mode when doing add2group function on the Activity...
Seamus Lee [Thu, 18 Oct 2018 21:28:00 +0000 (08:28 +1100)]
Disable ONLY_FULL_GROUP_BY sql mode when doing add2group function on the Activity Detail report to avoid fatal error

6 years agoMerge pull request #12961 from seamuslee001/concurrency_oronery
Eileen McNaughton [Thu, 18 Oct 2018 20:58:08 +0000 (09:58 +1300)]
Merge pull request #12961 from seamuslee001/concurrency_oronery

(NFC) Make the test concurrency test not run on PR testing but on mat…

6 years agoFix regression on activity detail report add to group
eileen [Thu, 18 Oct 2018 20:57:47 +0000 (09:57 +1300)]
Fix regression on activity detail report add to group

6 years agosmart groups as mailing lists were not taking unsubscribed users into account
Thomas [Tue, 16 Oct 2018 16:20:58 +0000 (12:20 -0400)]
smart groups as mailing lists were not taking unsubscribed users into account

dev/core#448 Add in a Unit test to demonstrate the problem with smart groups and contats removed from smart groups not being properly checked

6 years ago(NFC) Make the test concurrency test not run on PR testing but on matrix alone until...
Seamus Lee [Thu, 18 Oct 2018 20:43:04 +0000 (07:43 +1100)]
(NFC) Make the test concurrency test not run on PR testing but on matrix alone until we can sort out the issue

6 years agoFix notics on Membership Settings form.
eileen [Thu, 18 Oct 2018 19:59:33 +0000 (08:59 +1300)]
Fix notics on Membership Settings form.

Membership settings form has some enotices off the back of work on the
display form. This fixes those & makes it a 'pure' form in that it relies fully on the
metadata

6 years agoCRM_Core_Resources - Allow container to swap the implementation
Tim Otten [Thu, 18 Oct 2018 02:33:01 +0000 (19:33 -0700)]
CRM_Core_Resources - Allow container to swap the implementation

6 years agoMerge pull request #12955 from civicrm/5.7
Eileen McNaughton [Thu, 18 Oct 2018 10:51:02 +0000 (23:51 +1300)]
Merge pull request #12955 from civicrm/5.7

5.7 to master

6 years agoMerge pull request #12952 from vingle/patch-1
Eileen McNaughton [Thu, 18 Oct 2018 10:49:58 +0000 (23:49 +1300)]
Merge pull request #12952 from vingle/patch-1

Fixed Joomla menu z-index regression

6 years agoFixed Joomla menu z-index regression
Nicol [Thu, 18 Oct 2018 09:07:14 +0000 (10:07 +0100)]
Fixed Joomla menu z-index regression

As originally described https://civicrm.stackexchange.com/questions/26858/anyone-else-seeing-an-overlapping-admin-civi-menu-bug-with-joomla-3-8-13-and-civ

6 years agoMerge pull request #12950 from eileenmcnaughton/case
Eileen McNaughton [Thu, 18 Oct 2018 08:57:12 +0000 (21:57 +1300)]
Merge pull request #12950 from eileenmcnaughton/case

[NFC] code cleanup in api_v3_CaseTest

6 years agoMerge pull request #12940 from eileenmcnaughton/setting_fix
Eileen McNaughton [Thu, 18 Oct 2018 08:40:37 +0000 (21:40 +1300)]
Merge pull request #12940 from eileenmcnaughton/setting_fix

Fix (unreleased) fatal error on contribution preferences settings page

6 years agoMerge pull request #12935 from jensschuppe/core-412
Eileen McNaughton [Thu, 18 Oct 2018 07:56:02 +0000 (20:56 +1300)]
Merge pull request #12935 from jensschuppe/core-412

[dev/core#412] Avoid truncated UTF-8 strings when using substr()

6 years agoMerge pull request #12946 from laryn/master
Eileen McNaughton [Thu, 18 Oct 2018 06:09:40 +0000 (19:09 +1300)]
Merge pull request #12946 from laryn/master

PHP 7.1 bugfix: undeclared array subdimension with batch CSV export

6 years ago[NFC] code cleanup in api_v3_CaseTest
eileen [Thu, 18 Oct 2018 05:30:38 +0000 (18:30 +1300)]
[NFC] code cleanup in api_v3_CaseTest

6 years agoMerge pull request #12948 from civicrm/5.7
Eileen McNaughton [Wed, 17 Oct 2018 19:12:59 +0000 (08:12 +1300)]
Merge pull request #12948 from civicrm/5.7

5.7 to master

6 years agoMerge pull request #12915 from twomice/428_activity_report_fatal_section_headers
Eileen McNaughton [Wed, 17 Oct 2018 19:09:45 +0000 (08:09 +1300)]
Merge pull request #12915 from twomice/428_activity_report_fatal_section_headers

Fix for dev/core#428: Fatal error in Activity Details report when Sorting uses Section Header

6 years agoPHP 7.1 bugfix: undeclared array subdimension with batch CSV export
laryn [Wed, 17 Oct 2018 15:36:38 +0000 (10:36 -0500)]
PHP 7.1 bugfix: undeclared array subdimension with batch CSV export

6 years agoFix for dev/core#428.
Allen Shaw [Tue, 9 Oct 2018 17:50:21 +0000 (12:50 -0500)]
Fix for dev/core#428.

6 years agoMerge pull request #12945 from seamuslee001/lab_core_448
Eileen McNaughton [Wed, 17 Oct 2018 08:07:14 +0000 (21:07 +1300)]
Merge pull request #12945 from seamuslee001/lab_core_448

dev/core#448 Fix issue where when building mailings with smart groups, removed members of the smart group were being included

6 years agosmart groups as mailing lists were not taking unsubscribed users into account
Thomas [Tue, 16 Oct 2018 16:20:58 +0000 (12:20 -0400)]
smart groups as mailing lists were not taking unsubscribed users into account

6 years agodev/core#448 Add in a Unit test to demonstrate the problem with smart groups and...
Seamus Lee [Tue, 16 Oct 2018 20:01:41 +0000 (07:01 +1100)]
dev/core#448 Add in a Unit test to demonstrate the problem with smart groups and contats removed from smart groups not being properly checked

6 years agoStandardize weights of tabs and extract basic tabs to function
Coleman Watts [Mon, 15 Oct 2018 21:17:53 +0000 (17:17 -0400)]
Standardize weights of tabs and extract basic tabs to function

6 years agoSimple function extraction
Coleman Watts [Mon, 15 Oct 2018 20:44:47 +0000 (16:44 -0400)]
Simple function extraction

6 years agoMerge pull request #12937 from colemanw/d7toolbar
colemanw [Tue, 16 Oct 2018 13:27:26 +0000 (09:27 -0400)]
Merge pull request #12937 from colemanw/d7toolbar

Intelligently adjust menubar for D7 toolbar toggle

6 years agoFix 'default_invoice_page' to be supported by settings.getoptions.
eileen [Tue, 16 Oct 2018 08:48:50 +0000 (21:48 +1300)]
Fix 'default_invoice_page' to be supported by settings.getoptions.

Settings.getoptions supports a lesser format-set to CRM_Core_DAO::buildOptions does
in terms of pseudoconstant keys. Ideally we would fix that but for now
fix the fatal on the contribution page settings page by using
a format that is supported

6 years agoIntelligently adjust menubar for D7 toolbar toggle
Coleman Watts [Mon, 15 Oct 2018 21:22:59 +0000 (17:22 -0400)]
Intelligently adjust menubar for D7 toolbar toggle

6 years agoMerge pull request #12693 from eileenmcnaughton/membership_submit
Eileen McNaughton [Mon, 15 Oct 2018 20:57:32 +0000 (21:57 +0100)]
Merge pull request #12693 from eileenmcnaughton/membership_submit

Membership form submit status message refactor

6 years agoMerge pull request #12934 from scardinius/core-443
Eileen McNaughton [Mon, 15 Oct 2018 20:32:26 +0000 (21:32 +0100)]
Merge pull request #12934 from scardinius/core-443

dev/core#443 Fix Non-static method calls at CRM_Utils_Mail_Incoming

6 years agoMerge pull request #12936 from agh1/patch-1
Eileen McNaughton [Mon, 15 Oct 2018 20:29:34 +0000 (21:29 +0100)]
Merge pull request #12936 from agh1/patch-1

Status page: hush menu should be on top of other headers

6 years agoStatus page: hush menu should be on top of other headers
Andrew Hunt [Mon, 15 Oct 2018 16:59:18 +0000 (12:59 -0400)]
Status page: hush menu should be on top of other headers

Also tempered a bit of z-index overkill on the `<li>` elements in the menu

6 years ago[dev/core#412] Avoid truncated UTF-8 strings when using substr()
Jens Schuppe [Mon, 15 Oct 2018 09:14:51 +0000 (11:14 +0200)]
[dev/core#412] Avoid truncated UTF-8 strings when using substr()

6 years agodev/core#443 Fix Non-static method calls at CRM_Utils_Mail_Incoming class
scardinius [Mon, 15 Oct 2018 08:21:36 +0000 (10:21 +0200)]
dev/core#443 Fix Non-static method calls at CRM_Utils_Mail_Incoming class

6 years agoMerge pull request #12931 from mecachisenros/master
Seamus Lee [Sun, 14 Oct 2018 21:23:43 +0000 (08:23 +1100)]
Merge pull request #12931 from mecachisenros/master

Correct inconsistent fileID reference

6 years agoMerge pull request #12926 from eileenmcnaughton/processor_zero
Eileen McNaughton [Sat, 13 Oct 2018 18:25:25 +0000 (19:25 +0100)]
Merge pull request #12926 from eileenmcnaughton/processor_zero

dev/financial#23  Do not display e-notice for zero dollar transactions

6 years agoMove setting of status to be with related code.
eileen [Mon, 20 Aug 2018 03:58:21 +0000 (15:58 +1200)]
Move setting of status to be with related code.

Next round we will integrated this with the actual building of updates

6 years agocorrect inconsistent fileID reference
Andrei Mondoc [Sat, 13 Oct 2018 15:55:08 +0000 (16:55 +0100)]
correct inconsistent fileID reference

6 years agoMerge pull request #12306 from JO0st/dev-core-166
Eileen McNaughton [Fri, 12 Oct 2018 10:10:19 +0000 (11:10 +0100)]
Merge pull request #12306 from JO0st/dev-core-166

dev-core-166/lessen memory impact

6 years agoi before e except after c
Eileen McNaughton [Fri, 12 Oct 2018 10:04:45 +0000 (11:04 +0100)]
i before e except after c

6 years agoMerge pull request #12927 from davejenx/job_process_memberships_test_inherit
Eileen McNaughton [Fri, 12 Oct 2018 07:33:25 +0000 (08:33 +0100)]
Merge pull request #12927 from davejenx/job_process_memberships_test_inherit

Added further tests for process_membership job: check status for inherited memberships

6 years agoAdded further checks for process_membership job: check that status is updated correct...
Dave Jenkins [Thu, 11 Oct 2018 17:56:43 +0000 (18:56 +0100)]
Added further checks for process_membership job: check that status is updated correctly for inherited membership. In function testProcessMembershipUpdateStatus.

6 years agoMerge pull request #12922 from yashodha/report-fixes
Eileen McNaughton [Thu, 11 Oct 2018 17:23:40 +0000 (18:23 +0100)]
Merge pull request #12922 from yashodha/report-fixes

CRM-21677 - more report clean up

6 years agoMerge pull request #12758 from samuelsov/DraftMailing
Eileen McNaughton [Thu, 11 Oct 2018 17:16:53 +0000 (18:16 +0100)]
Merge pull request #12758 from samuelsov/DraftMailing

Adding [CiviMail Draft] on test mailing (for mosaico)

6 years agoDo not display e-notice for zero dollar transactions
eileen [Thu, 11 Oct 2018 14:28:46 +0000 (15:28 +0100)]
Do not display e-notice for zero dollar transactions

6 years agoMerge pull request #12810 from eileenmcnaughton/annual
Eileen McNaughton [Thu, 11 Oct 2018 15:12:12 +0000 (16:12 +0100)]
Merge pull request #12810 from eileenmcnaughton/annual

Extract query to generate annual totals and add test

6 years agoMerge pull request #12920 from JKingsnorth/patch-11
Eileen McNaughton [Thu, 11 Oct 2018 14:20:40 +0000 (15:20 +0100)]
Merge pull request #12920 from JKingsnorth/patch-11

(NFC) Fix misleading comment for dupesInGroup()

6 years agoMerge pull request #12883 from twomice/CRM-19751_search_on_hold-2
Eileen McNaughton [Thu, 11 Oct 2018 13:29:18 +0000 (14:29 +0100)]
Merge pull request #12883 from twomice/CRM-19751_search_on_hold-2

Toward CRM-19751: change db schema so that on_hold is INT instead of BOOLEAN.

6 years agoMerge pull request #12919 from eileenmcnaughton/setting
Eileen McNaughton [Thu, 11 Oct 2018 13:28:38 +0000 (14:28 +0100)]
Merge pull request #12919 from eileenmcnaughton/setting

Translate various settings information

6 years agoMerge pull request #12765 from eileenmcnaughton/sms
Eileen McNaughton [Thu, 11 Oct 2018 13:26:37 +0000 (14:26 +0100)]
Merge pull request #12765 from eileenmcnaughton/sms

Fix order by on is_primary.

6 years agoMove status setting back to main function.
eileen [Mon, 20 Aug 2018 03:53:42 +0000 (15:53 +1200)]
Move status setting back to main function.

It actually doesn't have much in common with the other portion of that column
and we can move the setting to where it belongs

6 years agoStop returning createdMemberships.
eileen [Mon, 20 Aug 2018 03:48:00 +0000 (15:48 +1200)]
Stop returning createdMemberships.

This parameter is built up purely to set the status message, which I argue should be
set 'as she goes' saving us building up complex variables. Removing this
var will help us simplify the earlier loops

6 years agoExtract query to generate annual totals and add test
eileen [Wed, 12 Sep 2018 05:00:16 +0000 (17:00 +1200)]
Extract query to generate annual totals and add test

6 years agoMerge pull request #12495 from eileenmcnaughton/dragon_slayer
colemanw [Thu, 11 Oct 2018 10:20:35 +0000 (06:20 -0400)]
Merge pull request #12495 from eileenmcnaughton/dragon_slayer

Slay dragons

6 years agoCRM-21677 - more report clean up
yashodha [Thu, 11 Oct 2018 04:56:03 +0000 (10:26 +0530)]
CRM-21677 - more report clean up

6 years agoMerge pull request #12695 from eileenmcnaughton/mem2
Seamus Lee [Wed, 10 Oct 2018 21:33:20 +0000 (08:33 +1100)]
Merge pull request #12695 from eileenmcnaughton/mem2

Membership form - tidy up receipt code

6 years agoFix order by on is_primary.
eileen [Tue, 4 Sep 2018 00:09:16 +0000 (12:09 +1200)]
Fix order by on is_primary.

As pointed out in https://lab.civicrm.org/dev/mail/issues/26 the order by is not the
correct format for order_by and has no effect. I tested to make sure it was not
some magic.

I opted for (implict) ASC as the order by for non sms is ASC and further down
processing seems to overwrite each row as it happens so primary later
would overwrite earlier

6 years agoToward CRM-19751: change db scmema so on_hold is INT instead of BOOLEAN.
Allen Shaw [Sun, 30 Sep 2018 00:41:09 +0000 (19:41 -0500)]
Toward CRM-19751: change db scmema so on_hold is INT instead of BOOLEAN.

6 years agoFix misleading comment for dupesInGroup()
John Kingsnorth [Wed, 10 Oct 2018 14:55:12 +0000 (15:55 +0100)]
Fix misleading comment for dupesInGroup()

The function does also work with smart groups, so remove the comment that says otherwise.

6 years agoMerge pull request #12828 from seamuslee001/lab_core_357
Eileen McNaughton [Wed, 10 Oct 2018 13:52:38 +0000 (14:52 +0100)]
Merge pull request #12828 from seamuslee001/lab_core_357

dev/core#357 Fix issue where user email addresses were keyed on email…

6 years agoTranslate various settings information
eileen [Wed, 10 Oct 2018 13:11:16 +0000 (14:11 +0100)]
Translate various settings information

6 years agoMove customValue retrieval to calling function.
eileen [Mon, 20 Aug 2018 05:17:26 +0000 (17:17 +1200)]
Move customValue retrieval to calling function.

After digging on CRM_Batch_Form_Entry I couldn't find any evidence that the groupTree property would ever be set

6 years agoWrap membership receipt in an outer function.
eileen [Mon, 20 Aug 2018 05:05:12 +0000 (17:05 +1200)]
Wrap membership receipt in an outer function.

This function is neither static nor shared & we work to replace the
other / put the parts that really are shared somewhere sensible

6 years agoMerge pull request #12918 from davejenx/job_process_memberships_tests
Eileen McNaughton [Wed, 10 Oct 2018 12:57:11 +0000 (13:57 +0100)]
Merge pull request #12918 from davejenx/job_process_memberships_tests

Added more unit tests for process_membership job: testProcessMembershipUpdateStatus

6 years agoRetain preferred array format while searching Money values.
eileen [Tue, 9 Oct 2018 17:10:38 +0000 (18:10 +0100)]
Retain preferred array format while searching Money values.

The preferred BAO_Query format is ['BETWEEN' => [12.40 AND 13.50]] but this is currently being munged back
into legacy format, creating a test fail

Note that the search doesn't work properly with international commas, with, or without
this patch :-(

6 years agoSlay dragons
eileen [Tue, 17 Jul 2018 09:31:04 +0000 (21:31 +1200)]
Slay dragons

6 years agoMerge pull request #12906 from eileenmcnaughton/setting
Eileen McNaughton [Wed, 10 Oct 2018 11:27:07 +0000 (12:27 +0100)]
Merge pull request #12906 from eileenmcnaughton/setting

[NFC] Convert some fields on admin display preferences to use metdata

6 years agoMerge pull request #12747 from mattwire/tabheader_extract_and_events
Seamus Lee [Wed, 10 Oct 2018 10:29:57 +0000 (21:29 +1100)]
Merge pull request #12747 from mattwire/tabheader_extract_and_events

Extract selectedChild tabheader functionality and enable for Manage Events

6 years agoAdded more unit tests for process_membership job, checking that statuses are updated...
Dave Jenkins [Wed, 10 Oct 2018 10:06:33 +0000 (11:06 +0100)]
Added more unit tests for process_membership job, checking that statuses are updated correctly in various cases where they should be and left alone in cases where they shouldn't. Adds new function testProcessMembershipUpdateStatus.

6 years agoMerge pull request #12916 from yashodha/report-fixes
Eileen McNaughton [Wed, 10 Oct 2018 09:28:05 +0000 (10:28 +0100)]
Merge pull request #12916 from yashodha/report-fixes

CRM-21677 - report clean up

6 years agoConvert Preserve activity tab
eileen [Tue, 9 Oct 2018 06:55:49 +0000 (07:55 +0100)]
Convert Preserve activity tab

6 years agoExtract selectedChild tabheader functionality and enable for Manage Events
Matthew Wire (MJW Consulting) [Thu, 16 Aug 2018 16:41:54 +0000 (17:41 +0100)]
Extract selectedChild tabheader functionality and enable for Manage Events

6 years agoConvert Contact Search to metadata driven
eileen [Mon, 8 Oct 2018 21:00:15 +0000 (22:00 +0100)]
Convert Contact Search to metadata driven

6 years agoAdd metadata for editing contacts
eileen [Mon, 8 Oct 2018 20:37:01 +0000 (21:37 +0100)]
Add metadata for editing contacts

6 years agoConvert 'Viewing Smart Groups' on admin display preferences to use metadata.
eileen [Mon, 8 Oct 2018 20:27:33 +0000 (21:27 +0100)]
Convert 'Viewing Smart Groups' on admin display preferences to use metadata.

This has no functional impact - cleanup only

6 years agoConvert 'Viewing Smart Groups' on admin display preferences to use metadata.
eileen [Mon, 8 Oct 2018 20:27:33 +0000 (21:27 +0100)]
Convert 'Viewing Smart Groups' on admin display preferences to use metadata.

This has no functional impact - cleanup only

6 years agoMerge pull request #12910 from monishdeb/dev-core-394
Eileen McNaughton [Wed, 10 Oct 2018 08:27:00 +0000 (09:27 +0100)]
Merge pull request #12910 from monishdeb/dev-core-394

(dev/core#394) : Wildcards are ignored in some smart group criteria, when the smart group is directly generated for a mailing

6 years agoMerge pull request #12890 from dereklewis123/CW-905-2
Eileen McNaughton [Wed, 10 Oct 2018 08:09:42 +0000 (09:09 +0100)]
Merge pull request #12890 from dereklewis123/CW-905-2

core/384 CiviSMS does not fall back to non-primary mobile number

6 years agoCRM-21677 - report clean up
yashodha [Wed, 10 Oct 2018 06:19:35 +0000 (11:49 +0530)]
CRM-21677 - report clean up

6 years agoMerge pull request #12784 from eileenmcnaughton/cache
Seamus Lee [Wed, 10 Oct 2018 02:33:55 +0000 (13:33 +1100)]
Merge pull request #12784 from eileenmcnaughton/cache

Do not treat an empty array as not set in caches.

6 years agoMerge pull request #12914 from eileenmcnaughton/record
Eileen McNaughton [Tue, 9 Oct 2018 20:42:18 +0000 (21:42 +0100)]
Merge pull request #12914 from eileenmcnaughton/record

Fix payment hangs when registering a user for a paid event without recording payment

6 years agoMerge pull request #12864 from eileenmcnaughton/export
Eileen McNaughton [Tue, 9 Oct 2018 20:38:53 +0000 (21:38 +0100)]
Merge pull request #12864 from eileenmcnaughton/export

Export - small cleanup