civicrm-core.git
9 years agoMerge pull request #6720 from yashodha/CRM-17015
Yashodha Chaku [Fri, 11 Sep 2015 08:46:13 +0000 (14:16 +0530)]
Merge pull request #6720 from yashodha/CRM-17015

CRM-17015: “Sold out” error message when registering event with PayPal …

9 years agoMerge pull request #6725 from eileenmcnaughton/CRM-14232
Eileen McNaughton [Fri, 11 Sep 2015 07:22:30 +0000 (19:22 +1200)]
Merge pull request #6725 from eileenmcnaughton/CRM-14232

minor tidy-ups to comments & spelling

9 years agominor tidy-ups
eileenmcnaugton [Fri, 11 Sep 2015 05:09:51 +0000 (17:09 +1200)]
minor tidy-ups

9 years agoMerge pull request #6631 from eileenmcnaughton/CRM-17115
Eileen McNaughton [Thu, 10 Sep 2015 18:35:23 +0000 (06:35 +1200)]
Merge pull request #6631 from eileenmcnaughton/CRM-17115

CRM-17115 extra/ stdise fields on CiviReport

9 years agoMerge pull request #6717 from PalanteJon/CRM-17194
Dave Greenberg [Thu, 10 Sep 2015 17:41:41 +0000 (10:41 -0700)]
Merge pull request #6717 from PalanteJon/CRM-17194

CRM-17194 - CiviReport - fix date range bug on Contribution Repeat Re…

9 years agoMerge pull request #6613 from pradpnayak/CRM-16542
Dave Greenberg [Thu, 10 Sep 2015 16:45:21 +0000 (09:45 -0700)]
Merge pull request #6613 from pradpnayak/CRM-16542

-- CRM-16542, fixed regression for billing block

9 years agoMerge pull request #6719 from monishdeb/46-test-fix
Monish Deb [Thu, 10 Sep 2015 10:16:47 +0000 (15:46 +0530)]
Merge pull request #6719 from monishdeb/46-test-fix

CRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at …

9 years agominor fix
yashodha [Thu, 10 Sep 2015 09:36:26 +0000 (15:06 +0530)]
minor fix

9 years agoformat fix
monishdeb [Thu, 10 Sep 2015 07:56:37 +0000 (13:26 +0530)]
format fix

9 years agoCRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at processing
monishdeb [Thu, 10 Sep 2015 07:50:51 +0000 (13:20 +0530)]
CRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at processing

https://issues.civicrm.org/jira/browse/CRM-17188

9 years agoCRM-17015: “Sold out” eSor mestge when registering event with PayPal Express payment...
yashodha [Thu, 10 Sep 2015 06:05:42 +0000 (11:35 +0530)]
CRM-17015: “Sold out” eSor mestge when registering event with PayPal Express payment (event is not full though)

----------------------------------------
* CRM-17015: “Sold out” error message when registering event with PayPal Express payment (event is not full though)
  https://issues.civicrm.org/jira/browse/CRM-17015

9 years agoCRM-17115 fix change observed in QA on participant listing
eileenmcnaugton [Wed, 9 Sep 2015 11:24:17 +0000 (23:24 +1200)]
CRM-17115 fix change observed in QA on participant listing

9 years agoCRM-17194 - CiviReport - fix date range bug on Contribution Repeat Report
Jon goldberg [Wed, 9 Sep 2015 21:10:12 +0000 (17:10 -0400)]
CRM-17194 - CiviReport - fix date range bug on Contribution Repeat Report

9 years agoMerge pull request #6709 from pradpnayak/CRM-16906
Dave Greenberg [Wed, 9 Sep 2015 19:12:10 +0000 (12:12 -0700)]
Merge pull request #6709 from pradpnayak/CRM-16906

Crm 16906

9 years agoMerge pull request #6708 from seamuslee001/CRM-14599
Dave Greenberg [Wed, 9 Sep 2015 17:57:00 +0000 (10:57 -0700)]
Merge pull request #6708 from seamuslee001/CRM-14599

CRM-14599 - Exclude deleted contacts from test mailing

9 years agoCRM-14599 - Exclude deleted contacts from test mailing
Seamus Lee [Wed, 9 Sep 2015 02:23:17 +0000 (02:23 +0000)]
CRM-14599 - Exclude deleted contacts from test mailing

