civicrm-core.git
9 years agoMerge pull request #4710 from rohankatkar/Tests
Kurund Jalmi [Fri, 12 Dec 2014 14:46:30 +0000 (20:16 +0530)]
Merge pull request #4710 from rohankatkar/Tests

Fix for Webtest

9 years agoRemoved spaces
Rohan Katkar [Fri, 12 Dec 2014 13:30:19 +0000 (19:00 +0530)]
Removed spaces

9 years agoFix for Webtest
Rohan Katkar [Fri, 12 Dec 2014 12:58:50 +0000 (18:28 +0530)]
Fix for Webtest

9 years agoMerge pull request #4693 from jaapjansma/CRM-15702
Yashodha Chaku [Fri, 12 Dec 2014 06:18:18 +0000 (11:48 +0530)]
Merge pull request #4693 from jaapjansma/CRM-15702

fix for issue CRM-15702 sending bulk smses to contacts without e-mail ad...

9 years agoMerge pull request #4706 from colemanw/ajaxFail
colemanw [Fri, 12 Dec 2014 01:09:13 +0000 (20:09 -0500)]
Merge pull request #4706 from colemanw/ajaxFail

Provide more descriptive ajax error messages

9 years agoProvide more descriptive ajax error messages
Coleman Watts [Fri, 12 Dec 2014 01:07:51 +0000 (20:07 -0500)]
Provide more descriptive ajax error messages

9 years agoMerge pull request #4703 from colemanw/CRM-13611
colemanw [Thu, 11 Dec 2014 21:08:05 +0000 (16:08 -0500)]
Merge pull request #4703 from colemanw/CRM-13611

CRM-13611 - Fix create/copy report form errors

9 years agoMerge pull request #4646 from eileenmcnaughton/action-test
Eileen McNaughton [Thu, 11 Dec 2014 20:29:39 +0000 (09:29 +1300)]
Merge pull request #4646 from eileenmcnaughton/action-test

CRM-15550 test + test error fix

9 years agoMerge pull request #4698 from colemanw/CRM-15711
colemanw [Thu, 11 Dec 2014 19:52:18 +0000 (14:52 -0500)]
Merge pull request #4698 from colemanw/CRM-15711

CRM-15711 - Improve efficiency of deleting a contact

9 years agoCRM-13611 - Improve report UI when saving a new report
Coleman Watts [Thu, 11 Dec 2014 19:47:14 +0000 (14:47 -0500)]
CRM-13611 - Improve report UI when saving a new report

9 years agoRemove unused legacy report list
Coleman Watts [Thu, 11 Dec 2014 18:43:15 +0000 (13:43 -0500)]
Remove unused legacy report list

9 years agoReport tpl whitespace cleanup
Coleman Watts [Thu, 11 Dec 2014 18:32:44 +0000 (13:32 -0500)]
Report tpl whitespace cleanup

9 years agoCRM.utils.renderOptions - make escapeHtml optional
Coleman Watts [Thu, 11 Dec 2014 18:20:18 +0000 (13:20 -0500)]
CRM.utils.renderOptions - make escapeHtml optional

9 years agoCRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly
Coleman Watts [Thu, 11 Dec 2014 17:58:10 +0000 (12:58 -0500)]
CRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly

9 years agoCRM-13611 - Fix create/copy report form errors
Coleman Watts [Thu, 11 Dec 2014 16:28:13 +0000 (11:28 -0500)]
CRM-13611 - Fix create/copy report form errors

9 years agoMerge pull request #4701 from rohankatkar/Tests
Monish Deb [Thu, 11 Dec 2014 15:44:49 +0000 (21:14 +0530)]
Merge pull request #4701 from rohankatkar/Tests

Webtest Fixes

9 years agoWebtest Fix
Rohan Katkar [Thu, 11 Dec 2014 13:24:46 +0000 (18:54 +0530)]
Webtest Fix

9 years agoCRM-15711 - Improve efficiency of deleting a contact
Coleman Watts [Wed, 10 Dec 2014 22:30:37 +0000 (17:30 -0500)]
CRM-15711 - Improve efficiency of deleting a contact

9 years agoMerge pull request #4694 from monishdeb/CRM-15626
Dave Greenberg [Thu, 11 Dec 2014 00:49:44 +0000 (16:49 -0800)]
Merge pull request #4694 from monishdeb/CRM-15626

CRM-15626 fix - Relationship Create Widget Not always showing the correc...

9 years agoMerge pull request #4690 from jitendrapurohit/CRM-15559
Monish Deb [Wed, 10 Dec 2014 18:30:06 +0000 (00:00 +0530)]
Merge pull request #4690 from jitendrapurohit/CRM-15559

Additional fix for Cannot register lifetime membership for someone else ...

