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
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...
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
Dave Greenberg [Wed, 5 Nov 2014 00:58:53 +0000 (16:58 -0800)]
Merge pull request #4510 from pradpnayak/CRM-15558
--CRM-15558, Fixed size of the civicrm_mailing_bounce_type.name field
Pradeep Nayak [Tue, 4 Nov 2014 22:17:57 +0000 (03:47 +0530)]
--CRM-15558, fixing size of field in 4.5.alpha1.mysql.tpl to avoid truncate of custom bounce type name to char length of 12 during upgrade of 4.4.x to 4.5
Pradeep Nayak [Tue, 4 Nov 2014 19:11:02 +0000 (00:41 +0530)]
--CRM-15558, Fixed size of the civicrm_mailing_bounce_type.name field
Dave Greenberg [Tue, 4 Nov 2014 19:30:47 +0000 (11:30 -0800)]
Merge pull request #4494 from monishdeb/CRM-15556
CRM-15556 fix - Checkbox custom field error of OnBehalf profile on online contribution's confirm page
Yashodha Chaku [Tue, 4 Nov 2014 11:40:12 +0000 (17:10 +0530)]
Merge pull request #4506 from yashodha/CRM-15475
CRM-15475 :fix generated data
CiviCRM [Tue, 4 Nov 2014 11:35:38 +0000 (17:05 +0530)]
CRM-15475 :fix generated data
monishdeb [Tue, 4 Nov 2014 08:25:57 +0000 (13:55 +0530)]
typo fix - debug
monishdeb [Tue, 4 Nov 2014 08:24:32 +0000 (13:54 +0530)]
Additional fixes
Monish Deb [Tue, 4 Nov 2014 07:40:52 +0000 (13:10 +0530)]
Merge pull request #4504 from rohankatkar/CRM15544
Fix for CRM-15544
Rohan Katkar [Tue, 4 Nov 2014 07:38:56 +0000 (13:08 +0530)]
Fix for CRM-15544
Yashodha Chaku [Tue, 4 Nov 2014 07:02:01 +0000 (12:32 +0530)]
Merge pull request #4492 from pradpnayak/CRM-15475
Crm 15475
Kurund Jalmi [Tue, 4 Nov 2014 06:47:47 +0000 (12:17 +0530)]
Merge pull request #4467 from atif-shaikh/CRM-15427AdditionalFixes
CRM-15427 Additional Fixes
colemanw [Tue, 4 Nov 2014 02:30:01 +0000 (21:30 -0500)]
Merge pull request #4501 from colemanw/Fix
Fix Custom/Page/Option.tpl to separate form from page
Coleman Watts [Tue, 4 Nov 2014 02:20:30 +0000 (21:20 -0500)]
fix tpl space
Coleman Watts [Tue, 4 Nov 2014 02:17:16 +0000 (21:17 -0500)]
Fix Custom/Page/Option.tpl to separate form from page
Coleman Watts [Tue, 4 Nov 2014 02:05:31 +0000 (21:05 -0500)]
CRM-15524 - Avoid loading profileSelector scripts in ajax mode
This commit tweaks the call of CRM_Core_Resources::isAjaxMode to use the simpler static method.
colemanw [Tue, 4 Nov 2014 01:33:41 +0000 (20:33 -0500)]
Merge pull request #4500 from colemanw/CRM-15346
CRM-15346 - pass more specific context to Drupal.behaviors
Coleman Watts [Tue, 4 Nov 2014 01:32:48 +0000 (20:32 -0500)]
CRM-15346 - pass more specific context to Drupal.behaviors
Coleman Watts [Tue, 4 Nov 2014 01:19:30 +0000 (20:19 -0500)]
CRM-15524 - Avoid loading profileSelector scripts in ajax mode
Tim Otten [Mon, 3 Nov 2014 21:01:14 +0000 (13:01 -0800)]
Merge pull request #4440 from colemanw/CRM-15524
CRM-15524 - Support adding settings, scripts, etc in snippet mode
monishdeb [Mon, 3 Nov 2014 10:56:21 +0000 (16:26 +0530)]
CRM-15556 fix - Checkbox custom field error of OnBehalf profile on online contribution's confirm page
https://issues.civicrm.org/jira/browse/CRM-15556
Pradeep Nayak [Mon, 3 Nov 2014 05:57:36 +0000 (11:27 +0530)]
-- CRM-15475, Added upgrade code to make Cancelled status as reserved
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:31:04 +0000 (11:01 +0530)]
-- CRM-15475, changed Cancelled mmebership status to reserved
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:28:03 +0000 (10:58 +0530)]
-- CRM-15475, Used Contribution status Pseudoconstant to fetch id rather then using getfield value function
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:26:54 +0000 (10:56 +0530)]
-- CRM-15475, Retrieved value for membership status id regardless of civicrm_membership_status.is_active field
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Yashodha Chaku [Mon, 3 Nov 2014 05:28:50 +0000 (10:58 +0530)]
Merge pull request #4484 from atif-shaikh/CRM-15547
CRM-15547 - Current Employer not saved on Drupal user profile
Coleman Watts [Mon, 3 Nov 2014 00:48:07 +0000 (19:48 -0500)]
CRM-15524 - Move static js resources to the html-header region so they don't reload with ajax page refreshes
Coleman Watts [Sun, 2 Nov 2014 23:35:29 +0000 (18:35 -0500)]
CRM-15524 - Add 'ajax-snippet' region
Coleman Watts [Sat, 25 Oct 2014 01:37:56 +0000 (21:37 -0400)]
CRM-15524 - Support adding scripts, styles, etc to page header/footer regions in snippet mode
Coleman Watts [Sat, 1 Nov 2014 19:36:19 +0000 (15:36 -0400)]
crm.multilingual.js code comment cleanup
colemanw [Fri, 31 Oct 2014 23:54:17 +0000 (19:54 -0400)]
Merge pull request #4486 from colemanw/CRM-15551
CRM-15551 - crmEditable: add placeholder if empty after editing
Coleman Watts [Fri, 31 Oct 2014 23:51:04 +0000 (19:51 -0400)]
CRM-15551 - crmEditable: add placeholder if empty after editing
Eileen McNaughton [Fri, 31 Oct 2014 15:56:47 +0000 (04:56 +1300)]
Merge pull request #4482 from jitendrapurohit/CRM-15508
CRM-15508 Custom Group Create API references non existant var
Dave Greenberg [Fri, 31 Oct 2014 15:40:19 +0000 (08:40 -0700)]
Merge pull request #4478 from davecivicrm/CRM-15197
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Co...
atif-shaikh [Fri, 31 Oct 2014 13:47:38 +0000 (19:17 +0530)]
CRM-15547 - Current Employer not saved on Drupal user profile
https://issues.civicrm.org/jira/browse/CRM-15547
Yashodha Chaku [Fri, 31 Oct 2014 10:53:43 +0000 (16:23 +0530)]
Merge pull request #4480 from rohankatkar/CRM_15540
Additional changes and notices fix for CRM-15540
jitendrapurohit [Fri, 31 Oct 2014 10:21:49 +0000 (15:51 +0530)]
CRM-15508 Custom Group Create API references non existant var Fix
Yashodha Chaku [Fri, 31 Oct 2014 09:05:33 +0000 (14:35 +0530)]
Merge pull request #4463 from jmcclelland/authorize-recur-unlimited
CRM-15537 - translate open ended installments to 9999 for authorize.net
Rohan Katkar [Fri, 31 Oct 2014 07:19:20 +0000 (12:49 +0530)]
Additional changes and notices fix for CRM-15540
Dave Greenberg [Fri, 31 Oct 2014 00:33:26 +0000 (17:33 -0700)]
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Corresponding webtest fix as well.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
projects / civicrm-core.git / log