civicrm-core.git
9 years agoCRM-15626 fix - Relationship Create Widget Not always showing the correct available...
monishdeb [Tue, 9 Dec 2014 13:49:18 +0000 (19:19 +0530)]
CRM-15626 fix - Relationship Create Widget Not always showing the correct available relationships in select tool

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

9 years agoMerge pull request #4657 from monishdeb/CRM-14512
Kurund Jalmi [Tue, 9 Dec 2014 10:10:40 +0000 (15:40 +0530)]
Merge pull request #4657 from monishdeb/CRM-14512

Crm 14512

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51
kurund [Tue, 9 Dec 2014 09:23:16 +0000 (14:53 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51

Conflicts:
CRM/Core/BAO/ActionSchedule.php
templates/CRM/Core/BillingBlock.tpl

9 years agoMerge pull request #4685 from davecivicrm/CRM-4193
Dave Greenberg [Tue, 9 Dec 2014 02:00:12 +0000 (18:00 -0800)]
Merge pull request #4685 from davecivicrm/CRM-4193

CRM-4193 - current employer dupe match should use Unsupervised rule.

9 years agoCRM-4193 - current employer dupe match should use Unsupervised rule.
Dave Greenberg [Tue, 9 Dec 2014 00:37:25 +0000 (16:37 -0800)]
CRM-4193 - current employer dupe match should use Unsupervised rule.

----------------------------------------
* CRM-4193:
  https://issues.civicrm.org/jira/browse/CRM-4193

9 years agoMerge pull request #4677 from colemanw/CRM-15495
Dave Greenberg [Mon, 8 Dec 2014 21:47:28 +0000 (13:47 -0800)]
Merge pull request #4677 from colemanw/CRM-15495

CRM-15495 - Add filtering control to entityRef widget

9 years agoMerge pull request #4679 from davecivicrm/CRM-13611
Dave Greenberg [Mon, 8 Dec 2014 19:29:40 +0000 (11:29 -0800)]
Merge pull request #4679 from davecivicrm/CRM-13611

CRM-13611 - Improvements to tab titles. Add {ts} to tab href titles and ...

9 years agoCRM-13611 - Improvements to tab titles. Add {ts} to tab href titles and make them...
Dave Greenberg [Mon, 8 Dec 2014 19:28:32 +0000 (11:28 -0800)]
CRM-13611 - Improvements to tab titles. Add {ts} to tab href titles and make them consistent.

----------------------------------------
* CRM-13611:
  https://issues.civicrm.org/jira/browse/CRM-13611

9 years agoMerge pull request #4678 from colemanw/CRM-13611
Dave Greenberg [Mon, 8 Dec 2014 18:47:17 +0000 (10:47 -0800)]
Merge pull request #4678 from colemanw/CRM-13611

CRM-13611 - Hide tab content if report has rows

9 years agoMerge pull request #4676 from rohankatkar/CRM_14988
Monish Deb [Mon, 8 Dec 2014 10:30:29 +0000 (16:00 +0530)]
Merge pull request #4676 from rohankatkar/CRM_14988

CRM-14988 URL encoding error

9 years agoMerge pull request #4672 from jitendrapurohit/CRM-15671
Monish Deb [Mon, 8 Dec 2014 06:29:32 +0000 (11:59 +0530)]
Merge pull request #4672 from jitendrapurohit/CRM-15671

CRM-15671 Fix sendSMS() field names don't match - message doesn't send

9 years agoMerge pull request #4674 from atif-shaikh/CRM-11993
Monish Deb [Mon, 8 Dec 2014 06:13:30 +0000 (11:43 +0530)]
Merge pull request #4674 from atif-shaikh/CRM-11993

Crm 11993

9 years agoCRM-11993 - Onchange locale(Language Switcher) reload on the same page
atif-shaikh [Mon, 8 Dec 2014 04:53:54 +0000 (10:23 +0530)]
CRM-11993 - Onchange locale(Language Switcher) reload on the same page

----------------------------------------
* CRM-11993: Few bugs on switching language
  https://issues.civicrm.org/jira/browse/CRM-11993

9 years agoCRM-13611 - Hide tab content if report has rows
Coleman Watts [Sat, 6 Dec 2014 21:20:27 +0000 (16:20 -0500)]
CRM-13611 - Hide tab content if report has rows

9 years agoEntityRef tag-related code cleanup
Coleman Watts [Sat, 6 Dec 2014 02:11:46 +0000 (21:11 -0500)]
EntityRef tag-related code cleanup

9 years agoCRM-15495 - Add filtering control to entityRef widget
Coleman Watts [Thu, 4 Dec 2014 20:15:22 +0000 (15:15 -0500)]
CRM-15495 - Add filtering control to entityRef widget

9 years agoMerge pull request #4671 from davecivicrm/CRM-15407a
Dave Greenberg [Fri, 5 Dec 2014 18:35:13 +0000 (10:35 -0800)]
Merge pull request #4671 from davecivicrm/CRM-15407a

CRM-15407 - add fee amount to Dummy transaction.

9 years agoMerge pull request #4665 from colemanw/CRM-15689
colemanw [Fri, 5 Dec 2014 15:12:47 +0000 (10:12 -0500)]
Merge pull request #4665 from colemanw/CRM-15689

CRM-15689 - Fix js error in dateField initialization

9 years agoCRM-14988 URL encoding error
Rohan Katkar [Fri, 5 Dec 2014 13:47:05 +0000 (19:17 +0530)]
CRM-14988 URL encoding error

9 years agoMerge pull request #4675 from jitendrapurohit/CRM-15691
Monish Deb [Fri, 5 Dec 2014 13:36:50 +0000 (19:06 +0530)]
Merge pull request #4675 from jitendrapurohit/CRM-15691

CRM-15691 fix for Mailing Labels pulling incorrect address when location...

9 years agooptimised modification
jitendrapurohit [Fri, 5 Dec 2014 12:54:31 +0000 (18:24 +0530)]
optimised modification

9 years agoCRM-15691 fix for Mailing Labels pulling incorrect address when location type other...
jitendrapurohit [Fri, 5 Dec 2014 11:26:24 +0000 (16:56 +0530)]
CRM-15691 fix for Mailing Labels pulling incorrect address when location type other than Home or Primary requested

9 years agoCRM-11993 - QA fix
atif-shaikh [Fri, 5 Dec 2014 10:27:51 +0000 (15:57 +0530)]
CRM-11993 - QA fix

----------------------------------------
* CRM-11993: Few bugs on switching language
  https://issues.civicrm.org/jira/browse/CRM-11993

9 years agoMerge pull request #4673 from yashodha/4.6
Yashodha Chaku [Fri, 5 Dec 2014 10:11:57 +0000 (15:41 +0530)]
Merge pull request #4673 from yashodha/4.6

CRM-15690 : Merge UI - show text in place of id for gender and employer

9 years agoCRM-15690 : Merge UI - show text in place of id for gender and employer
CiviCRM [Fri, 5 Dec 2014 10:09:50 +0000 (15:39 +0530)]
CRM-15690 : Merge UI - show text in place of id for gender and employer

9 years agoCRM-11993 Fixes - Few bugs on switching language
atif-shaikh [Fri, 5 Dec 2014 09:51:40 +0000 (15:21 +0530)]
CRM-11993 Fixes - Few bugs on switching language

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

9 years agoGet the default language from database not from current viewing language
samuelsov [Thu, 25 Sep 2014 21:49:27 +0000 (17:49 -0400)]
Get the default language from database not from current viewing language

Conflicts:
CRM/Core/BAO/ConfigSetting.php

9 years agoRemove the multiplication of lcMessages in url when switching language
samuelsov [Thu, 25 Sep 2014 21:29:45 +0000 (17:29 -0400)]
Remove the multiplication of lcMessages in url when switching language

9 years agoMerge pull request #4637 from eileenmcnaughton/CRM-15670
Yashodha Chaku [Fri, 5 Dec 2014 07:17:42 +0000 (12:47 +0530)]
Merge pull request #4637 from eileenmcnaughton/CRM-15670

CRM-15670 Allow overriding of privacy settings & updating of receive_dat...

9 years agoCRM-15671 Fix sendSMS() field names don't match - message doesn't send
jitendrapurohit [Fri, 5 Dec 2014 07:00:25 +0000 (12:30 +0530)]
CRM-15671 Fix sendSMS() field names don't match - message doesn't send

9 years agoMerge pull request #4667 from eileenmcnaughton/whitespace
Eileen McNaughton [Fri, 5 Dec 2014 02:39:39 +0000 (15:39 +1300)]
Merge pull request #4667 from eileenmcnaughton/whitespace

whitepace y, std is => array( on same line,

9 years agoCRM-15407 - add fee amount to Dummy transaction.
Dave Greenberg [Fri, 5 Dec 2014 00:54:47 +0000 (16:54 -0800)]
CRM-15407 - add fee amount to Dummy transaction.

----------------------------------------
* CRM-15407:
  https://issues.civicrm.org/jira/browse/CRM-15407

9 years agoMerge pull request #4670 from civicrm/revert-4669-CRM-15407
Dave Greenberg [Fri, 5 Dec 2014 00:53:07 +0000 (16:53 -0800)]
Merge pull request #4670 from civicrm/revert-4669-CRM-15407

Revert "CRM-15407 - add fee amount to Dummy transaction."

9 years agoRevert "CRM-15407 - add fee amount to Dummy transaction."
Dave Greenberg [Fri, 5 Dec 2014 00:52:34 +0000 (16:52 -0800)]
Revert "CRM-15407 - add fee amount to Dummy transaction."

9 years agoMerge pull request #4669 from davecivicrm/CRM-15407
Dave Greenberg [Fri, 5 Dec 2014 00:51:02 +0000 (16:51 -0800)]
Merge pull request #4669 from davecivicrm/CRM-15407

CRM-15407 - add fee amount to Dummy transaction.

9 years agoCRM-15407 - add fee amount to Dummy transaction.
Dave Greenberg [Fri, 5 Dec 2014 00:49:38 +0000 (16:49 -0800)]
CRM-15407 - add fee amount to Dummy transaction.

----------------------------------------
* CRM-15407:
  https://issues.civicrm.org/jira/browse/CRM-15407

9 years agoMerge pull request #4553 from giant-rabbit/findById
Tim Otten [Thu, 4 Dec 2014 23:06:49 +0000 (15:06 -0800)]
Merge pull request #4553 from giant-rabbit/findById

Add a new findById DAO method.

9 years agowhitepace y, std is => array( on same line,
Eileen McNaughton [Thu, 4 Dec 2014 21:54:07 +0000 (10:54 +1300)]
whitepace y, std is => array( on same line,
Reports have always been all over the place on this leading to PRs often going stale

9 years agoMerge pull request #4666 from davecivicrm/CRM-15180
Dave Greenberg [Thu, 4 Dec 2014 22:35:08 +0000 (14:35 -0800)]
Merge pull request #4666 from davecivicrm/CRM-15180

CRM-15180 - is_selectable must default to checked for new tags.

9 years agoFix foreign key error reported by the findById DAO test.
Anthony Nemirovsky [Thu, 4 Dec 2014 21:36:25 +0000 (13:36 -0800)]
Fix foreign key error reported by the findById DAO test.

The root cause of the error was a problem with the CiviUnitTestCase
setUpBeforeClass and tearDown methods. The setUpBeforeClass method imports an
sql file that creates two domains and two contacts to associate with those
domains. The tearDown was set to truncate the civicrm_contact table and this
would happen after every test function run. So, if a test function that was
not the first test function in the class created a contact that it then
wanted to delete, the foreign key error would be thrown. Rather than doing
a workaround, I decided to fix the underlying issue and add back the two
domain contacts after the db tables are truncated.

This broke some tests that were depending on using contact ID 1 for the
contact record that was created, so I went ahead and fixed those, too.

9 years agoCRM-15180 - is_selectable must default to checked for new tags.
Dave Greenberg [Thu, 4 Dec 2014 21:07:23 +0000 (13:07 -0800)]
CRM-15180 - is_selectable must default to checked for new tags.

----------------------------------------
* CRM-15180:
  https://issues.civicrm.org/jira/browse/CRM-15180

9 years agoHide 'multi-activity' option when not relevant
Coleman Watts [Thu, 4 Dec 2014 20:09:05 +0000 (15:09 -0500)]
Hide 'multi-activity' option when not relevant

9 years agoCRM-15689 - Fix js error in dateField initialization
Coleman Watts [Thu, 4 Dec 2014 20:04:34 +0000 (15:04 -0500)]
CRM-15689 - Fix js error in dateField initialization

9 years agoMerge pull request #4659 from kurund/CRM-15684
Kurund Jalmi [Thu, 4 Dec 2014 19:14:39 +0000 (00:44 +0530)]
Merge pull request #4659 from kurund/CRM-15684

CRM-15684: onbehalf profile js break fixes

9 years agoMerge pull request #4662 from colemanw/entityRefFix
colemanw [Thu, 4 Dec 2014 16:13:47 +0000 (11:13 -0500)]
Merge pull request #4662 from colemanw/entityRefFix

Fix js error

9 years agoFix js error
Coleman Watts [Thu, 4 Dec 2014 16:13:13 +0000 (11:13 -0500)]
Fix js error

9 years agoCRM-15684: onbehalf profile js break fixes
kurund [Thu, 4 Dec 2014 11:59:50 +0000 (17:29 +0530)]
CRM-15684: onbehalf profile js break fixes

----------------------------------------
* CRM-15684: Onbehalf fails to set organizations information
  https://issues.civicrm.org/jira/browse/CRM-15684

9 years agoMerge pull request #4658 from yashodha/CRM-15678
Yashodha Chaku [Thu, 4 Dec 2014 11:35:01 +0000 (17:05 +0530)]
Merge pull request #4658 from yashodha/CRM-15678

CRM-15678 don't record reminder send activity if not sent

9 years agoCRM-15678 don't record reminder send activity if not sent
Eileen McNaughton [Wed, 3 Dec 2014 00:18:22 +0000 (13:18 +1300)]
CRM-15678 don't record reminder send activity if not sent

9 years agoCRM-14512 fix - $params passed to payment gateways don't include line item prices...
monishdeb [Thu, 4 Dec 2014 07:05:28 +0000 (12:35 +0530)]
CRM-14512 fix - $params passed to payment gateways don't include line item prices or additional participant line items

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

9 years agoMerge pull request #4654 from atif-shaikh/CRM-14840-fix
Monish Deb [Thu, 4 Dec 2014 06:15:28 +0000 (11:45 +0530)]
Merge pull request #4654 from atif-shaikh/CRM-14840-fix

Crm 14840 fix

9 years agoQA Fix
atif-shaikh [Thu, 4 Dec 2014 05:38:09 +0000 (11:08 +0530)]
QA Fix

9 years agoMerge pull request #4632 from aydun/4.5-merge
Yashodha Chaku [Thu, 4 Dec 2014 05:18:30 +0000 (10:48 +0530)]
Merge pull request #4632 from aydun/4.5-merge

Avoid processing location tables when moveContactBelongings() is called without a table list since these are handled separately.  Issue CRM-15658

9 years agoMerge branch 'master' into findById
Anthony Nemirovsky [Thu, 4 Dec 2014 01:08:16 +0000 (17:08 -0800)]
Merge branch 'master' into findById

9 years agoMerge pull request #4643 from colemanw/CRM-13611
colemanw [Wed, 3 Dec 2014 19:52:36 +0000 (14:52 -0500)]
Merge pull request #4643 from colemanw/CRM-13611

CRM-13611 - Add tabbed interface to report UI

9 years agoMerge pull request #4633 from davecivicrm/CRM-15667
Dave Greenberg [Wed, 3 Dec 2014 19:45:02 +0000 (14:45 -0500)]
Merge pull request #4633 from davecivicrm/CRM-15667

CRM-15667 - Fix invalid selector column values for Unsubscribe Requests.

9 years agoCRM 14512 provide line items of all participants to payment gateway
Alex [Fri, 28 Nov 2014 11:56:10 +0000 (11:56 +0000)]
CRM 14512 provide line items of all participants to payment gateway

9 years agoMerge pull request #4511 from giant-rabbit/ajax-fatal-log-fix
colemanw [Wed, 3 Dec 2014 17:48:19 +0000 (12:48 -0500)]
Merge pull request #4511 from giant-rabbit/ajax-fatal-log-fix

Log fatal errors for AJAX responses. CRM-15560

9 years agoMerge pull request #4629 from systopia/CRM-15665
colemanw [Wed, 3 Dec 2014 14:06:10 +0000 (09:06 -0500)]
Merge pull request #4629 from systopia/CRM-15665

CRM-15665

9 years agoincluded @colemanw 's doc update
systopia [Wed, 3 Dec 2014 14:03:22 +0000 (15:03 +0100)]
included @colemanw 's doc update

9 years agoCRM-14840 - minor fix for handling CiviCase Component
atif-shaikh [Wed, 3 Dec 2014 14:01:40 +0000 (19:31 +0530)]
CRM-14840 - minor fix for handling CiviCase Component

----------------------------------------
* CRM-14840: File schedule reminder on case
  https://issues.civicrm.org/jira/browse/CRM-14840

9 years agoMerge pull request #4087 from robinmitra/master
colemanw [Wed, 3 Dec 2014 13:57:13 +0000 (08:57 -0500)]
Merge pull request #4087 from robinmitra/master

Fix a bug in CRM_Mailing_BAO_Mailing::add() with wrong class instantiation

9 years agoRegression Fix
atif-shaikh [Wed, 3 Dec 2014 13:29:31 +0000 (18:59 +0530)]
Regression Fix

9 years agoFix for CRM-14840: Record reminder sent activity on case when the source activity...
Jaap Jansma [Wed, 11 Jun 2014 10:08:17 +0000 (12:08 +0200)]
Fix for CRM-14840: Record reminder sent activity on case when the source activity is case activity

Conflicts:
CRM/Core/BAO/ActionSchedule.php

----------------------------------------
* CRM-14840: File schedule reminder on case
  https://issues.civicrm.org/jira/browse/CRM-14840

9 years agoMerge pull request #4375 from totten/master-mysqli-compat
colemanw [Wed, 3 Dec 2014 13:16:21 +0000 (08:16 -0500)]
Merge pull request #4375 from totten/master-mysqli-compat

CRM-15431 - CRM_Core_I18n - Use CRM_Core_DAO::escapeString for typical, runtime escaping

9 years agoMerge pull request #4652 from jitendrapurohit/CRM-15658
Monish Deb [Wed, 3 Dec 2014 13:09:46 +0000 (18:39 +0530)]
Merge pull request #4652 from jitendrapurohit/CRM-15658

webtest for CRM-15658

9 years agowebtest for CRM-15658
jitendrapurohit [Wed, 3 Dec 2014 12:55:58 +0000 (18:25 +0530)]
webtest for CRM-15658

9 years agoMerge pull request #4650 from yashodha/CRM-15627
Yashodha Chaku [Wed, 3 Dec 2014 09:21:43 +0000 (14:51 +0530)]
Merge pull request #4650 from yashodha/CRM-15627

CRM-15627: fix fee level on change price selection

9 years agoMerge pull request #4651 from jitendrapurohit/CRM-15559
Monish Deb [Wed, 3 Dec 2014 08:09:47 +0000 (13:39 +0530)]
Merge pull request #4651 from jitendrapurohit/CRM-15559

CRM-15559 fix - Cannot register lifetime membership for someone else [cid=0] if already ...

9 years agomade the fix more generic and robust
systopia [Wed, 3 Dec 2014 07:07:50 +0000 (08:07 +0100)]
made the fix more generic and robust

9 years agoCannot register lifetime membership for someone else [cid=0] if already have lifetime...
jitendrapurohit [Wed, 3 Dec 2014 05:17:44 +0000 (10:47 +0530)]
Cannot register lifetime membership for someone else [cid=0] if already have lifetime membership

9 years agoCRM-15627: fix fee level on change price selection
CiviCRM [Wed, 3 Dec 2014 03:59:48 +0000 (09:29 +0530)]
CRM-15627: fix fee level on change price selection

9 years agoMerge pull request #4609 from colemanw/CRM-15618
colemanw [Wed, 3 Dec 2014 02:37:03 +0000 (21:37 -0500)]
Merge pull request #4609 from colemanw/CRM-15618

CRM-15618 - Crude workaround for front-end WP js bug

9 years agoMerge pull request #4360 from christianwach/wordpress-hooks
colemanw [Wed, 3 Dec 2014 02:27:38 +0000 (21:27 -0500)]
Merge pull request #4360 from christianwach/wordpress-hooks

CRM-15454 - Enable multiple WordPress plugins to receive callbacks from CiviCRM hooks

9 years agoMerge pull request #4634 from giant-rabbit/JobLogCommandListingBug
colemanw [Wed, 3 Dec 2014 02:19:27 +0000 (21:19 -0500)]
Merge pull request #4634 from giant-rabbit/JobLogCommandListingBug

Correctly display the API Entity and Action in the Job Log.

9 years agoMerge pull request #4640 from christianwach/crm-15672
colemanw [Tue, 2 Dec 2014 21:53:26 +0000 (16:53 -0500)]
Merge pull request #4640 from christianwach/crm-15672

CRM-15672

9 years agoMerge pull request #4636 from colemanw/CRM-15653
Dave Greenberg [Tue, 2 Dec 2014 21:52:46 +0000 (16:52 -0500)]
Merge pull request #4636 from colemanw/CRM-15653

CRM-15653 - Fix contact search when input contains spaces

9 years agoMerge pull request #4645 from davecivicrm/CRM-15675
Dave Greenberg [Tue, 2 Dec 2014 21:49:53 +0000 (16:49 -0500)]
Merge pull request #4645 from davecivicrm/CRM-15675

CRM-15675 - fix inline doc for contact ref custom field advanced filter.

9 years agoMerge pull request #4644 from monishdeb/CRM-15291-fix
colemanw [Tue, 2 Dec 2014 21:22:31 +0000 (16:22 -0500)]
Merge pull request #4644 from monishdeb/CRM-15291-fix

CRM-15291 fix - Remove CRM_Event_Form_ManageEvent_ScheduleReminders

9 years agoCRM-15675 - fix inline doc for contact ref custom field advanced filter.
Dave Greenberg [Tue, 2 Dec 2014 21:00:16 +0000 (16:00 -0500)]
CRM-15675 - fix inline doc for contact ref custom field advanced filter.

----------------------------------------
* CRM-15675:
  https://issues.civicrm.org/jira/browse/CRM-15675

9 years agotpl placeholder fix
monishdeb [Tue, 2 Dec 2014 17:35:30 +0000 (23:05 +0530)]
tpl placeholder fix

9 years agominor changes
monishdeb [Tue, 2 Dec 2014 16:30:22 +0000 (22:00 +0530)]
minor changes

9 years agoCRM-13611 - Add tabbed interface to report UI
Coleman Watts [Tue, 2 Dec 2014 16:18:45 +0000 (11:18 -0500)]
CRM-13611 - Add tabbed interface to report UI

9 years agoMerge pull request #4642 from colemanw/CRM-15674
colemanw [Tue, 2 Dec 2014 16:16:31 +0000 (11:16 -0500)]
Merge pull request #4642 from colemanw/CRM-15674

CRM-15674 - API rest code cleanup

9 years agoCRM-15674 - API rest code cleanup
Coleman Watts [Tue, 2 Dec 2014 15:12:01 +0000 (10:12 -0500)]
CRM-15674 - API rest code cleanup

9 years agoCRM-15291 fix - Remove CRM_Event_Form_ManageEvent_ScheduleReminders
monishdeb [Tue, 2 Dec 2014 14:53:38 +0000 (20:23 +0530)]
CRM-15291 fix - Remove CRM_Event_Form_ManageEvent_ScheduleReminders

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

9 years agofixes display of CiviContribute widget in WordPress
Christian Wach [Tue, 2 Dec 2014 12:19:25 +0000 (12:19 +0000)]
fixes display of CiviContribute widget in WordPress

9 years agoMerge pull request #4639 from kurund/minor-fix
Yashodha Chaku [Tue, 2 Dec 2014 11:50:35 +0000 (17:20 +0530)]
Merge pull request #4639 from kurund/minor-fix

removed debug message

9 years agoremoved debug message
kurund [Tue, 2 Dec 2014 10:40:11 +0000 (16:10 +0530)]
removed debug message

9 years agoMerge pull request #4638 from jitendrapurohit/CRM-13456
Kurund Jalmi [Tue, 2 Dec 2014 06:22:38 +0000 (11:52 +0530)]
Merge pull request #4638 from jitendrapurohit/CRM-13456

Advanced Search does not filter relationships with deleted contacts

9 years agoMerge pull request #4630 from atif-shaikh/CRM-15546
Monish Deb [Tue, 2 Dec 2014 06:13:06 +0000 (11:43 +0530)]
Merge pull request #4630 from atif-shaikh/CRM-15546

CRM-15546 - Fixed constants issue/bug in BaseIPN.php and PaymentProcesso...

9 years agoAdvanced Search does not filter relationships with deleted contacts Fix
jitendrapurohit [Tue, 2 Dec 2014 05:14:03 +0000 (10:44 +0530)]
Advanced Search does not filter relationships with deleted contacts Fix

9 years agoCRM-15670 Allow overriding of privacy settings & updating of receive_date when sendin...
Eileen McNaughton [Tue, 2 Dec 2014 01:14:12 +0000 (14:14 +1300)]
CRM-15670 Allow overriding of privacy settings & updating of receive_date when sending receipts from search

9 years agoCRM-15653 - Fix contact search when input contains spaces
Coleman Watts [Tue, 2 Dec 2014 00:47:46 +0000 (19:47 -0500)]
CRM-15653 - Fix contact search when input contains spaces

9 years agoMerge pull request #4635 from colemanw/comments
colemanw [Mon, 1 Dec 2014 23:37:26 +0000 (18:37 -0500)]
Merge pull request #4635 from colemanw/comments

Cleanup phpdoc comments

9 years agoCleanup phpdoc comments
Coleman Watts [Mon, 1 Dec 2014 22:00:35 +0000 (17:00 -0500)]
Cleanup phpdoc comments

9 years agoMerge pull request #4621 from atif-shaikh/CRM-15589
Dave Greenberg [Mon, 1 Dec 2014 22:27:01 +0000 (17:27 -0500)]
Merge pull request #4621 from atif-shaikh/CRM-15589

CRM-15589 - Membership section label mixup

9 years agoMerge pull request #4628 from priyankakaran26/recurring-entity-improvements-phase-2
Dave Greenberg [Mon, 1 Dec 2014 20:45:45 +0000 (15:45 -0500)]
Merge pull request #4628 from priyankakaran26/recurring-entity-improvements-phase-2

CRM-15490 - Reccuring Activities: Notice and Message Fixes

9 years agoCorrectly display the API Entity and Action in the Job Log.
Anthony Nemirovsky [Mon, 1 Dec 2014 20:38:10 +0000 (12:38 -0800)]
Correctly display the API Entity and Action in the Job Log.

The scheduled jobs log was setting the command for every job entry to 0
because of a string concatenation bug. This commit corrects that bug so API
Entity and Action is now correctly shown.

9 years agoCRM-15667 - Fix invalid selector column values for Unsubscribe Requests.
Dave Greenberg [Mon, 1 Dec 2014 19:57:53 +0000 (14:57 -0500)]
CRM-15667 - Fix invalid selector column values for Unsubscribe Requests.

----------------------------------------
* CRM-15667:
  https://issues.civicrm.org/jira/browse/CRM-15667