9 years agoCRM-15626 fixes - Relationship Create Widget Not always showing the correct available...
monishdeb [Wed, 10 Dec 2014 14:38:09 +0000 (20:08 +0530)]
CRM-15626 fixes - 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 #4686 from lcdservices/CRM-15698-b
Dave Greenberg [Tue, 9 Dec 2014 21:07:24 +0000 (13:07 -0800)]
Merge pull request #4686 from lcdservices/CRM-15698-b

CRM-15698 participant report price level query

9 years agoMerge pull request #4664 from aydun/CRM-15681-master
colemanw [Tue, 9 Dec 2014 19:42:34 +0000 (14:42 -0500)]
Merge pull request #4664 from aydun/CRM-15681-master

CRM-15681 Merge sub-types

9 years agoMerge pull request #4687 from eileenmcnaughton/CRM-15699-master
Eileen McNaughton [Tue, 9 Dec 2014 19:31:19 +0000 (08:31 +1300)]
Merge pull request #4687 from eileenmcnaughton/CRM-15699-master

CRM-15699 add create/edit hook for ContributionPage

9 years agoMerge pull request #4689 from colemanw/CRM-13611
colemanw [Tue, 9 Dec 2014 13:55:45 +0000 (08:55 -0500)]
Merge pull request #4689 from colemanw/CRM-13611

CRM-13611 - Report fixes

9 years agoMerge pull request #4688 from colemanw/CRM-15495
colemanw [Tue, 9 Dec 2014 13:53:32 +0000 (08:53 -0500)]
Merge pull request #4688 from colemanw/CRM-15495

CRM-15495 - Support complex api filters in EntityRef

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 agofix for issue CRM-15702 sending bulk smses to contacts without e-mail address
Jaap Jansma [Tue, 9 Dec 2014 11:15:44 +0000 (12:15 +0100)]
fix for issue CRM-15702 sending bulk smses to contacts without e-mail address

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 agoAdditional fix for Cannot register lifetime membership for someone else [cid=0] if...
jitendrapurohit [Tue, 9 Dec 2014 09:56:36 +0000 (15:26 +0530)]
Additional fix for Cannot register lifetime membership for someone else [cid=0] if already have lifetime membership

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 agoCRM-13611 - Fix case detail report
Coleman Watts [Tue, 9 Dec 2014 04:36:03 +0000 (23:36 -0500)]
CRM-13611 - Fix case detail report

9 years agoCRM-13611 - Report tab fixes
Coleman Watts [Tue, 9 Dec 2014 04:19:32 +0000 (23:19 -0500)]
CRM-13611 - Report tab fixes

9 years agoCRM-13611 - Remove titles from report tab content
Coleman Watts [Tue, 9 Dec 2014 04:00:57 +0000 (23:00 -0500)]
CRM-13611 - Remove titles from report tab content

9 years agoCRM-13611 - Remove redundant css classes
Coleman Watts [Tue, 9 Dec 2014 03:55:36 +0000 (22:55 -0500)]
CRM-13611 - Remove redundant css classes

These classes are automatically added by jQuery UI

9 years agoCRM-13611 - Fix active tab on initial report display
Coleman Watts [Tue, 9 Dec 2014 03:50:05 +0000 (22:50 -0500)]
CRM-13611 - Fix active tab on initial report display

9 years agoCRM-15495 - Support complex api filters in EntityRef
Coleman Watts [Tue, 9 Dec 2014 03:36:46 +0000 (22:36 -0500)]
CRM-15495 - Support complex api filters in EntityRef

9 years agoCRM-15699 add create/edit hook for ContributionPage
Eileen McNaughton [Mon, 8 Dec 2014 21:59:09 +0000 (10:59 +1300)]
CRM-15699 add create/edit hook for ContributionPage

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-15698 participant report price level query
Brian Shaughnessy [Tue, 9 Dec 2014 01:13:47 +0000 (20:13 -0500)]
CRM-15698 participant report price level query

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 agoremove redundant variables
Eileen McNaughton [Tue, 2 Dec 2014 23:49:33 +0000 (12:49 +1300)]
remove redundant variables

9 years agoCRM-15550 add test to check for extraneous emails
Eileen McNaughton [Tue, 2 Dec 2014 23:42:23 +0000 (12:42 +1300)]
CRM-15550 add test to check for extraneous emails

9 years agoCRM-15550 adding a test shows only one instance of checking has been updated
Eileen McNaughton [Tue, 2 Dec 2014 23:41:15 +0000 (12:41 +1300)]
CRM-15550 adding a test shows only one instance of checking  has been updated

9 years agobasic test tidy up
Eileen McNaughton [Tue, 2 Dec 2014 23:06:54 +0000 (12:06 +1300)]
basic test tidy up

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 agoCRM-15681 Merge sub-types
aydun [Thu, 4 Dec 2014 17:52:37 +0000 (17:52 +0000)]
CRM-15681 Merge sub-types

Merge sub-types, don't display sub-types in merge UI
Remove unneeded code for displaying sub-types

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