Eileen McNaughton [Sun, 7 Aug 2016 06:56:38 +0000 (18:56 +1200)]
Merge pull request #8516 from mlutfy/master-crm18756-2
CRM-18756: TrackableURLOpen: fix SQL parameter escaping convention.
colemanw [Sat, 6 Aug 2016 03:40:36 +0000 (23:40 -0400)]
Merge pull request #8830 from colemanw/debugTpl
Remove debugging comment when not in debug mode
Coleman Watts [Fri, 5 Aug 2016 16:30:23 +0000 (12:30 -0400)]
Remove debugging comment when not in debug mode
Monish Deb [Fri, 5 Aug 2016 13:07:54 +0000 (18:37 +0530)]
Merge pull request #8828 from jitendrapurohit/CRM-19183
CRM-19183 - Remove .pdf extension for dompdf
Yashodha Chaku [Fri, 5 Aug 2016 11:08:13 +0000 (16:38 +0530)]
Merge pull request #8827 from jitendrapurohit/CRM-19176
CRM-19176 - Additional fixes
jitendrapurohit [Fri, 5 Aug 2016 10:57:21 +0000 (16:27 +0530)]
CRM-19183 - Remove .pdf extension for dompdf
jitendrapurohit [Fri, 5 Aug 2016 10:11:49 +0000 (15:41 +0530)]
CRM-19176 - Additional fixes
Monish Deb [Fri, 5 Aug 2016 10:08:27 +0000 (15:38 +0530)]
Merge pull request #8826 from monishdeb/CRM-19182
CRM-19182: Fatal Error while printing 'Thank-you Letter for Contributions (PDF)'
Yashodha Chaku [Fri, 5 Aug 2016 09:16:29 +0000 (14:46 +0530)]
Merge pull request #8804 from yosefromano/master
CRM-19176 Add grouping options for contribution thank you letters
deb.monish [Fri, 5 Aug 2016 07:09:56 +0000 (12:39 +0530)]
CRM-19182: Fatal Error while printing 'Thank-you Letter for Contributions (PDF)'
Monish Deb [Thu, 4 Aug 2016 12:58:49 +0000 (18:28 +0530)]
Merge pull request #8822 from jitendrapurohit/CRM-19171
CRM-19171 - Avoid clearing radio/checkbox values while form reset
Monish Deb [Thu, 4 Aug 2016 12:22:21 +0000 (17:52 +0530)]
Merge pull request #8814 from twomice/CRM-19173
CRM-19173: Strip Bcc header.
jitendrapurohit [Thu, 4 Aug 2016 12:10:38 +0000 (17:40 +0530)]
CRM-19171 - Avoid clearing radio/checkbox values while form reset
Monish Deb [Thu, 4 Aug 2016 12:02:43 +0000 (17:32 +0530)]
Merge pull request #8809 from monishdeb/CRM-19166
CRM-19166: Find Contributions Send Email notice errors
Yashodha Chaku [Thu, 4 Aug 2016 09:29:13 +0000 (14:59 +0530)]
Merge pull request #8818 from seamuslee001/CRM-19177
CRM-19177 Add in privacy flags to the output of print contact records
Yashodha Chaku [Thu, 4 Aug 2016 08:05:04 +0000 (13:35 +0530)]
Merge pull request #8805 from eileenmcnaughton/reports
CRM-19167 add is_deceased filter to contact reports
Seamus Lee [Thu, 4 Aug 2016 05:32:08 +0000 (15:32 +1000)]
CRM-19177 Add in privacy flags to the output of print contact records
Eileen McNaughton [Wed, 3 Aug 2016 23:48:59 +0000 (11:48 +1200)]
Merge pull request #8467 from eileenmcnaughton/groups
CRM-18683 smart group caching fixes (CRM-18683 CRM-18692 CRM-18695)
eileenmcnaugton [Sun, 29 May 2016 22:19:05 +0000 (10:19 +1200)]
CRM-18692 issue warning about empty smart group cache rather than crash the server
eileenmcnaugton [Sun, 29 May 2016 22:15:44 +0000 (10:15 +1200)]
CRM-18683 don't use non transaction-safe function to clear smart group cache.
Note that there is a function elsewhere that allows the code to use truncate where there is no transaction.
I have left that possibility for future consideration as there is some debate over whether truncate is faster on all sites
Allen Shaw [Wed, 3 Aug 2016 17:20:34 +0000 (12:20 -0500)]
CRM-19173: Strip Bcc header.
Joe Murray [Wed, 3 Aug 2016 16:22:46 +0000 (12:22 -0400)]
Merge pull request #8730 from JMAConsulting/CRM-16189-41
[ready-for-core-team-review]CRM-16189, fixed code to check if financial type id is present in $pa…
Monish Deb [Wed, 3 Aug 2016 09:57:11 +0000 (15:27 +0530)]
Merge pull request #8806 from mlutfy/master-crm19168
CRM-19168: Fix membership batch update with profiles that have custom date fields.
deb.monish [Wed, 3 Aug 2016 07:01:37 +0000 (12:31 +0530)]
CRM-19166: Find Contributions Send Email notice errors
Eileen McNaughton [Wed, 3 Aug 2016 06:26:54 +0000 (18:26 +1200)]
Merge pull request #8779 from jitendrapurohit/CRM-19128
CRM-19128 - set default filter to Contributions only
eileen [Wed, 3 Aug 2016 00:34:04 +0000 (12:34 +1200)]
CRM-18060 fix campaign e-notice on lybunt
Mathieu Lutfy [Tue, 2 Aug 2016 23:15:27 +0000 (19:15 -0400)]
CRM-19168: Fix membership batch update with profiles that have custom date fields.
eileen [Tue, 2 Aug 2016 22:47:20 +0000 (10:47 +1200)]
CRM-19167 add is_deceased filter to employee report
eileen [Tue, 2 Aug 2016 22:42:06 +0000 (10:42 +1200)]
CRM-19167 add is_deceased filter to contact detail report
eileen [Tue, 2 Aug 2016 22:38:37 +0000 (10:38 +1200)]
CRM-19167 add is_deceased filter to contact summary report
Yosef Romano [Tue, 2 Aug 2016 22:21:12 +0000 (15:21 -0700)]
Add grouping options for contribution thank you letters
Yosef Romano [Tue, 2 Aug 2016 21:51:14 +0000 (14:51 -0700)]
Add grouping options for contribution thank you letters
Monish Deb [Tue, 2 Aug 2016 19:10:15 +0000 (00:40 +0530)]
Merge pull request #8797 from eileenmcnaughton/super_fn
CRM-19165 Use permission sensitive function to create strip-numeric f…
Monish Deb [Tue, 2 Aug 2016 19:07:02 +0000 (00:37 +0530)]
Merge pull request #8795 from seamuslee001/CRM-19126
CRM-19126 & CRM-19152 add test to prove that tax_amount gets reset on the complet…
Monish Deb [Tue, 2 Aug 2016 14:32:18 +0000 (20:02 +0530)]
Merge pull request #8783 from litespeedmarc/master
CRM-19126: civicrm_line_item.tax_amount incorrectly set when using on…
Monish Deb [Tue, 2 Aug 2016 07:33:44 +0000 (13:03 +0530)]
Merge pull request #8269 from monishdeb/CRM-18427
CRM-18427: Submitted custom data values not reloaded on form when validation fails
Yashodha Chaku [Tue, 2 Aug 2016 07:02:52 +0000 (12:32 +0530)]
Merge pull request #8782 from jitendrapurohit/CRM-18698
CRM-18698 - Fix cid when reassigning case roles
eileen [Tue, 2 Aug 2016 02:42:36 +0000 (14:42 +1200)]
CRM-19165 Use permission sensitive function to create strip-numeric function
colemanw [Mon, 1 Aug 2016 23:04:28 +0000 (19:04 -0400)]
Merge pull request #8586 from JMAConsulting/CRM-16189-17
[ready-for-core-team-review]CRM-16189, added code to validate financial type for contribution
Joe Murray [Mon, 1 Aug 2016 21:56:40 +0000 (17:56 -0400)]
Merge pull request #8732 from JMAConsulting/CRM-16189-42
[ready-for-core-team-review]CRM-16189, added hook to alter deferred revenue items
litspeedmarc [Mon, 1 Aug 2016 14:35:50 +0000 (10:35 -0400)]
CRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment processor
Monish Deb [Mon, 1 Aug 2016 13:20:16 +0000 (18:50 +0530)]
Merge pull request #8757 from seamuslee001/CRM-19129
CRM-19129 Allow Users to Select the From Address used for when sendin…
Monish Deb [Mon, 1 Aug 2016 12:54:29 +0000 (18:24 +0530)]
Merge pull request #8712 from totten/master-wordrep
CRM-18513 - WordReplacements - Load en_US when locale is unspecified
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
Seamus Lee [Mon, 1 Aug 2016 10:27:04 +0000 (20:27 +1000)]
CRM-19126 add test to prove that tax_amount gets reset on the complete transaction call when total amount is not specified
Monish Deb [Mon, 1 Aug 2016 10:26:40 +0000 (15:56 +0530)]
Merge pull request #8733 from PalanteJon/CRM-19111
CRM-19111 - Incoming Email-to-Activity - don't fail on blank email body
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.
Jon goldberg [Fri, 29 Jul 2016 21:41:44 +0000 (17:41 -0400)]
Fix e-notice on CRM-19111
litspeedmarc [Fri, 29 Jul 2016 13:20:46 +0000 (09:20 -0400)]
CRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment processor
jitendrapurohit [Fri, 29 Jul 2016 11:20:34 +0000 (16:50 +0530)]
CRM-18698 - Fix cid when reassigning case roles
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:22:23 +0000 (18:52 +0530)]
CRM-19128 - set default filter to Contributions only
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
Pradeep Nayak [Wed, 27 Jul 2016 15:31:46 +0000 (21:01 +0530)]
CRM-16189, added test fixes
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
francescbassas [Wed, 27 Jul 2016 14:55:57 +0000 (16:55 +0200)]
Fixes Jenkins warnings
Pradeep Nayak [Wed, 27 Jul 2016 14:29:31 +0000 (19:59 +0530)]
CRM-16189, called exception in BAO and catched at form level
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 20 Jul 2016 12:00:18 +0000 (17:30 +0530)]
CRM-16189, fixed code to check if financial type id is present in $params
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
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
Pradeep Nayak [Wed, 27 Jul 2016 13:08:51 +0000 (18:38 +0530)]
CRM-16189, fixed test
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 27 Jul 2016 12:55:32 +0000 (18:25 +0530)]
CRM-16189, updated function to throw exception in BAO and catch in form level
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
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
projects / civicrm-core.git / log