9 years agoMerge pull request #6704 from monishdeb/46-test-fix
Eileen McNaughton [Wed, 9 Sep 2015 01:44:55 +0000 (13:44 +1200)]
Merge pull request #6704 from monishdeb/46-test-fix

4.6 Test fixes

9 years agoMerge pull request #6686 from guanhuan/cancellation-credit-note
Dave Greenberg [Tue, 8 Sep 2015 21:28:05 +0000 (14:28 -0700)]
Merge pull request #6686 from guanhuan/cancellation-credit-note

Credit note upon cancellation

9 years agoMerge pull request #6703 from jitendrapurohit/CRM-17163
Monish Deb [Tue, 8 Sep 2015 14:31:55 +0000 (20:01 +0530)]
Merge pull request #6703 from jitendrapurohit/CRM-17163

CRM-17163 - Can not import contributions by matching on email

9 years ago4.6 Test Failure fix
monishdeb [Tue, 8 Sep 2015 11:19:12 +0000 (16:49 +0530)]
4.6 Test Failure fix

9 years agoMerge pull request #6557 from monishdeb/CRM-16858
Monish Deb [Tue, 8 Sep 2015 11:17:31 +0000 (16:47 +0530)]
Merge pull request #6557 from monishdeb/CRM-16858

CRM-16858 fix - Participant Status & ID error in adv.search builder

9 years agoCRM-17163 - Can not import contributions by matching on email
jitendrapurohit [Tue, 8 Sep 2015 10:54:39 +0000 (16:24 +0530)]
CRM-17163 - Can not import contributions by matching on email

9 years agoCRM-17115 reinstate link on gender to reports
eileenmcnaugton [Tue, 8 Sep 2015 08:29:17 +0000 (20:29 +1200)]
CRM-17115 reinstate link on gender to reports

9 years agoCRM-17115 fix enotices from qa
eileenmcnaugton [Mon, 7 Sep 2015 21:26:29 +0000 (09:26 +1200)]
CRM-17115 fix enotices from qa

9 years agoApply modifications to invoice templates
Guanhuan Chen [Mon, 7 Sep 2015 11:48:34 +0000 (12:48 +0100)]
Apply modifications to invoice templates

9 years agoSetup upgrade script for default invoice msg template modification
Guanhuan Chen [Mon, 7 Sep 2015 11:47:11 +0000 (12:47 +0100)]
Setup upgrade script for default invoice msg template modification

9 years agoAllow credit note to be downloaded on cancellations
Guanhuan Chen [Mon, 7 Sep 2015 11:32:11 +0000 (12:32 +0100)]
Allow credit note to be downloaded on cancellations

9 years agoAllow credit note for cancellations
Guanhuan Chen [Mon, 7 Sep 2015 11:25:42 +0000 (12:25 +0100)]
Allow credit note for cancellations

9 years agoMerge pull request #6585 from eileenmcnaughton/CRM-17003
Eileen McNaughton [Mon, 7 Sep 2015 00:51:32 +0000 (12:51 +1200)]
Merge pull request #6585 from eileenmcnaughton/CRM-17003

CRM-17003 previous commit caused wrong formatting in access tab on re…

9 years agoMerge pull request #6678 from eileenmcnaughton/CRM-17120-46
Eileen McNaughton [Mon, 7 Sep 2015 00:49:44 +0000 (12:49 +1200)]
Merge pull request #6678 from eileenmcnaughton/CRM-17120-46

CRM-17120 swap out uncached function for cached function

9 years agoMerge pull request #6688 from eileenmcnaughton/test-fix
Eileen McNaughton [Sun, 6 Sep 2015 21:06:18 +0000 (09:06 +1200)]
Merge pull request #6688 from eileenmcnaughton/test-fix

test fix - fix dumb error when in test check

9 years agoremoved echo
Kurund Jalmi [Sun, 6 Sep 2015 01:11:41 +0000 (18:11 -0700)]
removed echo

9 years agoMerge pull request #6675 from nganivet/CRM-17149
Dave Greenberg [Sat, 5 Sep 2015 15:42:34 +0000 (08:42 -0700)]
Merge pull request #6675 from nganivet/CRM-17149

