Seamus Lee [Mon, 1 Aug 2016 12:21:17 +0000 (22:21 +1000)]
remove duplicate code
Seamus Lee [Mon, 1 Aug 2016 12:09:59 +0000 (22:09 +1000)]
Reset contactIds variable as gets set incorrectly in preProcessFromAddress
Seamus Lee [Mon, 1 Aug 2016 11:30:30 +0000 (21:30 +1000)]
Fix up cleaning out array of from emails and avoid execption as found by Jitendra
Seamus Lee [Sat, 30 Jul 2016 00:13:52 +0000 (10:13 +1000)]
CRM-19129 Fix issue where no contact emails are found and split out generating of domain emails into own function so can be tested
Seamus Lee [Fri, 29 Jul 2016 21:14:12 +0000 (07:14 +1000)]
Remove duplicated code and add a note about what this is all about
Seamus Lee [Tue, 26 Jul 2016 04:28:27 +0000 (14:28 +1000)]
CRM-19129 Allow Users to Select the From Address used for when sending Email Receipts
Eileen McNaughton [Mon, 1 Aug 2016 06:02:19 +0000 (18:02 +1200)]
Merge pull request #8794 from totten/master-getContactGroup
CRM-18472 - CRM_Contact_BAO_GroupContact - Remove erroneous references
Tim Otten [Mon, 1 Aug 2016 02:47:31 +0000 (19:47 -0700)]
CRM-18472 - CRM_Contact_BAO_GroupContact - Remove erroneous references
These lines are attempting to accept a return-value by reference, but the
function does not return by reference. In PHP 5.3+, this is effectively
not a reference; and in PHP 5.4+, it generates a warning. That leads
to test failures in CRM_Contact_BAO_ContactTest::testCreateProfileContact.
Tim Otten [Mon, 1 Aug 2016 01:35:29 +0000 (18:35 -0700)]
Merge pull request #8792 from totten/master-setDefaultCallback
CRM-17789 - CRM_Core_Error - Adjust setDefaultCallback() sig
Tim Otten [Mon, 1 Aug 2016 00:58:02 +0000 (17:58 -0700)]
CRM-17789 - CRM_Core_Error - Adjust setDefaultCallback() sig
The definitions of PEAR_ErrorStack::setDefaultCallback() are slightly
different in PEAR 1.9.0 and PEAR 1.10.0. The older one is *implicitly*
static (which, in some deployments of PHP, produces a warning); while the
newer one is *explicitly* static.
This code should work with either signature without warnings.
Tim Otten [Sat, 30 Jul 2016 03:02:34 +0000 (20:02 -0700)]
Merge pull request #8790 from totten/master-php7-syntax
CRM-17789 - PHP 7 - Cherrypick syntax fixes
Mattias Michaux [Wed, 25 May 2016 19:20:37 +0000 (21:20 +0200)]
Fixed additional php7 incompatible code + correctly called parent constructors.
Monish Deb [Fri, 29 Jul 2016 05:35:27 +0000 (11:05 +0530)]
Merge pull request #8718 from alifrumin/CRM-19099
CRM-19099: Adding altermailparams and altermailcontent hooks to receipts
Monish Deb [Fri, 29 Jul 2016 04:46:57 +0000 (10:16 +0530)]
Merge pull request #8776 from ggrzywna/CRM-19134
CRM-19134 - Missing French overseas departments.
Eileen McNaughton [Thu, 28 Jul 2016 22:19:46 +0000 (10:19 +1200)]
Merge pull request #8774 from eileenmcnaughton/report
Report enhancements
Monish Deb [Thu, 28 Jul 2016 14:36:38 +0000 (20:06 +0530)]
Merge pull request #8772 from monishdeb/CRM-19133
CRM-19133: added unit test [#8767 follow-up]
jitendrapurohit [Thu, 28 Jul 2016 13:09:56 +0000 (18:39 +0530)]
minor fix
jitendrapurohit [Thu, 28 Jul 2016 12:59:06 +0000 (18:29 +0530)]
Additional Fix found during QA
deb.monish [Wed, 27 Jul 2016 14:23:10 +0000 (19:53 +0530)]
CRM-19133: added unit test [follow-up PR]
Monish Deb [Thu, 28 Jul 2016 12:03:44 +0000 (17:33 +0530)]
Merge pull request #8767 from francescbassas/patch-4
CRM-19133 Unassigning contact subtype for a custom group causes data loss
Monish Deb [Thu, 28 Jul 2016 10:57:36 +0000 (16:27 +0530)]
Merge pull request #8777 from monishdeb/CRM-19135
CRM-19135: preferred_mail_format not selecting translated labels in international versions
Grzegorz Grzywna [Thu, 28 Jul 2016 10:34:35 +0000 (12:34 +0200)]
CRM-19134 - Missing French overseas departments.
Moved db upgrade script to 4.7.11
deb.monish [Thu, 28 Jul 2016 09:33:14 +0000 (15:03 +0530)]
CRM-19135: preferred_mail_format not selecting translated labels in international versions
Grzegorz Grzywna [Thu, 28 Jul 2016 08:55:30 +0000 (10:55 +0200)]
CRM-19134 - Missing French overseas departments.
Monish Deb [Thu, 28 Jul 2016 08:42:39 +0000 (14:12 +0530)]
Merge pull request #8756 from xurizaemon/CRM-19131
CRM-19131. Only set source contact ID if we got a value for it.
eileen [Thu, 28 Jul 2016 05:59:11 +0000 (17:59 +1200)]
Fix typo
eileen [Thu, 28 Jul 2016 02:14:16 +0000 (14:14 +1200)]
Fix for intermittent test failure
eileen [Thu, 28 Jul 2016 00:00:44 +0000 (12:00 +1200)]
CRM-19140 - Add day to the grouping options on contribution summary report
eileen [Wed, 27 Jul 2016 23:46:57 +0000 (11:46 +1200)]
CRM-19137 - Add source as a filter on the contribution details report
Eileen McNaughton [Wed, 27 Jul 2016 23:31:30 +0000 (11:31 +1200)]
Merge pull request #8762 from eileenmcnaughton/xml
[NFC] CRM-19132 add html type to contribution_recur fields
francescbassas [Wed, 27 Jul 2016 14:55:57 +0000 (16:55 +0200)]
Fixes Jenkins warnings
francescbassas [Wed, 27 Jul 2016 14:30:34 +0000 (16:30 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
Joe Murray [Wed, 27 Jul 2016 14:30:22 +0000 (10:30 -0400)]
Merge pull request #8594 from JMAConsulting/CRM-18977
CRM-18977, fixed code to invoke method in parent class
francescbassas [Wed, 27 Jul 2016 11:15:34 +0000 (13:15 +0200)]
Fixes Jenkins warnings
Monish Deb [Wed, 27 Jul 2016 10:47:23 +0000 (16:17 +0530)]
Merge pull request #8765 from PalanteJon/CRM-19115
CRM-19115 - Always set the MySQL timezone offset before checking for …
francescbassas [Wed, 27 Jul 2016 10:20:10 +0000 (12:20 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
Monish Deb [Wed, 27 Jul 2016 04:35:36 +0000 (10:05 +0530)]
Merge pull request #8744 from jitendrapurohit/CRM-19054
CRM-19054: Update Related Components when status updated from Profile…
colemanw [Wed, 27 Jul 2016 03:36:05 +0000 (23:36 -0400)]
Merge pull request #8763 from colemanw/communityMessagesUrl
Add default communityMessagesUrl setting
Coleman Watts [Tue, 26 Jul 2016 19:49:41 +0000 (15:49 -0400)]
Add default communityMessagesUrl setting
Eileen McNaughton [Wed, 27 Jul 2016 01:03:12 +0000 (13:03 +1200)]
Merge pull request #8759 from seamuslee001/CRM-16923
CRM-16923 Fix Enotice error by setting payment Processor id
francescbassas [Tue, 26 Jul 2016 22:28:43 +0000 (00:28 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
francescbassas [Tue, 26 Jul 2016 22:24:28 +0000 (00:24 +0200)]
CRM-19133 Unassigning contact subtype for a custom group causes data loss
Jon goldberg [Tue, 26 Jul 2016 21:03:42 +0000 (17:03 -0400)]
CRM-19115 - Always set the MySQL timezone offset before checking for PHP/MySQL time mismatch
eileenmcnaugton [Tue, 26 Jul 2016 12:19:00 +0000 (00:19 +1200)]
CRM-19132 add html type to contribution_recur fields
jitendrapurohit [Tue, 26 Jul 2016 11:58:47 +0000 (17:28 +0530)]
move updateRelatedComponent to BAO
Seamus Lee [Tue, 26 Jul 2016 05:50:40 +0000 (15:50 +1000)]
Fix up settting of input value
Seamus Lee [Tue, 26 Jul 2016 05:21:46 +0000 (15:21 +1000)]
Shift to Single Value Query as suggested by Eileen
Seamus Lee [Tue, 26 Jul 2016 05:06:55 +0000 (15:06 +1000)]
CRM-16923 Fix Enotice error by setting payment Processor id
Chris Burgess [Tue, 26 Jul 2016 04:19:20 +0000 (16:19 +1200)]
CRM-19131. Only set source contact ID if we got a value for it.
Eileen McNaughton [Mon, 25 Jul 2016 23:52:33 +0000 (11:52 +1200)]
Merge pull request #8219 from colemanw/CRM-18004
CRM-18004 - IDS: Fix undefined index & code cleanup
colemanw [Mon, 25 Jul 2016 19:54:14 +0000 (15:54 -0400)]
Merge pull request #8745 from twomice/CRM-19120
CRM-19120: Fix display of chain-select fields in event cart.
Eileen McNaughton [Mon, 25 Jul 2016 06:26:30 +0000 (18:26 +1200)]
Merge pull request #8749 from seamuslee001/CRM-18267
CRM-18267 Upgrade dom pdf to update php-font-lib
Monish Deb [Sun, 24 Jul 2016 17:50:51 +0000 (23:20 +0530)]
Merge pull request #8729 from jitendrapurohit/CRM-18528-tests
CRM-18528 - unit test to check group filter
Seamus Lee [Sun, 24 Jul 2016 02:14:21 +0000 (12:14 +1000)]
Fix setting of is remote enabled to work with DomPDF 0.7.0
Seamus Lee [Sat, 23 Jul 2016 05:20:54 +0000 (15:20 +1000)]
Update dompdf code in PDF/Utils to match upgraded dompdf code
Seamus Lee [Sat, 23 Jul 2016 05:02:50 +0000 (15:02 +1000)]
Upgrade dom pdf to update php-font-lib
Tim Otten [Sat, 23 Jul 2016 00:34:56 +0000 (17:34 -0700)]
Merge pull request #8739 from totten/master-no-pear-2
(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter
Tim Otten [Sat, 23 Jul 2016 00:21:31 +0000 (17:21 -0700)]
Merge pull request #8746 from seamuslee001/CRM-19118
CRM-19118 Fix Syntax Confromance test by specifiy data for children a…
Seamus Lee [Fri, 22 Jul 2016 22:51:45 +0000 (08:51 +1000)]
Remove silly character
Seamus Lee [Fri, 22 Jul 2016 22:23:11 +0000 (08:23 +1000)]
CRM-19118 Fix Syntax Confromance test by specifiy data for children and parent fields when generating test data
Allen Shaw [Fri, 22 Jul 2016 20:50:28 +0000 (15:50 -0500)]
CRM-19120: Fix display of chain-select fields in event cart.
Monish Deb [Fri, 22 Jul 2016 18:32:53 +0000 (00:02 +0530)]
Merge pull request #8740 from jitendrapurohit/CRM-19110
CRM-19110: Fix delete pledge payments
Pradeep Nayak [Wed, 22 Jun 2016 00:36:21 +0000 (06:06 +0530)]
CRM-18977, modified code to set alias for civicrm_line_item table
----------------------------------------
* CRM-18977: Contribution reports fails when Financial ACL is enabled
https://issues.civicrm.org/jira/browse/CRM-18977
Pradeep Nayak [Fri, 17 Jun 2016 22:03:56 +0000 (03:33 +0530)]
CRM-18977, fixed code to invoke method in parent class
----------------------------------------
* CRM-18977: Contribution reports fails when Financial ACL is enabled
https://issues.civicrm.org/jira/browse/CRM-18977
jitendrapurohit [Fri, 22 Jul 2016 13:18:38 +0000 (18:48 +0530)]
CRM-19054: Update Related Components when status updated from Profile Task
jitendrapurohit [Fri, 22 Jul 2016 11:33:40 +0000 (17:03 +0530)]
set permission to pass group filter test
Monish Deb [Fri, 22 Jul 2016 10:22:58 +0000 (15:52 +0530)]
Merge pull request #8728 from yashodha/CRM-18591
CRM-18591: group_type parameter ignored when using API to create group
yashodha [Fri, 22 Jul 2016 07:24:11 +0000 (12:54 +0530)]
CRM-18591: add test
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
yashodha [Wed, 20 Jul 2016 12:16:50 +0000 (17:46 +0530)]
CRM-18591: support for single value passed through api
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
yashodha [Wed, 20 Jul 2016 09:04:47 +0000 (14:34 +0530)]
CRM-18591: group_type parameter ignored when using API to create group
----------------------------------------
* CRM-18591: group_type parameter ignored when using API to create group
https://issues.civicrm.org/jira/browse/CRM-18591
jitendrapurohit [Fri, 22 Jul 2016 07:03:02 +0000 (12:33 +0530)]
CRM-19110: Fix delete pledge payments
Yashodha Chaku [Fri, 22 Jul 2016 04:19:18 +0000 (09:49 +0530)]
Merge pull request #8736 from yashodha/fix-version
Set version to 4.7.11
Tim Otten [Thu, 21 Jul 2016 18:51:27 +0000 (11:51 -0700)]
(NFC) CRM_Core_CodeGen_Util_Template - Remove PEAR formatting filter
This filter has several issues:
* Fundamentally, we don't use PEAR style guide - we're closer to Drupal style guide.
* Its only practical effect is to move squiggly braces... to the wrong place.
* It tangentially pulls in PEAR dependencies.
* It adds a ~4 seconds to GenCode (as measured on my laptop).
Joe Murray [Thu, 21 Jul 2016 18:49:36 +0000 (14:49 -0400)]
Merge pull request #8737 from JMAConsulting/CRM-16189-43
[ready-for-core-team-review]CRM-16189, changed url for Deferred Revenue report
Pradeep Nayak [Thu, 21 Jul 2016 10:37:09 +0000 (16:07 +0530)]
CRM-16189, changed url for Deferred Revenue report
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
yashodha [Thu, 21 Jul 2016 10:29:27 +0000 (15:59 +0530)]
Set version to 4.7.11
Monish Deb [Wed, 20 Jul 2016 20:47:54 +0000 (02:17 +0530)]
Merge pull request #8717 from monishdeb/CRM-19094
CRM-19094: cid=0 membership contribution form can overwrite data of an existing membership
Eileen McNaughton [Wed, 20 Jul 2016 20:36:18 +0000 (08:36 +1200)]
Merge pull request #8731 from JKingsnorth/CRM-19108
[NFC] CRM-19108: Fix incorrect case on CRM_Utils_array
Joe Murray [Wed, 20 Jul 2016 20:29:39 +0000 (16:29 -0400)]
Merge pull request #8727 from jitendrapurohit/CRM-19100
CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8
JKingsnorth [Wed, 20 Jul 2016 12:33:37 +0000 (13:33 +0100)]
CRM-19108: Fix incorrect case on CRM_Utils_array
Yashodha Chaku [Wed, 20 Jul 2016 12:01:47 +0000 (17:31 +0530)]
Merge pull request #8711 from JMAConsulting/CRM-16189-37
[ready-for-core-team-review] CRM-16189, fixed code to add entries in civicrm_entity_financial_tr…
Eileen McNaughton [Wed, 20 Jul 2016 11:40:21 +0000 (23:40 +1200)]
Merge pull request #8695 from eileenmcnaughton/address_tests
CRM-19076 Multiple Merge tests + fix for lost address
Monish Deb [Wed, 20 Jul 2016 11:09:52 +0000 (16:39 +0530)]
Merge pull request #8706 from jitendrapurohit/CRM-19053
CRM-19053 - Fix Source Message for Pending Contribution
eileen [Wed, 20 Jul 2016 03:10:25 +0000 (15:10 +1200)]
CRM-19076 add tests for emails on merge
jitendrapurohit [Wed, 20 Jul 2016 10:12:12 +0000 (15:42 +0530)]
use defined functions
Edsel [Wed, 20 Jul 2016 07:56:10 +0000 (13:26 +0530)]
CRM-16189 Renamed param
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
jitendrapurohit [Wed, 20 Jul 2016 07:33:09 +0000 (13:03 +0530)]
CRM-19100: 4.7.8 SQL Incremental Update May Fail for UTF8
Eileen McNaughton [Wed, 20 Jul 2016 03:12:44 +0000 (15:12 +1200)]
Merge pull request #8726 from colemanw/CRM-17606
CRM-17606 - Create documents from Find Cases search result
Coleman Watts [Wed, 20 Jul 2016 00:22:10 +0000 (20:22 -0400)]
CRM-17606 - Fix js bug due to nonstandard form class name
jitendrapurohit [Fri, 24 Jun 2016 06:07:41 +0000 (11:37 +0530)]
label fix
jitendrapurohit [Wed, 25 May 2016 04:44:45 +0000 (10:14 +0530)]
indent and title fix
jitendrapurohit [Mon, 23 May 2016 11:22:54 +0000 (16:52 +0530)]
CRM-17606 - Create multiple documents from Find Cases search result
colemanw [Tue, 19 Jul 2016 23:30:49 +0000 (19:30 -0400)]
Merge pull request #8725 from colemanw/CRM-17608
CRM-17608 - Merge document form tweaks
Coleman Watts [Tue, 19 Jul 2016 22:04:06 +0000 (18:04 -0400)]
CRM-17608 - Merge document form tweaks
colemanw [Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)]
Merge pull request #8474 from monishdeb/CRM-17608
CRM-17608: Merge to DOCx or ODT template
Coleman Watts [Tue, 19 Jul 2016 17:00:30 +0000 (13:00 -0400)]
Fix capitalization
Alice Frumin [Tue, 19 Jul 2016 16:04:46 +0000 (12:04 -0400)]
updating foreach of smarty elements to work with mailContent array
Alice Frumin [Tue, 19 Jul 2016 14:04:03 +0000 (10:04 -0400)]
changing all mailingContent to mailContent
Monish Deb [Tue, 19 Jul 2016 10:41:42 +0000 (16:11 +0530)]
Merge pull request #8720 from yashodha/CRM-18472
CRM-18472: fix notice
eileen [Tue, 19 Jul 2016 00:27:01 +0000 (12:27 +1200)]
CRM-19076 Add tests for phones on merge
It turned out these were losing data too.....
projects / civicrm-core.git / log