Eileen McNaughton [Thu, 10 Sep 2015 21:54:32 +0000 (09:54 +1200)]
Merge pull request #6570 from eileenmcnaughton/CRM-17023
CRM-12326 quicksearch speed improvements
Yashodha Chaku [Thu, 10 Sep 2015 08:35:09 +0000 (14:05 +0530)]
Merge pull request #6684 from yashodha/CRM-17146
CRM-17146: updating the contribution state in finding contriutions do…
Kurund Jalmi [Thu, 10 Sep 2015 03:16:24 +0000 (08:46 +0530)]
Merge pull request #6716 from PalanteJon/CRM-17193
CRM-17193 - CiviReport - Remove unnecessary spaces from empty CSV cel…
Jon goldberg [Wed, 9 Sep 2015 21:07:20 +0000 (17:07 -0400)]
CRM-17193 - CiviReport - Remove unnecessary spaces from empty CSV cells when exporting reports
Dave Greenberg [Wed, 9 Sep 2015 19:28:33 +0000 (12:28 -0700)]
Merge pull request #6559 from jitendrapurohit/CRM-16877
CRM-16877 -- Include ID when editing 'block' fields (+ allow deletion…
Dave Greenberg [Wed, 9 Sep 2015 19:02:27 +0000 (12:02 -0700)]
Merge pull request #6713 from JKingsnorth/CRM-17187
CRM-17187 - Minor notification message CSS improvement (tables, actio…
Dave Greenberg [Wed, 9 Sep 2015 18:45:11 +0000 (11:45 -0700)]
Merge pull request #6710 from systopia/CRM-17186
CRM-17186: added missing ts-tags
Dave Greenberg [Wed, 9 Sep 2015 17:58:33 +0000 (10:58 -0700)]
Merge pull request #6706 from davecivicrm/CRM-16875
CRM-16875 - reverse join order per Eileens comment.
Kurund Jalmi [Wed, 9 Sep 2015 15:18:52 +0000 (20:48 +0530)]
Merge pull request #6714 from monishdeb/46-merge
4.6 merge-forward
monishdeb [Tue, 8 Sep 2015 11:19:12 +0000 (16:49 +0530)]
4.6 Test Failure fix
jitendrapurohit [Tue, 8 Sep 2015 10:54:39 +0000 (16:24 +0530)]
CRM-17163 - Can not import contributions by matching on email
Guanhuan Chen [Mon, 7 Sep 2015 11:48:34 +0000 (12:48 +0100)]
Apply modifications to invoice templates
Guanhuan Chen [Mon, 7 Sep 2015 11:47:11 +0000 (12:47 +0100)]
Setup upgrade script for default invoice msg template modification
Guanhuan Chen [Mon, 7 Sep 2015 11:32:11 +0000 (12:32 +0100)]
Allow credit note to be downloaded on cancellations
Guanhuan Chen [Mon, 7 Sep 2015 11:25:42 +0000 (12:25 +0100)]
Allow credit note for cancellations
monishdeb [Sat, 5 Sep 2015 08:45:01 +0000 (14:15 +0530)]
= operator fix
monishdeb [Fri, 28 Aug 2015 11:18:34 +0000 (16:48 +0530)]
format fix
monishdeb [Fri, 28 Aug 2015 11:07:37 +0000 (16:37 +0530)]
participant role switch case separation
monishdeb [Thu, 27 Aug 2015 05:14:19 +0000 (10:44 +0530)]
minor fix
monishdeb [Wed, 26 Aug 2015 12:51:16 +0000 (18:21 +0530)]
minor changes for partcipant.Get
monishdeb [Wed, 26 Aug 2015 12:36:56 +0000 (18:06 +0530)]
Participant role fix
monishdeb [Mon, 24 Aug 2015 06:52:23 +0000 (12:22 +0530)]
additional changes
monishdeb [Fri, 21 Aug 2015 10:30:49 +0000 (16:00 +0530)]
tests/phpunit/api/v3/MappingFieldTest.php
eileenmcnaugton [Sat, 5 Sep 2015 04:57:36 +0000 (16:57 +1200)]
test fix - fix dumb error when in test check
eileenmcnaugton [Thu, 3 Sep 2015 23:38:54 +0000 (11:38 +1200)]
CRM-17120 use cached function to retrieve option label
eileenmcnaugton [Thu, 3 Sep 2015 23:37:46 +0000 (11:37 +1200)]
CRM-17120 add test to getFinancialTransactionsList function
eileenmcnaugton [Tue, 25 Aug 2015 06:18:00 +0000 (18:18 +1200)]
fix function comment
eileenmcnaugton [Tue, 25 Aug 2015 05:57:54 +0000 (17:57 +1200)]
CRM-17003 previous commit caused wrong formatting in access tab on report
The issue appeared to be that the re-formatting of administer multisite is happening after the re-formatting
dependent on the parameter being passed in. The function doing the reformatting is apparently only called from
that function so we could move the description processing to the calling function.
NB - need to grep wordpress, joomla, drupal dirs for that fn before making the change I guess,
Or we could just do the stuff twice to be safe
JKingsnorth [Wed, 9 Sep 2015 13:16:08 +0000 (14:16 +0100)]
CRM-17187 - Minor notification message CSS improvement (tables, action links)
yashodha [Wed, 9 Sep 2015 10:56:37 +0000 (16:26 +0530)]
minor fix
thomas [Wed, 9 Sep 2015 10:23:25 +0000 (12:23 +0200)]
added ts-tags
Eileen McNaughton [Wed, 9 Sep 2015 05:16:57 +0000 (17:16 +1200)]
Merge pull request #6693 from eileenmcnaughton/CRM-16195-rebase
CRM-16195 use option values to store relative date filter config
eileenmcnaugton [Mon, 7 Sep 2015 00:18:32 +0000 (12:18 +1200)]
CRM-16195 add option values to sql
-- CRM-16195 add relative values
INSERT INTO civicrm_option_group (, title, is_reserved, is_active)
VALUES ('relative_date_filters','Relative Date Filters', 1, 1);
SELECT @ogid := max(id) from civicrm_option_group where name = 'relative_date_filters';
INSERT INTO civicrm_option_value
(option_group_id, label, value, , weight, is_reserved, is_active)
VALUES
(@ogid, 'Previous 2 Years', 'previous_2.year', 'previous_2.year', 1, 0, 1),
(@ogid, 'Previous 2 Quarters', 'previous_2.quarter', 'previous_2.quarter', 2, 0, 1),
(@ogid, 'Previous 2 Months', 'previous_2.month', 'previous_2.month', 3,0,1),
(@ogid, 'Previous 2 Weeks', 'previous_2.week', 'previous_2.week', 4, 0, 1),
(@ogid, 'Previous 2 Days', 'previous_2.day', 'previous_2.day', 5, 0, 1),
(@ogid, 'Prior to Previous Year', 'previous_before.year', 'previous_before.year', 6, 0, 1),
(@ogid, 'Prior to Previous Quarter', 'previous_before.quarter', 'previous_before.quarter', 7, 0, 1),
(@ogid, 'Prior to Previous Month', 'previous_before.month', 'previous_before.month', 8, 0, 1),
(@ogid, 'Prior to Previous Week', 'previous_before.week', 'previous_before.week', 9, 0, 1),
(@ogid, 'Prior to Previous Day', 'previous_before.day', 'previous_before.day', 10, 0, 1),
(@ogid, 'Previous Year', 'previous.year', 'previous.year', 11, 0, 1),
(@ogid, 'Previous Fiscal Year', 'previous.fiscal_year', 'previous.fiscal_year', 12, 0, 1),
(@ogid, 'Previous Quarter', 'previous.quarter', 'previous.quarter', 13, 0, 1),
(@ogid, 'Previous Month', 'previous.month', 'previous.month', 14, 0, 1),
(@ogid, 'Previous Week', 'previous.week', 'previous.week', 15, 0, 1),
(@ogid, 'To End of Previous Year', 'earlier.year', 'earlier.year', 16, 0, 1),
(@ogid, 'To End of Previous Quarter', 'earlier.quarter', 'earlier.quarter', 17, 0, 1),
(@ogid, 'To End of Previous Month', 'earlier.month', 'earlier.month', 18, 0, 1),
(@ogid, 'To End of Previous Week', 'earlier.week', 'earlier.week', 19, 0, 1),
(@ogid, 'To End of Previous Day', 'earlier.day', 'earlier.day', 20, 0, 1),
(@ogid, 'From End of Previous Year', 'greater_previous.year', 'greater_previous.year', 21, 0, 1),
(@ogid, 'From End of Previous Quarter', 'greater_previous.quarter', 'greater_previous.quarter', 22, 0, 1),
(@ogid, 'From End of Previous Month', 'greater_previous.month', 'greater_previous.month', 23, 0, 1),
(@ogid, 'From End of Previous Week', 'greater_previous.week', 'greater_previous.week', 24, 0, 1),
(@ogid, 'From Start of Current Year', 'greater.year', 'greater.year', 25, 0, 1),
(@ogid, 'From Start of Current Quarter', 'greater.quarter', 'greater.quarter', 26, 0, 1),
(@ogid, 'From Start of Current Month', 'greater.month', 'greater.month', 27, 0, 1),
(@ogid, 'From Start of Current Week', 'greater.week', 'greater.week', 28, 0, 1),
(@ogid, 'From Start of Current Day', 'greater.day', 'greater.day', 29, 0, 1),
(@ogid, 'Current Year to-date', 'current.year', 'current.year', 30, 0, 1),
(@ogid, 'Current Quarter to-date', 'current.quarter', 'current.quarter', 31, 0, 1),
(@ogid, 'Current Month to-date', 'current.month', 'current.month', 32, 0, 1),
(@ogid, 'Current Week to-date', 'current.week', 'current.week', 33, 0, 1),
(@ogid, 'Last 3 Years', 'ending_3.year', 'ending_3.year', 34, 0, 1),
(@ogid, 'Last 2 Years', 'ending_2.year', 'ending_2.year', 35, 0, 1),
(@ogid, 'Last 12 Months', 'ending.year', 'ending.year', 36, 0, 1),
(@ogid, 'Last 3 Months', 'ending.quarter', 'ending.quarter', 37, 0, 1),
(@ogid, 'Last Month', 'ending.month', 'ending.month', 38, 0, 1),
(@ogid, 'Last 7 days', 'ending.week', 'ending.week', 39, 0, 1),
(@ogid, 'Yesterday', 'previous.day', 'previous.day', 40, 0, 1),
(@ogid, 'This Year', 'this.year', 'this.year', 41, 0, 1),
(@ogid, 'This Fiscal Year', 'this.fiscal_year', 'this.fiscal_year', 42, 0, 1),
(@ogid, 'This Quarter', 'this.quarter', 'this.quarter', 43, 0, 1),
(@ogid, 'This Month', 'this.month', 'this.month', 44, 0, 1),
(@ogid, 'This Week', 'this.week', 'this.week', 45, 0, 1),
(@ogid, 'Today', 'this.day', 'this.day', 46, 0, 1),
(@ogid, 'Tomorrow', 'starting.day', 'starting.day', 47, 0, 1),
(@ogid, 'Upcoming 7 days', 'starting.week', 'starting.week', 48, 0, 1),
(@ogid, 'Upcoming Month', 'starting.month', 'starting.month', 49, 0, 1),
(@ogid, 'Upcoming 12 Months', 'starting.year', 'starting.year', 50, 0, 1),
(@ogid, 'To End of Current Year', 'less.year', 'less.year', 51, 0, 1),
(@ogid, 'To End of Current Quarter', 'less.quarter', 'less.quarter', 52, 0, 1),
(@ogid, 'To End of Current Month', 'less.month', 'less.month', 53, 0, 1),
(@ogid, 'To End of Current Week', 'less.week', 'less.week', 54, 0, 1),
(@ogid, 'Next Week', 'next.week', 'next.week', 55, 0, 1),
(@ogid, 'Next Month', 'next.month', 'next.month', 56, 0, 1),
(@ogid, 'Next Quarter', 'next.quarter', 'next.quarter', 57, 0, 1),
(@ogid, 'Next Fiscal Year', 'next.fiscal_year', 'next.fiscal_year', 58, 0, 1),
(@ogid, 'Next Year', 'next.year', 'next.year', 59, 0, 1);
-- CRM-16195 add relative values ends
Jon goldberg [Sun, 6 Sep 2015 22:44:54 +0000 (10:44 +1200)]
CRM-16195 convert relative date search filters to an option value
Dave Greenberg [Tue, 8 Sep 2015 20:35:18 +0000 (13:35 -0700)]
CRM-16875 - reverse join order per Eileens comment.
----------------------------------------
* CRM-16875: Performance of finding contributions not in financial batch
https://issues.civicrm.org/jira/browse/CRM-16875
Dave Greenberg [Tue, 8 Sep 2015 19:47:52 +0000 (12:47 -0700)]
Merge pull request #6694 from seamuslee001/CRM-14308
CRM-14308 Allow for disabling of Smart Group Cache by setting smartGr…
Dave Greenberg [Tue, 8 Sep 2015 19:24:08 +0000 (12:24 -0700)]
Merge pull request #6705 from pradpnayak/CRM-15187
CRM-15187, added checks for financial type and amount
Kurund Jalmi [Tue, 8 Sep 2015 09:46:51 +0000 (15:16 +0530)]
Merge pull request #6360 from monishdeb/search-fixes-master
CRM-16941 - Search Form and api.Get fixes for Contact
Eileen McNaughton [Tue, 8 Sep 2015 05:46:48 +0000 (17:46 +1200)]
Merge pull request #6701 from eileenmcnaughton/master
enotice fix
Yashodha Chaku [Tue, 8 Sep 2015 03:38:39 +0000 (09:08 +0530)]
Merge pull request #6695 from yashodha/CRM-17166
CRM-17166: Multiple PCP contributions overflow box on Chrome
eileenmcnaugton [Mon, 7 Sep 2015 13:09:06 +0000 (01:09 +1200)]
enotice fix
Eileen McNaughton [Mon, 7 Sep 2015 20:52:00 +0000 (08:52 +1200)]
Merge pull request #6696 from eileenmcnaughton/master
fix pass-by-reference
Pradeep Nayak [Mon, 7 Sep 2015 19:19:44 +0000 (00:49 +0530)]
CRM-15187, added checks for financial type and amount
----------------------------------------
* CRM-15187: Accounting implications of Membership Type changes
https://issues.civicrm.org/jira/browse/CRM-15187
eileenmcnaugton [Mon, 7 Sep 2015 11:36:17 +0000 (23:36 +1200)]
fix pass-by-reference
Yashodha Chaku [Mon, 7 Sep 2015 08:03:09 +0000 (13:33 +0530)]
Merge pull request #6689 from Stoob/patch-1
multiple contributions overflow box on Chrome
yashodha [Mon, 7 Sep 2015 06:13:20 +0000 (11:43 +0530)]
CRM-17166: Multiple PCP contributions overflow box on Chrome
----------------------------------------
* CRM-17166: Multiple PCP contributions overflow box on Chrome
https://issues.civicrm.org/jira/browse/CRM-17166
Yashodha Chaku [Mon, 7 Sep 2015 05:05:56 +0000 (10:35 +0530)]
Merge pull request #6682 from monishdeb/CRM-17136
Crm 17136 fix
Seamus Lee [Mon, 7 Sep 2015 00:52:44 +0000 (00:52 +0000)]
CRM-14308 Allow for disabling of Smart Group Cache by setting smartGroupCacheTimout to 0
Stoob [Sun, 6 Sep 2015 03:31:08 +0000 (20:31 -0700)]
multiple contributions overflow box on Chrome
Kurund Jalmi [Sun, 6 Sep 2015 01:13:05 +0000 (18:13 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-05-18-12-52
Kurund Jalmi [Sun, 6 Sep 2015 01:11:41 +0000 (18:11 -0700)]
removed echo
Kurund Jalmi [Sun, 6 Sep 2015 01:07:09 +0000 (18:07 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-05-17-42-45
Conflicts:
CRM/Case/BAO/Query.php
CRM/Member/Form/MembershipRenewal.php
CRM/Utils/Check/Security.php
sql/civicrm_generated.mysql
xml/templates/civicrm_country.tpl
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
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
yashodha [Fri, 4 Sep 2015 09:18:41 +0000 (14:48 +0530)]
CRM-17146: updating the contribution state in finding contriutions does not update the receive date
----------------------------------------
* CRM-17146: updating the contribution state in finding contriutions does not update the receive date
https://issues.civicrm.org/jira/browse/CRM-17146
jitendrapurohit [Fri, 4 Sep 2015 07:14:06 +0000 (12:44 +0530)]
include changes for website block -- CRM-16877
Kurund Jalmi [Fri, 4 Sep 2015 06:00:16 +0000 (23:00 -0700)]
Merge pull request #6683 from kurund/CRM-16719
CRM-16719: test fixes
Kurund Jalmi [Fri, 4 Sep 2015 05:53:47 +0000 (22:53 -0700)]
test fixes
yashodha [Thu, 3 Sep 2015 07:37:12 +0000 (13:07 +0530)]
CRM-17136: Missing PK-PB Province
----------------------------------------
* CRM-17136: Missing PK-PB Province
https://issues.civicrm.org/jira/browse/CRM-17136
gah242s [Wed, 2 Sep 2015 13:18:30 +0000 (09:18 -0400)]
Update 4.7.alpha1.mysql.tpl
CRM-17136 Added Punjab Province for Pakistan
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
----------------------------------------
* CRM-17136: Missing PK-PB Province
https://issues.civicrm.org/jira/browse/CRM-17136
colemanw [Fri, 4 Sep 2015 05:18:05 +0000 (22:18 -0700)]
Merge pull request #6680 from colemanw/cleanup
cleanup explodePadded
Coleman Watts [Fri, 4 Sep 2015 05:17:49 +0000 (22:17 -0700)]
cleanup explodePadded
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
Dave Greenberg [Fri, 4 Sep 2015 04:18:31 +0000 (21:18 -0700)]
Merge pull request #6560 from kurund/CRM-16719-fix
CRM-16719 fixes
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
Kurund Jalmi [Fri, 4 Sep 2015 01:45:30 +0000 (18:45 -0700)]
Merge pull request #6679 from kurund/test-fixes
test fixes
Kurund Jalmi [Fri, 4 Sep 2015 01:43:48 +0000 (18:43 -0700)]
test fixes
Nicolas Ganivet [Fri, 4 Sep 2015 00:41:47 +0000 (18:41 -0600)]
corrects style issue
eileenmcnaugton [Thu, 3 Sep 2015 22:48:32 +0000 (10:48 +1200)]
CRM-17152 fix non-static method called statically
Dave Greenberg [Thu, 3 Sep 2015 22:40:11 +0000 (15:40 -0700)]
Merge pull request #6668 from monishdeb/testFailures
CRM-17130 fix and refactor soft-credit post processing
Dave Greenberg [Thu, 3 Sep 2015 22:11:02 +0000 (15:11 -0700)]
Merge pull request #6662 from mallezie/crm-17134
CRM-17134 Add softcontributions to contribution message template
Eileen McNaughton [Thu, 3 Sep 2015 21:12:04 +0000 (09:12 +1200)]
Merge pull request #6670 from eileenmcnaughton/comments-3
Comments fixes
Dave Greenberg [Thu, 3 Sep 2015 20:45:22 +0000 (13:45 -0700)]
Merge pull request #6671 from pradpnayak/CRM-17145
--CRM-17145, fixed data type for civicrm_activity.details
colemanw [Thu, 3 Sep 2015 19:19:56 +0000 (12:19 -0700)]
Merge pull request #6674 from lcdservices/CRM-17148
CRM-17148 set crm-initial-value for billingcheckbox
Nicolas Ganivet [Thu, 3 Sep 2015 17:57:13 +0000 (11:57 -0600)]
CRM-17149: full fix
Brian Shaughnessy [Thu, 3 Sep 2015 17:12:10 +0000 (13:12 -0400)]
CRM-17148 set crm-initial-value for billingcheckbox
jitendrapurohit [Thu, 3 Sep 2015 13:18:46 +0000 (18:48 +0530)]
additional fixes for CRM-16877
Pradeep Nayak [Thu, 3 Sep 2015 08:54:02 +0000 (14:24 +0530)]
--CRM-17145, fixed data type for civicrm_activity.details
eileenmcnaugton [Thu, 3 Sep 2015 08:38:35 +0000 (20:38 +1200)]
comment fixes
eileenmcnaugton [Thu, 3 Sep 2015 08:33:47 +0000 (20:33 +1200)]
comment fixes
Eileen McNaughton [Thu, 3 Sep 2015 08:20:33 +0000 (20:20 +1200)]
Merge pull request #6658 from eileenmcnaughton/CRM-17120
Crm 17120
Monish Deb [Thu, 3 Sep 2015 08:02:51 +0000 (13:32 +0530)]
Merge pull request #6337 from jitendrapurohit/CRM-16792master
CRM-16792 - Report: Contrib Summary when soft credit stats and filter…
Eileen McNaughton [Thu, 3 Sep 2015 07:58:51 +0000 (19:58 +1200)]
Merge pull request #6601 from colemanw/CRM-16974
CRM-16974 - Disable amounts section of contribution page when enabling member price set
monishdeb [Thu, 3 Sep 2015 07:47:33 +0000 (13:17 +0530)]
format fix
monishdeb [Thu, 3 Sep 2015 07:29:13 +0000 (12:59 +0530)]
CRM-17130 fix and refactor soft-credit post processing
----------------------------------------
* CRM-17130: Soft Credit Info Wiped When Recording Credit Card Contribution
https://issues.civicrm.org/jira/browse/CRM-17130
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…
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
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…
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
eileenmcnaugton [Wed, 2 Sep 2015 20:10:57 +0000 (08:10 +1200)]
mark function as deprecated
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
Eileen McNaughton [Wed, 2 Sep 2015 19:57:34 +0000 (07:57 +1200)]
Merge pull request #6664 from eileenmcnaughton/comments-3
Comments 3
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
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
eileenmcnaugton [Wed, 2 Sep 2015 12:47:36 +0000 (00:47 +1200)]
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:45:16 +0000 (00:45 +1200)]
comment fixes
Eileen McNaughton [Wed, 2 Sep 2015 12:42:50 +0000 (00:42 +1200)]
Merge pull request #6663 from eileenmcnaughton/comments-3
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:32:37 +0000 (00:32 +1200)]
comment fixes
jenkins seems to spit the dummy at these but the issue appears to be php5.5 style code
which is fine here, rather than the change
yashodha [Wed, 2 Sep 2015 11:41:48 +0000 (17:11 +0530)]
format fix
Tim Mallezie [Wed, 2 Sep 2015 09:55:07 +0000 (11:55 +0200)]
CRM-17134 Add softcontributions to contribution message template
projects / civicrm-core.git / log