CRM-17149: full fix

9 years ago= operator fix
monishdeb [Sat, 5 Sep 2015 08:45:01 +0000 (14:15 +0530)]
= operator fix

9 years agoformat fix
monishdeb [Fri, 28 Aug 2015 11:18:34 +0000 (16:48 +0530)]
format fix

9 years agoparticipant role switch case separation
monishdeb [Fri, 28 Aug 2015 11:07:37 +0000 (16:37 +0530)]
participant role switch case separation

9 years agominor fix
monishdeb [Thu, 27 Aug 2015 05:14:19 +0000 (10:44 +0530)]
minor fix

9 years agominor changes for partcipant.Get
monishdeb [Wed, 26 Aug 2015 12:51:16 +0000 (18:21 +0530)]
minor changes for partcipant.Get

9 years agoParticipant role fix
monishdeb [Wed, 26 Aug 2015 12:36:56 +0000 (18:06 +0530)]
Participant role fix

9 years agoadditional changes
monishdeb [Mon, 24 Aug 2015 06:52:23 +0000 (12:22 +0530)]
additional changes

9 years agotests/phpunit/api/v3/MappingFieldTest.php
monishdeb [Fri, 21 Aug 2015 10:30:49 +0000 (16:00 +0530)]
tests/phpunit/api/v3/MappingFieldTest.php

9 years agotest fix - fix dumb error when in test check
eileenmcnaugton [Sat, 5 Sep 2015 04:57:36 +0000 (16:57 +1200)]
test fix - fix dumb error when in test check

9 years agoMerge pull request #6446 from colemanw/CRM-13160
Kurund Jalmi [Fri, 4 Sep 2015 21:46:07 +0000 (14:46 -0700)]
Merge pull request #6446 from colemanw/CRM-13160

CRM-13160 - Fix deleting relationshipType from MembershipType

9 years agoMerge pull request #6649 from jitendrapurohit/CRM-16514
Kurund Jalmi [Fri, 4 Sep 2015 04:53:42 +0000 (21:53 -0700)]
Merge pull request #6649 from jitendrapurohit/CRM-16514

CRM-16514 -- Scheduled reminder for event sends email repeatedly

9 years agoMerge pull request #6677 from eileenmcnaughton/CRM-17152
Eileen McNaughton [Fri, 4 Sep 2015 02:17:33 +0000 (14:17 +1200)]
Merge pull request #6677 from eileenmcnaughton/CRM-17152

CRM-17152 fix non-static method called statically

9 years agoCRM-17115 kowtow to @seamuslee & @colemanw
eileenmcnaugton [Fri, 4 Sep 2015 00:53:11 +0000 (12:53 +1200)]
CRM-17115 kowtow to @seamuslee & @colemanw

9 years agocorrects style issue
Nicolas Ganivet [Fri, 4 Sep 2015 00:41:47 +0000 (18:41 -0600)]
corrects style issue

9 years agocomment fix
eileenmcnaugton [Fri, 4 Sep 2015 00:33:39 +0000 (12:33 +1200)]
comment fix

9 years agoCRM-17120 use cached function to retrieve option label
eileenmcnaugton [Thu, 3 Sep 2015 23:38:54 +0000 (11:38 +1200)]
CRM-17120 use cached function to retrieve option label

9 years agoCRM-17120 add test to getFinancialTransactionsList function
eileenmcnaugton [Thu, 3 Sep 2015 23:37:46 +0000 (11:37 +1200)]
CRM-17120 add test to getFinancialTransactionsList function

9 years agoCRM-17152 fix non-static method called statically
eileenmcnaugton [Thu, 3 Sep 2015 22:48:32 +0000 (10:48 +1200)]
CRM-17152 fix non-static method called statically

9 years agoCRM-17149: full fix
Nicolas Ganivet [Thu, 3 Sep 2015 17:57:13 +0000 (11:57 -0600)]
CRM-17149: full fix

9 years agoMerge pull request #6658 from eileenmcnaughton/CRM-17120
Eileen McNaughton [Thu, 3 Sep 2015 08:20:33 +0000 (20:20 +1200)]
Merge pull request #6658 from eileenmcnaughton/CRM-17120

