Dave Greenberg [Fri, 14 Nov 2014 23:39:26 +0000 (15:39 -0800)]
Merge pull request #4561 from davecivicrm/CRM-15536
CRM-15336 - Help improvements.
Dave Greenberg [Fri, 14 Nov 2014 23:38:40 +0000 (15:38 -0800)]
CRM-15336 - Help improvements.
----------------------------------------
* CRM-15336:
https://issues.civicrm.org/jira/browse/CRM-15336
Dave Greenberg [Fri, 14 Nov 2014 23:35:27 +0000 (15:35 -0800)]
Merge pull request #4557 from monishdeb/CRM-15536
CRM-15536 fixes - Scheduled reminders: Clarify "Limit to" and "Also incl...
Dave Greenberg [Fri, 14 Nov 2014 22:15:33 +0000 (14:15 -0800)]
Merge pull request #4559 from davecivicrm/CRM-15555a
CRM-15555 - Fix bug in addPaypalExpressCode function. Clean up Billing r...
Dave Greenberg [Fri, 14 Nov 2014 20:49:29 +0000 (12:49 -0800)]
CRM-15555 - Fix bug in addPaypalExpressCode function. Clean up Billing required label and add inline help. Fix issue where PayPal fields not picked up on page load in event/register due to missing change in Register.tpl.
----------------------------------------
* CRM-15555:
https://issues.civicrm.org/jira/browse/CRM-15555
Dave Greenberg [Fri, 14 Nov 2014 19:51:13 +0000 (11:51 -0800)]
Merge pull request #4558 from davecivicrm/CRM-15453a
CRM-15453 - New Recur contribution report class, template and report ins...
Dave Greenberg [Fri, 14 Nov 2014 19:22:17 +0000 (11:22 -0800)]
CRM-15453 - New Recur contribution civicrm_generated.mysql.
----------------------------------------
* CRM-15453:
https://issues.civicrm.org/jira/browse/CRM-15453
Dave Greenberg [Fri, 14 Nov 2014 19:14:38 +0000 (11:14 -0800)]
CRM-15453 - New Recur contribution report class, template and report instance.
----------------------------------------
* CRM-15453:
https://issues.civicrm.org/jira/browse/CRM-15453
monishdeb [Fri, 14 Nov 2014 18:42:58 +0000 (00:12 +0530)]
Entity dropdown fix
monishdeb [Fri, 14 Nov 2014 18:25:22 +0000 (23:55 +0530)]
CRM-15536 fixes - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors
https://issues.civicrm.org/jira/browse/CRM-15536
Dave Greenberg [Fri, 14 Nov 2014 17:25:21 +0000 (09:25 -0800)]
Merge pull request #4528 from eileenmcnaughton/CRM-15555
CRM-15555 fix QA bug on paylater when billing option is required
kurund [Fri, 14 Nov 2014 05:54:48 +0000 (11:24 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50
Conflicts:
CRM/Event/BAO/Query.php
sql/civicrm_generated.mysql
xml/version.xml
Eileen McNaughton [Thu, 13 Nov 2014 22:23:46 +0000 (11:23 +1300)]
enotice fix
Dave Greenberg [Fri, 14 Nov 2014 01:37:47 +0000 (17:37 -0800)]
Merge pull request #4508 from monishdeb/CRM-15536
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors
monishdeb [Thu, 13 Nov 2014 21:05:12 +0000 (02:35 +0530)]
QA fixes
Eileen McNaughton [Thu, 13 Nov 2014 16:09:30 +0000 (05:09 +1300)]
CRM-15555 remove last instances of refs to hard-coded payment field types
Eileen McNaughton [Thu, 13 Nov 2014 15:03:42 +0000 (04:03 +1300)]
CRM-15555 break sharing of parent class between unrelated forms
admin forms (membership_type & membership_status) don't have much in common with membership & renewal forms - disconnect
Eileen McNaughton [Thu, 13 Nov 2014 02:01:23 +0000 (15:01 +1300)]
CRM-15555 remove check for payment processor validity in formRule - checks for this go in the preProcess loading of processors, not post-process
(was highlighted as was causing an error in pay later but on review made more sense to review than fix
Eileen McNaughton [Thu, 13 Nov 2014 01:54:30 +0000 (14:54 +1300)]
CRM-15555 fix fatal error on postProcess due to confusion about pay later status
Eileen McNaughton [Mon, 10 Nov 2014 04:15:14 +0000 (17:15 +1300)]
CRM-15555 fix for credit card showing on paylater
Eileen McNaughton [Mon, 10 Nov 2014 03:59:56 +0000 (16:59 +1300)]
CRM-15555 fix poorly named variable to reflect what is actually in it
Eileen McNaughton [Mon, 10 Nov 2014 03:07:53 +0000 (16:07 +1300)]
CRM-15555 don't do recursive save
Eileen McNaughton [Sun, 9 Nov 2014 23:13:20 +0000 (12:13 +1300)]
CRM-15555 declare processor_type before calling singleton
Eileen McNaughton [Sat, 8 Nov 2014 08:02:22 +0000 (21:02 +1300)]
CRM-15555 fix additional payment form (enotice still to fix)
Eileen McNaughton [Sat, 8 Nov 2014 07:42:10 +0000 (20:42 +1300)]
CRM-15555 fix QA bug on paylater when billing option is required
monishdeb [Wed, 5 Nov 2014 09:36:53 +0000 (15:06 +0530)]
minor fix
monishdeb [Tue, 4 Nov 2014 17:23:08 +0000 (22:53 +0530)]
minor fix
monishdeb [Tue, 4 Nov 2014 14:31:50 +0000 (20:01 +0530)]
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors
https://issues.civicrm.org/jira/browse/CRM-15536
Monish Deb [Thu, 13 Nov 2014 07:17:00 +0000 (12:47 +0530)]
Merge pull request #4546 from rohankatkar/CRM-15514
CRM-15514
Yashodha Chaku [Thu, 13 Nov 2014 06:54:31 +0000 (12:24 +0530)]
Merge pull request #4391 from seamuslee001/master
CRM 15488 Include invoice description in back office Credit Card Transac...
Monish Deb [Thu, 13 Nov 2014 05:35:18 +0000 (11:05 +0530)]
Merge pull request #4545 from monishdeb/CRM-15361
CRM-15361 fix - allow selection of location type when sending bulk email
monishdeb [Thu, 13 Nov 2014 05:18:52 +0000 (10:48 +0530)]
Version change in xml
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
Eileen McNaughton [Thu, 13 Nov 2014 01:56:21 +0000 (14:56 +1300)]
Merge pull request #4533 from davecivicrm/CRM-15555
CRM-15555 - Fix fatal error from protected vars (contactID and context).
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 19:38:57 +0000 (11:38 -0800)]
Merge pull request #4540 from christianwach/crm-12616
Page title fixes to accompany plugin fixes for CRM-12616
Christian Wach [Wed, 12 Nov 2014 16:03:51 +0000 (16:03 +0000)]
pinking shears - remove stray whitespace
Rohan Katkar [Wed, 12 Nov 2014 13:16:52 +0000 (18:46 +0530)]
CRM-15514
monishdeb [Wed, 12 Nov 2014 12:36:27 +0000 (18:06 +0530)]
CRM-15361 fix - allow selection of location type when sending bulk email
https://issues.civicrm.org/jira/browse/CRM-15361
Monish Deb [Wed, 12 Nov 2014 07:08:42 +0000 (12:38 +0530)]
Merge pull request #4536 from monishdeb/CRM-14585
CRM-14585 fix - Incorrect defaults loaded when two phone fields are adde...
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
Yashodha Chaku [Tue, 11 Nov 2014 13:37:09 +0000 (19:07 +0530)]
Merge pull request #4296 from mrpaulc/CRM-14751
CRM-14751, deleted contacts visible in search
Christian Wach [Tue, 11 Nov 2014 11:58:16 +0000 (11:58 +0000)]
update docblock for setTitle()
Christian Wach [Tue, 11 Nov 2014 11:57:48 +0000 (11:57 +0000)]
use new title-setting method for civicm-wordpress 4.6+
Yashodha Chaku [Tue, 11 Nov 2014 09:13:34 +0000 (14:43 +0530)]
Merge pull request #4415 from rnao/add-participants-to-group
CRM-15428 - CiviEvent - Add participants to a group
monishdeb [Tue, 11 Nov 2014 07:33:25 +0000 (13:03 +0530)]
CRM-14585 fix - Incorrect defaults loaded when two phone fields are added to the same profile one primary and one not primary (EG. Home) with different phone types
https://issues.civicrm.org/jira/browse/CRM-14585
Monish Deb [Tue, 11 Nov 2014 06:54:23 +0000 (12:24 +0530)]
Merge pull request #4520 from jitendrapurohit/CRM-15545
Exporting related contacts prefix exports prefix_id CRM-15545
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
Dave Greenberg [Mon, 10 Nov 2014 22:58:55 +0000 (14:58 -0800)]
CRM-15555 - Fix fatal error from protected vars (contactID and context).
----------------------------------------
* CRM-15555:
https://issues.civicrm.org/jira/browse/CRM-15555
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
Monish Deb [Mon, 10 Nov 2014 19:26:50 +0000 (00:56 +0530)]
Merge pull request #4531 from rohankatkar/CRM_12281
CRM-12281: To update name of Latvian provinces and also handled in upgradation.
Rohan Katkar [Mon, 10 Nov 2014 13:31:03 +0000 (19:01 +0530)]
CRM-12281: To update name of Latvian provinces.
Monish Deb [Mon, 10 Nov 2014 13:11:02 +0000 (18:41 +0530)]
Merge pull request #4530 from atif-shaikh/CRM-14550
CRM-14550 Fix - Future date selection in reports
atif-shaikh [Mon, 10 Nov 2014 12:21:39 +0000 (17:51 +0530)]
CRM-14550 Fix - Future date selection in reports
https://issues.civicrm.org/jira/browse/CRM-14550
Kurund Jalmi [Mon, 10 Nov 2014 09:26:41 +0000 (14:56 +0530)]
Merge pull request #4274 from mrpaulc/CRM-14868
CRM-14868 - allow currency symbol in contribution amount_other
Dave Greenberg [Sat, 8 Nov 2014 00:32:39 +0000 (16:32 -0800)]
Merge pull request #4207 from TeNNoX/bettertagoverview3
Better tag overview
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
jitendrapurohit [Thu, 6 Nov 2014 12:43:20 +0000 (18:13 +0530)]
Exporting related contacts' prefix exports prefix_id CRM-15545
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
Dave Greenberg [Thu, 6 Nov 2014 02:01:02 +0000 (18:01 -0800)]
Merge pull request #4389 from priyankakaran26/recurring-activity-46
CRM-15490 - Recurring Activities Using Core Recursion
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
Dave Greenberg [Wed, 5 Nov 2014 21:35:02 +0000 (13:35 -0800)]
Merge pull request #4512 from eileenmcnaughton/CRM-15555
CRM-15555 QA fix - ensure email always assigned
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
Eileen McNaughton [Wed, 5 Nov 2014 04:33:17 +0000 (17:33 +1300)]
CRM-15555 fix for paypal express code showing in backoffice
Eileen McNaughton [Wed, 5 Nov 2014 03:58:15 +0000 (16:58 +1300)]
CRM-15555 QA fix - ensure email always assigned
Dave Greenberg [Wed, 5 Nov 2014 03:57:10 +0000 (19:57 -0800)]
Merge pull request #4493 from eileenmcnaughton/CRM-15555
CRM-15555 refactor definition of fields onto payment processors
Seamus Lee [Wed, 5 Nov 2014 02:58:07 +0000 (02:58 +0000)]
CRM 15488 update Membership office payment invoice descriptions
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
unknown [Tue, 4 Nov 2014 22:59:57 +0000 (22:59 +0000)]
Merge branch 'master' into recurring-activity-46
Conflicts:
CRM/Core/BAO/RecurringEntity.php
CRM/Core/Form/RecurringEntity.php
CRM/Core/Page/AJAX/RecurringEntity.php
CRM/Event/Form/ManageEvent/Repeat.php
templates/CRM/Core/Form/RecurringEntity.tpl
templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
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
unknown [Tue, 4 Nov 2014 14:15:32 +0000 (14:15 +0000)]
some code improvements
Eileen McNaughton [Tue, 4 Nov 2014 12:40:14 +0000 (01:40 +1300)]
Merge pull request #4505 from eileenmcnaughton/CRM-15203
CRM-15203 fix situation where membership payment record is not created
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
projects / civicrm-core.git / log