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
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
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
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
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.
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
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 [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: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.
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
Christian Wach [Tue, 2 Dec 2014 12:19:25 +0000 (12:19 +0000)]
fixes display of CiviContribute widget in WordPress
Yashodha Chaku [Tue, 2 Dec 2014 11:50:35 +0000 (17:20 +0530)]
Merge pull request #4639 from kurund/minor-fix
removed debug message
kurund [Tue, 2 Dec 2014 10:40:11 +0000 (16:10 +0530)]
removed debug message
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
Aidan Saunders [Mon, 1 Dec 2014 18:07:01 +0000 (18:07 +0000)]
Avoid processing location tables when moveContactBelongings() is called without a table list since
these are handled separately. Issue CRM-15658
Dave Greenberg [Mon, 1 Dec 2014 18:01:41 +0000 (13:01 -0500)]
Merge pull request #4631 from davecivicrm/CRM-15666
CRM-15666 - Fix obsolete help re: import of multi-record custom fields.
Dave Greenberg [Mon, 1 Dec 2014 17:59:26 +0000 (12:59 -0500)]
CRM-15666 - Fix obsolete help re: import of multi-record custom fields.
----------------------------------------
* CRM-15666:
https://issues.civicrm.org/jira/browse/CRM-15666
Yashodha Chaku [Mon, 1 Dec 2014 05:43:06 +0000 (11:13 +0530)]
Merge pull request #4619 from jitendrapurohit/CRM-15645
CRM-15645 Petition email confirmation URL incompatible with WordPress
jitendrapurohit [Thu, 27 Nov 2014 09:22:35 +0000 (14:52 +0530)]
support for old variable
jitendrapurohit [Thu, 27 Nov 2014 06:42:11 +0000 (12:12 +0530)]
CRM-15645 Petition email confirmation URL incompatible with WordPress
colemanw [Wed, 26 Nov 2014 23:27:32 +0000 (18:27 -0500)]
Merge pull request #4610 from colemanw/CRM-15613
CRM-15613 - Fix access to undefined property error
colemanw [Tue, 25 Nov 2014 20:59:15 +0000 (15:59 -0500)]
Merge pull request #4614 from colemanw/CRM-15646
CRM-15646 - api.setvalue: Add support for custom fields
Dave Greenberg [Tue, 25 Nov 2014 20:00:34 +0000 (12:00 -0800)]
Merge pull request #4613 from atif-shaikh/CRM-11302
CRM-11302 - added code which conditionally lists the group(s) that the person is unsubscribing from
Coleman Watts [Tue, 25 Nov 2014 17:59:41 +0000 (12:59 -0500)]
CRM-15646 - api.setvalue: Add support for custom fields
atif-shaikh [Tue, 25 Nov 2014 13:12:09 +0000 (18:42 +0530)]
CRM-11302 - Enhance unsubscribe form to reduce likelihood of accidental unsubscribes
https://issues.civicrm.org/jira/browse/CRM-11302
colemanw [Tue, 25 Nov 2014 03:14:23 +0000 (22:14 -0500)]
Merge pull request #4544 from colemanw/CRM-15585
CRM-15585 - Call pre hooks from api.setvalue
Coleman Watts [Tue, 25 Nov 2014 03:08:25 +0000 (22:08 -0500)]
CRM-15613 - Fix access to undefined property error
Coleman Watts [Tue, 25 Nov 2014 02:38:43 +0000 (21:38 -0500)]
CRM-15618 - Crude workaround for front-end WP js bug
Tim Otten [Tue, 25 Nov 2014 01:50:05 +0000 (17:50 -0800)]
Merge pull request #4608 from totten/4.5-trigger-rebuild
CRM-15602 Fix for logging- only regenerate timestamp triggers on requested tables
David Knoll [Thu, 20 Nov 2014 11:14:38 +0000 (11:14 +0000)]
CRM-15602 Fix for logging- only regenerate timestamp triggers on requested tables
Yashodha Chaku [Mon, 24 Nov 2014 09:06:51 +0000 (14:36 +0530)]
Merge pull request #4594 from jmcclelland/petition-email-mode
CRM-15630 - ensure social media links work in email messages.
colemanw [Mon, 24 Nov 2014 04:04:54 +0000 (23:04 -0500)]
Merge pull request #4603 from colemanw/CRM-15633
CRM-15633 - Fix js on campaign dashboard tables
Coleman Watts [Mon, 24 Nov 2014 04:02:18 +0000 (23:02 -0500)]
CRM-15633 - Fix js on campaign dashboard tables
Dave Greenberg [Fri, 21 Nov 2014 19:51:05 +0000 (11:51 -0800)]
Merge pull request #4578 from pradpnayak/CRM-10206
--CRM-10206, reverted back some changes that caused regression when crea...
Dave Greenberg [Fri, 21 Nov 2014 19:01:05 +0000 (11:01 -0800)]
Merge pull request #4584 from davecivicrm/CRM-15621
CRM-15621 - prevent fatal on payment updates with Auth.net IPN
Jamie McClelland [Fri, 21 Nov 2014 18:43:37 +0000 (13:43 -0500)]
CRM-15630 - ensure social media links work in email messages.
----------------------------------------
* CRM-15630: Petition add signature thank you email doesn't send correct social networking links
https://issues.civicrm.org/jira/browse/CRM-15630
Dave Greenberg [Thu, 20 Nov 2014 23:45:25 +0000 (15:45 -0800)]
Merge pull request #4586 from giant-rabbit/CRM-15622
CRM-15622: Fix for incorrect Fee Amount.
colemanw [Thu, 20 Nov 2014 23:16:42 +0000 (18:16 -0500)]
Merge pull request #4591 from colemanw/CRM-15625
CRM-15625 - Add support for contribution api honor_type_id param
Coleman Watts [Thu, 20 Nov 2014 21:16:39 +0000 (16:16 -0500)]
CRM-15625 - Add support for contribution api honor_type_id param
CiviCRM [Thu, 20 Nov 2014 01:18:09 +0000 (17:18 -0800)]
Update version to 4.5.5
Peter Haight [Wed, 19 Nov 2014 23:57:59 +0000 (15:57 -0800)]
CRM-15622: Fix for incorrect Fee Amount.
There's a bunch of fee_amount fields in this section of the code leading
to a lot of confusion (see CRM-15372). Many of the payment processors set
the fee_amount field in the result array they return which sets up the
contribution.fee_amount field, but the Authorize.Net AIM API doesn't
return fee information, so Authorize.Net doesn't set this field. Instead
of setting this field to 0 there, I thought it would be better to not
require that the payment processor set this field. Since some of the
payment processors return the same array that was passed into them and the
payment processors don't need the fee_amount field as an argument, I think
that setting that to NULL before passing it in gets us the correct output.
Note that we still need the fix from CRM-15372 to get the
participant.fee_amount field set correctly because the code that sets up
the pariticpant shares the field array that the contribution creation
uses even though they don't have the same 'fee_amount' field.
Dave Greenberg [Wed, 19 Nov 2014 23:23:31 +0000 (15:23 -0800)]
CRM-15621 - prevent fatal on payment updates with Auth.net IPN
----------------------------------------
* CRM-15621:
https://issues.civicrm.org/jira/browse/CRM-15621
Coleman Watts [Wed, 19 Nov 2014 16:36:14 +0000 (11:36 -0500)]
Remove redundant help link
Pradeep Nayak [Wed, 19 Nov 2014 16:19:35 +0000 (21:49 +0530)]
--CRM-10206, added api test
Pradeep Nayak [Tue, 18 Nov 2014 15:04:26 +0000 (20:34 +0530)]
--CRM-10206, reverted back some changes that caused regression when creating multi value custom field value using api
colemanw [Tue, 18 Nov 2014 18:10:11 +0000 (13:10 -0500)]
Merge pull request #4509 from colemanw/addVars
Encourage better scoping of js CRM vars with new addVars method
Coleman Watts [Tue, 4 Nov 2014 16:09:05 +0000 (11:09 -0500)]
Encourage better scoping of js CRM vars with new addVars method
Monish Deb [Tue, 18 Nov 2014 14:21:16 +0000 (19:51 +0530)]
Merge pull request #4577 from monishdeb/CRM-15595
CRM-15595 indentation fix
monishdeb [Tue, 18 Nov 2014 14:18:52 +0000 (19:48 +0530)]
CRM-15595 indentation fix
----------------------------------------
* CRM-15595: Individual sub-type custom fields don't appear in online event registration
https://issues.civicrm.org/jira/browse/CRM-15595
Monish Deb [Tue, 18 Nov 2014 14:04:28 +0000 (19:34 +0530)]
Merge pull request #4572 from atif-shaikh/CRM-15595
CRM-15595 - Individual sub-type custom fields don't appear in online eve...
Monish Deb [Tue, 18 Nov 2014 13:21:12 +0000 (18:51 +0530)]
Merge pull request #4576 from yashodha/CRM-15611
Tested, works fine
CiviCRM [Tue, 18 Nov 2014 13:13:21 +0000 (18:43 +0530)]
CRM-15611: fix send copy for case activity
atif-shaikh [Tue, 18 Nov 2014 05:58:22 +0000 (11:28 +0530)]
CRM-15595 - Individual sub-type custom fields don't appear in online event registration
https://issues.civicrm.org/jira/browse/CRM-15595
Kurund Jalmi [Mon, 17 Nov 2014 05:59:03 +0000 (11:29 +0530)]
Merge pull request #4570 from kurund/CRM-15527
CRM-15527
kurund [Mon, 17 Nov 2014 04:13:06 +0000 (09:43 +0530)]
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527
Conflicts:
templates/CRM/Event/Form/Participant.tpl
----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
https://issues.civicrm.org/jira/browse/CRM-15527
colemanw [Sat, 15 Nov 2014 02:05:23 +0000 (21:05 -0500)]
Merge pull request #4562 from colemanw/CRM-15597
CRM-15597 - Fix display of frozen custom contactRef fields
Coleman Watts [Sat, 15 Nov 2014 02:03:49 +0000 (21:03 -0500)]
CRM-15597 - Fix display of frozen custom contactRef fields
Yashodha Chaku [Fri, 14 Nov 2014 09:54:45 +0000 (15:24 +0530)]
Merge pull request #4551 from kenwest/CRM-15593
CRM-15593 Prevent contributions being imported for is_deleted contacts
Ken West [Thu, 13 Nov 2014 12:02:22 +0000 (23:02 +1100)]
CRM-15593 Prevent contributions being imported for is_deleted contacts
colemanw [Thu, 13 Nov 2014 01:58:28 +0000 (20:58 -0500)]
Merge pull request #4549 from colemanw/CRM-15107
CRM-15107 - Fix count from static groups to only count 'Added' status
Coleman Watts [Thu, 13 Nov 2014 01:33:10 +0000 (20:33 -0500)]
CRM-15107 - Fix count from static groups to only count 'Added' status
Dave Greenberg [Wed, 12 Nov 2014 01:08:48 +0000 (17:08 -0800)]
Merge pull request #4541 from atif-shaikh/CRM-15573
CRM-15573 - Membership Type with "Require Auto renew" behaves like "Give...
Coleman Watts [Tue, 11 Nov 2014 19:14:10 +0000 (14:14 -0500)]
CRM-15585 - Call pre hooks from api.setvalue
colemanw [Tue, 11 Nov 2014 14:13:19 +0000 (09:13 -0500)]
Merge pull request #4542 from colemanw/CRM-15582
CRM-15582 - Remove unused datatable style rules
Coleman Watts [Tue, 11 Nov 2014 14:12:00 +0000 (09:12 -0500)]
CRM-15582 - Remove unused datatable style rules
atif-shaikh [Tue, 11 Nov 2014 13:48:35 +0000 (19:18 +0530)]
CRM-15573 - Membership Type with "Require Auto renew" behaves like "Give option, but not required"
https://issues.civicrm.org/jira/browse/CRM-15573
Monish Deb [Tue, 11 Nov 2014 05:18:54 +0000 (10:48 +0530)]
Merge pull request #4525 from atif-shaikh/CRM-15427QAFix
Additional QA Fix for CRM-15427
Coleman Watts [Tue, 11 Nov 2014 03:29:38 +0000 (22:29 -0500)]
Change case activity audit title to match ui
colemanw [Mon, 10 Nov 2014 19:51:13 +0000 (14:51 -0500)]
Merge pull request #4532 from colemanw/CRM-15346
CRM-15346 - Call Drupal.detachBehaviors conditionally for D6 support
Coleman Watts [Mon, 10 Nov 2014 19:50:43 +0000 (14:50 -0500)]
CRM-15346 - Call Drupal.detachBehaviors conditionally for D6 support
Dave Greenberg [Fri, 7 Nov 2014 23:17:31 +0000 (15:17 -0800)]
Merge pull request #4521 from monishdeb/CRM-15563
CRM-15563 fix - Reminder is_repeat checkbox / column value should be res...
atif-shaikh [Fri, 7 Nov 2014 14:23:43 +0000 (19:53 +0530)]
Additional QA Fix for CRM-15427
----------------------------------------
* CRM-15427: Profiles using Participants (Event type), Participants (Event Name) and Participants (Role) custom fields are not available for online registration
https://issues.civicrm.org/jira/browse/CRM-15427
Kurund Jalmi [Fri, 7 Nov 2014 13:03:22 +0000 (18:33 +0530)]
Merge pull request #4517 from GenericUK/patch-2
Profile select search field is disabled
Kurund Jalmi [Fri, 7 Nov 2014 13:03:09 +0000 (18:33 +0530)]
Merge pull request #4515 from GenericUK/patch-1
Fix missing add another profile option
colemanw [Thu, 6 Nov 2014 16:37:31 +0000 (11:37 -0500)]
Merge pull request #4523 from colemanw/CRM-15524
CRM-15524 - Move APIExplorer.js back to footer
Coleman Watts [Thu, 6 Nov 2014 16:34:12 +0000 (11:34 -0500)]
CRM-15524 - Move APIExplorer.js back to footer
monishdeb [Thu, 6 Nov 2014 12:51:58 +0000 (18:21 +0530)]
CRM-15563 fix - Reminder is_repeat checkbox / column value should be reset if user sets absolute date for a reminder
https://issues.civicrm.org/jira/browse/CRM-15563
Monish Deb [Thu, 6 Nov 2014 10:11:28 +0000 (15:41 +0530)]
Merge pull request #4519 from monishdeb/CRM-15565
CRM-15565 fix - Participent.Get api break for participant_id using IN o...
monishdeb [Thu, 6 Nov 2014 08:06:04 +0000 (13:36 +0530)]
CRM-15565 fix - Participent.Get api break for participant_id using IN operator
https://issues.civicrm.org/jira/browse/CRM-15565
colemanw [Wed, 5 Nov 2014 22:28:10 +0000 (17:28 -0500)]
Merge pull request #4518 from colemanw/CRM-15562
CRM-15562 - Remove 'save and new' button for users without 'add contacts' perm
Coleman Watts [Wed, 5 Nov 2014 22:26:44 +0000 (17:26 -0500)]
CRM-15562 - Remove 'save and new' button for users without 'add contacts' perm
CiviCRM [Wed, 5 Nov 2014 19:54:35 +0000 (11:54 -0800)]
Update version to 4.5.4
colemanw [Wed, 5 Nov 2014 16:12:22 +0000 (11:12 -0500)]
Merge pull request #4516 from colemanw/CRM-15524
CRM-15524 - Modify crm.searchForm.js to work as header script
Coleman Watts [Wed, 5 Nov 2014 16:11:55 +0000 (11:11 -0500)]
CRM-15524 - Modify contribution dashboard js to work as header script
Coleman Watts [Wed, 5 Nov 2014 15:49:05 +0000 (10:49 -0500)]
CRM-15524 - Modify search builder js to work as header script
GenericUK [Wed, 5 Nov 2014 15:17:27 +0000 (15:17 +0000)]
Profile select search field is disabled
Fixes an issue in events online registration profile selector, on already saved profiles the search field is disabled by readonly attribute.
Coleman Watts [Wed, 5 Nov 2014 15:16:30 +0000 (10:16 -0500)]
CRM-15524 - Modify crm.searchForm.js to work as header script
GenericUK [Wed, 5 Nov 2014 13:10:18 +0000 (13:10 +0000)]
Update Registration.tpl
GenericUK [Wed, 5 Nov 2014 12:46:02 +0000 (12:46 +0000)]
Fix missing add another profile option
Fixes an issue in events online registration when additional profiles are removed the add another profile option was also being removed.
Kurund Jalmi [Wed, 5 Nov 2014 11:34:51 +0000 (17:04 +0530)]
Merge pull request #4514 from kurund/CRM-15474
fix for CRM-15474
kurund [Wed, 5 Nov 2014 11:33:23 +0000 (17:03 +0530)]
fix for CRM-15474
----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
https://issues.civicrm.org/jira/browse/CRM-15474
Kurund Jalmi [Wed, 5 Nov 2014 09:46:48 +0000 (15:16 +0530)]
Merge pull request #4513 from atif-shaikh/CRM-15427Fix
Subtypes Not Visible Fix on "add another profile"
atif-shaikh [Wed, 5 Nov 2014 08:18:32 +0000 (13:48 +0530)]
Subtypes Not Visible Fix
projects / civicrm-core.git / log