Crm 17120

9 years agoMerge pull request #6661 from yashodha/CRM-17132
Yashodha Chaku [Thu, 3 Sep 2015 05:23:00 +0000 (10:53 +0530)]
Merge pull request #6661 from yashodha/CRM-17132

CRM-17132: Cannot Find Contributions or Advanced Search by Personal C…

9 years agoMerge pull request #6644 from totten/4.6-sql-where
Tim Otten [Thu, 3 Sep 2015 01:44:57 +0000 (18:44 -0700)]
Merge pull request #6644 from totten/4.6-sql-where

CRM-16544, CRM-17127 - Select::where() - Less aggressive dedupe

9 years agoMerge pull request #6604 from eileenmcnaughton/4.6
Eileen McNaughton [Wed, 2 Sep 2015 23:14:21 +0000 (11:14 +1200)]
Merge pull request #6604 from eileenmcnaughton/4.6

CRM-17092 backport (do not merge) of fix to storing contribution_recu…

9 years agoMerge pull request #6620 from colemanw/CRM-17080
Eileen McNaughton [Wed, 2 Sep 2015 21:48:28 +0000 (09:48 +1200)]
Merge pull request #6620 from colemanw/CRM-17080

CRM-17080 - Smarty api cleanup

9 years agomark function as deprecated
eileenmcnaugton [Wed, 2 Sep 2015 20:10:57 +0000 (08:10 +1200)]
mark function as deprecated

9 years agoCRM-17120 swap out calls to getLabel to a cached one
eileenmcnaugton [Wed, 2 Sep 2015 04:10:37 +0000 (16:10 +1200)]
CRM-17120 swap out calls to getLabel to a cached one

This change is tested in the contribution BAO class

9 years agoMerge pull request #6628 from monishdeb/CRM-17090
Monish Deb [Wed, 2 Sep 2015 18:23:14 +0000 (23:53 +0530)]
Merge pull request #6628 from monishdeb/CRM-17090

CRM-17090 fix - Accounting batch filters broken

9 years agoMerge pull request #6659 from colemanw/CRM-17126
colemanw [Wed, 2 Sep 2015 15:28:29 +0000 (08:28 -0700)]
Merge pull request #6659 from colemanw/CRM-17126

CRM-17126 - Add js headers for contribution widget

9 years agoformat fix
yashodha [Wed, 2 Sep 2015 11:41:48 +0000 (17:11 +0530)]
format fix

9 years agoCRM-17132: Cannot Find Contributions or Advanced Search by Personal Contribution...
yashodha [Wed, 2 Sep 2015 08:30:04 +0000 (14:00 +0530)]
CRM-17132: Cannot Find Contributions or Advanced Search by Personal Contribution Page

----------------------------------------
* CRM-17132: Cannot Find Contributions or Advanced Search by Personal Contribution Page
  https://issues.civicrm.org/jira/browse/CRM-17132

9 years agoCRM-17115 follow on fix to function signature change
eileenmcnaugton [Wed, 2 Sep 2015 05:31:04 +0000 (17:31 +1200)]
CRM-17115 follow on fix to function signature change

Also swap out a couple of uncached calls to get soft credit label

9 years agoCRM-17115 fix e-notices & inconsistent signature per review
eileenmcnaugton [Wed, 2 Sep 2015 05:08:31 +0000 (17:08 +1200)]
CRM-17115 fix e-notices & inconsistent signature per review

9 years agoCRM-17120 enhance test to check honor contact output
eileenmcnaugton [Wed, 2 Sep 2015 04:08:06 +0000 (16:08 +1200)]
CRM-17120 enhance test to check honor contact output

9 years agominor comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 04:07:24 +0000 (16:07 +1200)]
minor comment fixes

9 years agoCRM-17120 replace option label calls with cached function.
eileenmcnaugton [Wed, 2 Sep 2015 03:43:41 +0000 (15:43 +1200)]
CRM-17120 replace option label calls with cached function.

I added a test before swapping out the values. In the process I formed a few doubts about the
code. I couldn't find anyway to access the case_activity where parameters outside a
carefully crafted test and when I did so I got invalid sql & a minor error in the qill
I added comments about these findings & locked in the existing behaviour, keeping this
change very safe

