Dave Greenberg [Wed, 9 Sep 2015 19:12:10 +0000 (12:12 -0700)]
Merge pull request #6709 from pradpnayak/CRM-16906
Crm 16906
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
Seamus Lee [Wed, 9 Sep 2015 02:23:17 +0000 (02:23 +0000)]
CRM-14599 - Exclude deleted contacts from test mailing
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
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
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
monishdeb [Tue, 8 Sep 2015 11:19:12 +0000 (16:49 +0530)]
4.6 Test Failure fix
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
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
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…
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
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
Kurund Jalmi [Sun, 6 Sep 2015 01:11:41 +0000 (18:11 -0700)]
removed echo
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
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
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
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
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
Nicolas Ganivet [Fri, 4 Sep 2015 00:41:47 +0000 (18:41 -0600)]
corrects style issue
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 [Thu, 3 Sep 2015 22:48:32 +0000 (10:48 +1200)]
CRM-17152 fix non-static method called statically
Nicolas Ganivet [Thu, 3 Sep 2015 17:57:13 +0000 (11:57 -0600)]
CRM-17149: full fix
Eileen McNaughton [Thu, 3 Sep 2015 08:20:33 +0000 (20:20 +1200)]
Merge pull request #6658 from eileenmcnaughton/CRM-17120
Crm 17120
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
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
yashodha [Wed, 2 Sep 2015 11:41:48 +0000 (17:11 +0530)]
format fix
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
eileenmcnaugton [Wed, 2 Sep 2015 04:08:06 +0000 (16:08 +1200)]
CRM-17120 enhance test to check honor contact output
eileenmcnaugton [Wed, 2 Sep 2015 04:07:24 +0000 (16:07 +1200)]
minor comment fixes
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
Coleman Watts [Wed, 2 Sep 2015 03:30:53 +0000 (20:30 -0700)]
CRM-17126 - Add js headers for contribution widget
eileenmcnaugton [Wed, 2 Sep 2015 03:23:07 +0000 (15:23 +1200)]
remove unused parameter
eileenmcnaugton [Wed, 2 Sep 2015 03:22:52 +0000 (15:22 +1200)]
Comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 01:10:51 +0000 (13:10 +1200)]
CRM-17120 remove call to uncached getLabel function
eileenmcnaugton [Wed, 2 Sep 2015 00:43:06 +0000 (12:43 +1200)]
backport formatting from master to sync up before starting
jitendrapurohit [Tue, 1 Sep 2015 10:38:58 +0000 (16:08 +0530)]
CRM-16514 -- Scheduled reminder for event sends email repeatedly
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
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
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
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…
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
monishdeb [Mon, 31 Aug 2015 16:18:31 +0000 (21:48 +0530)]
minor fix
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…
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
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
jitendrapurohit [Mon, 31 Aug 2015 06:34:57 +0000 (12:04 +0530)]
CRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin
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…
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
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
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
Coleman Watts [Fri, 28 Aug 2015 20:47:42 +0000 (16:47 -0400)]
APIExplorer - allow entering an id in entityRef
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
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
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
Coleman Watts [Fri, 28 Aug 2015 16:21:23 +0000 (12:21 -0400)]
CRM-17100 - Fix campaign widget bar color
Coleman Watts [Fri, 28 Aug 2015 14:56:41 +0000 (10:56 -0400)]
CRM-17080 - Smarty api cleanup
Monish Deb [Fri, 28 Aug 2015 11:45:24 +0000 (17:15 +0530)]
Merge pull request #6609 from jitendrapurohit/CRM-17094
CRM-17094 -- update amount_level after changing fee selections
Pradeep Nayak [Fri, 28 Aug 2015 09:54:30 +0000 (15:24 +0530)]
CRM-16906, added error message
----------------------------------------
* CRM-16906: Ensure safe chars for Petition cookies
https://issues.civicrm.org/jira/browse/CRM-16906
Pradeep Nayak [Tue, 25 Aug 2015 20:45:58 +0000 (02:15 +0530)]
--CRM-16906, applied Joe's commit https://github.com/civicrm/civicrm-core/commit/
663893bd24126e3c9e89e0f66195805bb71b7a50
Monish Deb [Fri, 28 Aug 2015 05:58:27 +0000 (11:28 +0530)]
Merge pull request #6605 from yashodha/4.6.CRM-17069
CRM-17069: Search for Contribution with campaign causes fatal error
Dave Greenberg [Fri, 28 Aug 2015 00:35:02 +0000 (17:35 -0700)]
Merge pull request #6614 from davecivicrm/CRM-16708
CRM-16708 - Fix Sched Reminder configure link from event dashboard.
Dave Greenberg [Thu, 27 Aug 2015 22:17:34 +0000 (15:17 -0700)]
CRM-16708 - Fix Sched Reminder configure link from event dashboard.
----------------------------------------
* CRM-16708: Link from Event Info page "Configure" menu to Schedule Reminders is incorrect
https://issues.civicrm.org/jira/browse/CRM-16708
colemanw [Thu, 27 Aug 2015 17:11:34 +0000 (13:11 -0400)]
Merge pull request #6599 from colemanw/CRM-16512
CRM-16512 - fix 'view my contact' permission in api acl
Monish Deb [Thu, 27 Aug 2015 13:15:00 +0000 (18:45 +0530)]
Merge pull request #6586 from yashodha/CRM-17069
CRM-17069: Search for Contribution with campaign causes fatal error
jitendrapurohit [Thu, 27 Aug 2015 12:34:55 +0000 (18:04 +0530)]
CRM-17094 -- update amount_level after changing fee selections
yashodha [Thu, 27 Aug 2015 04:33:48 +0000 (10:03 +0530)]
CRM-17069: minor fix
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
yashodha [Thu, 27 Aug 2015 04:20:55 +0000 (09:50 +0530)]
CRM-17069: Search for Contribution with campaign causes fatal error
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
eileenmcnaugton [Wed, 26 Aug 2015 23:53:41 +0000 (11:53 +1200)]
CRM-17092 backport (do not merge) of fix to storing contribution_recur_id
for renewals
Conflicts:
CRM/Member/Form/MembershipRenewal.php
Coleman Watts [Wed, 26 Aug 2015 18:25:51 +0000 (14:25 -0400)]
CRM-16512 - fix 'view my contact' permission in api acl
Eileen McNaughton [Wed, 26 Aug 2015 08:17:16 +0000 (20:17 +1200)]
Merge pull request #6591 from eileenmcnaughton/CRM-16802
CRM-16082 move responsibility for ensuring a domain group exists out …
Eileen McNaughton [Wed, 26 Aug 2015 08:16:11 +0000 (20:16 +1200)]
Merge pull request #6576 from eileenmcnaughton/CRM-17072
CRM-17072 fix timezone handling for UTC dates
Yashodha Chaku [Wed, 26 Aug 2015 06:05:05 +0000 (11:35 +0530)]
Merge pull request #6584 from eileenmcnaughton/CRM-17078
CRM-17078 contribution summary report fatals when custom data included
CiviCRM [Wed, 26 Aug 2015 01:29:37 +0000 (18:29 -0700)]
Update version to 4.6.9
colemanw [Tue, 25 Aug 2015 17:27:47 +0000 (13:27 -0400)]
Merge pull request #6548 from eileenmcnaughton/CRM-16512
CRM-16512 add test to demonstrate breakage from code committed on ticket
colemanw [Tue, 25 Aug 2015 17:26:54 +0000 (13:26 -0400)]
Merge pull request #6558 from colemanw/revert
Revert "CRM-16512 - Fix permission checks on self"
Yashodha Chaku [Tue, 25 Aug 2015 06:38:39 +0000 (12:08 +0530)]
Merge pull request #6582 from eileenmcnaughton/CRM-17077
CRM-17077 pledge form undeifined constant
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
yashodha [Tue, 25 Aug 2015 05:58:47 +0000 (11:28 +0530)]
CRM-17069: Search for Contribution with campaign causes fatal error
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
Eileen McNaughton [Tue, 25 Aug 2015 02:08:24 +0000 (14:08 +1200)]
Merge pull request #6583 from eileenmcnaughton/comment-cleanup
Comment cleanup
eileenmcnaugton [Mon, 24 Aug 2015 23:35:41 +0000 (11:35 +1200)]
CRM-17078 contribution summary report fatals when custom data included
projects / civicrm-core.git / log