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
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
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
colemanw [Tue, 9 Dec 2014 13:55:45 +0000 (08:55 -0500)]
Merge pull request #4689 from colemanw/CRM-13611
CRM-13611 - Report fixes
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
Kurund Jalmi [Tue, 9 Dec 2014 10:10:40 +0000 (15:40 +0530)]
Merge pull request #4657 from monishdeb/CRM-14512
Crm 14512
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
Coleman Watts [Tue, 9 Dec 2014 04:36:03 +0000 (23:36 -0500)]
CRM-13611 - Fix case detail report
Coleman Watts [Tue, 9 Dec 2014 04:19:32 +0000 (23:19 -0500)]
CRM-13611 - Report tab fixes
Coleman Watts [Tue, 9 Dec 2014 04:00:57 +0000 (23:00 -0500)]
CRM-13611 - Remove titles from report tab content
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
Coleman Watts [Tue, 9 Dec 2014 03:50:05 +0000 (22:50 -0500)]
CRM-13611 - Fix active tab on initial report display
Coleman Watts [Tue, 9 Dec 2014 03:36:46 +0000 (22:36 -0500)]
CRM-15495 - Support complex api filters in EntityRef
Eileen McNaughton [Mon, 8 Dec 2014 21:59:09 +0000 (10:59 +1300)]
CRM-15699 add create/edit hook for ContributionPage
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.
Brian Shaughnessy [Tue, 9 Dec 2014 01:13:47 +0000 (20:13 -0500)]
CRM-15698 participant report price level query
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
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
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 ...
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
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
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
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
Monish Deb [Mon, 8 Dec 2014 06:13:30 +0000 (11:43 +0530)]
Merge pull request #4674 from atif-shaikh/CRM-11993
Crm 11993
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
Coleman Watts [Sat, 6 Dec 2014 21:20:27 +0000 (16:20 -0500)]
CRM-13611 - Hide tab content if report has rows
Coleman Watts [Sat, 6 Dec 2014 02:11:46 +0000 (21:11 -0500)]
EntityRef tag-related code cleanup
Coleman Watts [Thu, 4 Dec 2014 20:15:22 +0000 (15:15 -0500)]
CRM-15495 - Add filtering control to entityRef widget
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.
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
Rohan Katkar [Fri, 5 Dec 2014 13:47:05 +0000 (19:17 +0530)]
CRM-14988 URL encoding error
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...
jitendrapurohit [Fri, 5 Dec 2014 12:54:31 +0000 (18:24 +0530)]
optimised modification
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
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
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
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
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
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
samuelsov [Thu, 25 Sep 2014 21:29:45 +0000 (17:29 -0400)]
Remove the multiplication of lcMessages in url when switching language
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...
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
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,
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
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."
Dave Greenberg [Fri, 5 Dec 2014 00:52:34 +0000 (16:52 -0800)]
Revert "CRM-15407 - add fee amount to Dummy transaction."
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.
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
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.
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
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.
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.
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
Coleman Watts [Thu, 4 Dec 2014 20:09:05 +0000 (15:09 -0500)]
Hide 'multi-activity' option when not relevant
Coleman Watts [Thu, 4 Dec 2014 20:04:34 +0000 (15:04 -0500)]
CRM-15689 - Fix js error in dateField initialization
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
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
colemanw [Thu, 4 Dec 2014 16:13:47 +0000 (11:13 -0500)]
Merge pull request #4662 from colemanw/entityRefFix
Fix js error
Coleman Watts [Thu, 4 Dec 2014 16:13:13 +0000 (11:13 -0500)]
Fix js error
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
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
Eileen McNaughton [Wed, 3 Dec 2014 00:18:22 +0000 (13:18 +1300)]
CRM-15678 don't record reminder send activity if not sent
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
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
atif-shaikh [Thu, 4 Dec 2014 05:38:09 +0000 (11:08 +0530)]
QA Fix
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
Anthony Nemirovsky [Thu, 4 Dec 2014 01:08:16 +0000 (17:08 -0800)]
Merge branch 'master' into findById
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
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.
Alex [Fri, 28 Nov 2014 11:56:10 +0000 (11:56 +0000)]
CRM 14512 provide line items of all participants to payment gateway
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
colemanw [Wed, 3 Dec 2014 14:06:10 +0000 (09:06 -0500)]
Merge pull request #4629 from systopia/CRM-15665
CRM-15665
systopia [Wed, 3 Dec 2014 14:03:22 +0000 (15:03 +0100)]
included @colemanw 's doc update
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
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
atif-shaikh [Wed, 3 Dec 2014 13:29:31 +0000 (18:59 +0530)]
Regression Fix
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
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
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
jitendrapurohit [Wed, 3 Dec 2014 12:55:58 +0000 (18:25 +0530)]
webtest for CRM-15658
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
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 ...
systopia [Wed, 3 Dec 2014 07:07:50 +0000 (08:07 +0100)]
made the fix more generic and robust
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
CiviCRM [Wed, 3 Dec 2014 03:59:48 +0000 (09:29 +0530)]
CRM-15627: fix fee level on change price selection
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
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
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.
colemanw [Tue, 2 Dec 2014 21:53:26 +0000 (16:53 -0500)]
Merge pull request #4640 from christianwach/crm-15672
CRM-15672
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
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.
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
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
monishdeb [Tue, 2 Dec 2014 17:35:30 +0000 (23:05 +0530)]
tpl placeholder fix
monishdeb [Tue, 2 Dec 2014 16:30:22 +0000 (22:00 +0530)]
minor changes
Coleman Watts [Tue, 2 Dec 2014 16:18:45 +0000 (11:18 -0500)]
CRM-13611 - Add tabbed interface to report UI
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
Coleman Watts [Tue, 2 Dec 2014 15:12:01 +0000 (10:12 -0500)]
CRM-15674 - API rest code cleanup
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
Christian Wach [Tue, 2 Dec 2014 12:19:25 +0000 (12:19 +0000)]
fixes display of CiviContribute widget in WordPress
projects / civicrm-core.git / log