9 years agoCRM-17126 - Add js headers for contribution widget
Coleman Watts [Wed, 2 Sep 2015 03:30:53 +0000 (20:30 -0700)]
CRM-17126 - Add js headers for contribution widget

9 years agoremove unused parameter
eileenmcnaugton [Wed, 2 Sep 2015 03:23:07 +0000 (15:23 +1200)]
remove unused parameter

9 years agoComment fixes
eileenmcnaugton [Wed, 2 Sep 2015 03:22:52 +0000 (15:22 +1200)]
Comment fixes

9 years agoCRM-17120 remove call to uncached getLabel function
eileenmcnaugton [Wed, 2 Sep 2015 01:10:51 +0000 (13:10 +1200)]
CRM-17120 remove call to uncached getLabel function

9 years agobackport formatting from master to sync up before starting
eileenmcnaugton [Wed, 2 Sep 2015 00:43:06 +0000 (12:43 +1200)]
backport formatting from master to sync up before starting

9 years agoCRM-16514 -- Scheduled reminder for event sends email repeatedly
jitendrapurohit [Tue, 1 Sep 2015 10:38:58 +0000 (16:08 +0530)]
CRM-16514 -- Scheduled reminder for event sends email repeatedly

9 years agoMerge pull request #6634 from monishdeb/CRM-17073
Monish Deb [Tue, 1 Sep 2015 05:41:36 +0000 (11:11 +0530)]
Merge pull request #6634 from monishdeb/CRM-17073

CRM-17073 fix - Merge Household Members Into Their Household on Export

9 years agoCRM-16544 - Select::where() - Less aggressive dedupe
Tim Otten [Tue, 1 Sep 2015 00:59:27 +0000 (17:59 -0700)]
CRM-16544 - Select::where() - Less aggressive dedupe

The where() function attempts to dedupe WHERE clauses, but this could
misbehave when similar clauses are used with different data, and it's been
implicated in a symptom where CiviMail shows irrelevant attachments.

http://civicrm.stackexchange.com/a/5059/93

9 years agoMerge pull request #6437 from jitendrapurohit/CRM-16288
Kurund Jalmi [Mon, 31 Aug 2015 22:41:46 +0000 (15:41 -0700)]
Merge pull request #6437 from jitendrapurohit/CRM-16288

CRM-16288 -- Rebuild Smart Cache Group fails

9 years agoMerge pull request #6623 from PalanteJon/CRM-17108-4.6
Kurund Jalmi [Mon, 31 Aug 2015 22:34:01 +0000 (15:34 -0700)]
Merge pull request #6623 from PalanteJon/CRM-17108-4.6

CRM-17108 - CiviContribute - Fix updating billing details via URL fro…

9 years agoFix field title
Eileen McNaughton [Mon, 31 Aug 2015 20:10:47 +0000 (08:10 +1200)]
Fix field title

9 years agoMerge pull request #6633 from jitendrapurohit/CRM-17112
Kurund Jalmi [Mon, 31 Aug 2015 19:29:08 +0000 (12:29 -0700)]
Merge pull request #6633 from jitendrapurohit/CRM-17112

CRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin

9 years ago--CRM-16542, fixed billing info for paypal pro and express
Pradeep Nayak [Mon, 31 Aug 2015 18:24:25 +0000 (23:54 +0530)]
--CRM-16542, fixed billing info for paypal pro and express

9 years ago--CRM-16542, fixed billing info paypal express
Pradeep Nayak [Mon, 31 Aug 2015 10:16:26 +0000 (15:46 +0530)]
--CRM-16542, fixed billing info paypal express

9 years ago-- CRM-16542, fixed regression for billing block
Pradeep Nayak [Thu, 27 Aug 2015 22:01:40 +0000 (03:31 +0530)]
-- CRM-16542, fixed regression for billing block

----------------------------------------
* CRM-16542: PayPal Express woes on 4.6
  https://issues.civicrm.org/jira/browse/CRM-16542

9 years agominor fix
monishdeb [Mon, 31 Aug 2015 16:18:31 +0000 (21:48 +0530)]
minor fix

9 years agoMerge pull request #6606 from yashodha/CRM-17028
Yashodha Chaku [Mon, 31 Aug 2015 11:02:40 +0000 (16:32 +0530)]
Merge pull request #6606 from yashodha/CRM-17028

CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for…

9 years agoCRM-17028: Yearly and Monthly Repeat Reminders send on every cron for 24 hours
yashodha [Tue, 27 Oct 2015 09:46:30 +0000 (15:16 +0530)]
CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for 24 hours

----------------------------------------
* CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for 24 hours
  https://issues.civicrm.org/jira/browse/CRM-17028

9 years agoCRM-17073 fix - Merge Household Members Into Their Household on Export
monishdeb [Mon, 31 Aug 2015 07:46:04 +0000 (13:16 +0530)]
CRM-17073 fix - Merge Household Members Into Their Household on Export

https://issues.civicrm.org/jira/browse/CRM-17073

9 years agoCRM-17115 and external_identifier for good measure
eileenmcnaugton [Mon, 31 Aug 2015 06:48:42 +0000 (18:48 +1200)]
CRM-17115 and external_identifier for good measure

9 years agoCRM-17115 also add nick_name & addressee_display
eileenmcnaugton [Mon, 31 Aug 2015 06:46:53 +0000 (18:46 +1200)]
CRM-17115 also add nick_name & addressee_display

9 years agoCRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin
jitendrapurohit [Mon, 31 Aug 2015 06:34:57 +0000 (12:04 +0530)]
CRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin

9 years agoMerge pull request #6627 from monishdeb/CRM-16966
Monish Deb [Mon, 31 Aug 2015 05:30:45 +0000 (11:00 +0530)]
Merge pull request #6627 from monishdeb/CRM-16966

CRM-16966 fix - backoffice buildRecur script loads processor incorrec…

9 years agoCRM-17115 also add prefix, suffix etc to participant report
eileenmcnaugton [Mon, 31 Aug 2015 04:36:22 +0000 (16:36 +1200)]
CRM-17115 also add prefix, suffix etc to participant report

9 years agoCRM-17115 extra/ stdise fields on CiviReport
eileenmcnaugton [Mon, 31 Aug 2015 04:13:53 +0000 (16:13 +1200)]
CRM-17115 extra/ stdise fields on CiviReport

9 years agoCRM-17090 fix - Accounting batch filters broken
monishdeb [Sun, 30 Aug 2015 17:56:04 +0000 (23:26 +0530)]
CRM-17090 fix - Accounting batch filters broken

https://issues.civicrm.org/jira/browse/CRM-17090

9 years agoCRM-16966 fix - backoffice buildRecur script loads processor incorrectly (sometimes)
monishdeb [Sat, 29 Aug 2015 20:48:24 +0000 (02:18 +0530)]
CRM-16966 fix - backoffice buildRecur script loads processor incorrectly (sometimes)

https://issues.civicrm.org/jira/browse/CRM-16966

9 years agoMerge pull request #6624 from colemanw/APIExplorer
colemanw [Sat, 29 Aug 2015 01:40:54 +0000 (21:40 -0400)]
Merge pull request #6624 from colemanw/APIExplorer

APIExplorer - allow entering an id in entityRef

9 years agoAPIExplorer - allow entering an id in entityRef
Coleman Watts [Fri, 28 Aug 2015 20:47:42 +0000 (16:47 -0400)]
APIExplorer - allow entering an id in entityRef

9 years agoMerge pull request #6565 from colemanw/CRM-17013
colemanw [Fri, 28 Aug 2015 21:00:46 +0000 (17:00 -0400)]
Merge pull request #6565 from colemanw/CRM-17013

CRM-17013 - Only use submitOnce on fullscreen forms

9 years agoCRM-17108 - CiviContribute - Fix updating billing details via URL from receipt -...
Jon goldberg [Fri, 28 Aug 2015 19:45:21 +0000 (15:45 -0400)]
CRM-17108 - CiviContribute - Fix updating billing details via URL from receipt - 4.6 branch

9 years agoMerge pull request #6621 from colemanw/CRM-17100
colemanw [Fri, 28 Aug 2015 18:51:01 +0000 (14:51 -0400)]
Merge pull request #6621 from colemanw/CRM-17100

CRM-17100 - Fix campaign widget bar color