kurund [Thu, 13 Mar 2014 12:27:23 +0000 (17:57 +0530)]
more test fixes
kurund [Thu, 13 Mar 2014 10:33:41 +0000 (16:03 +0530)]
test fixes related to enum to varchar changes
colemanw [Wed, 12 Mar 2014 01:29:24 +0000 (21:29 -0400)]
Merge pull request #2646 from colemanw/editable
crmeditable - code cleanup and remove crmForm fn
Coleman Watts [Wed, 12 Mar 2014 01:28:06 +0000 (21:28 -0400)]
Autocomplete & option list fixes
Coleman Watts [Wed, 12 Mar 2014 01:11:49 +0000 (21:11 -0400)]
crmeditable - code cleanup and remove crmForm fn
$.crmForm is supplanted by CRM.loadForm
Coleman Watts [Wed, 12 Mar 2014 00:31:12 +0000 (20:31 -0400)]
CRM-13863 - Ensure scrollbars get re-enabled
colemanw [Wed, 12 Mar 2014 00:20:33 +0000 (20:20 -0400)]
Merge pull request #2645 from colemanw/dialog
CRM-13863 - Disable browser scrollbars for modal dialogs
Coleman Watts [Wed, 12 Mar 2014 00:17:29 +0000 (20:17 -0400)]
CRM-13863 - Disable browser scrollbars for modal dialogs
Dave Greenberg [Tue, 11 Mar 2014 22:39:52 +0000 (15:39 -0700)]
Merge pull request #2642 from pratik-joshi/CRM-13965-qa-fixes
CRM-13965-qa-fixes
Pratik Joshi [Wed, 12 Mar 2014 07:06:13 +0000 (12:36 +0530)]
CRM-13965-qa-fixes
Coleman Watts [Tue, 11 Mar 2014 15:49:18 +0000 (11:49 -0400)]
Getlist api - respect search_autocomplete_count vis-a-vis pager
colemanw [Mon, 10 Mar 2014 13:25:55 +0000 (09:25 -0400)]
Merge pull request #2635 from colemanw/master
Relationship form/xml tweaks
Coleman Watts [Mon, 10 Mar 2014 13:25:11 +0000 (09:25 -0400)]
Relationship form/xml tweaks
colemanw [Sat, 8 Mar 2014 16:24:06 +0000 (11:24 -0500)]
Merge pull request #2630 from colemanw/ajax
CRM-10693 - Trigger crmLoad event when loading content
Coleman Watts [Sat, 8 Mar 2014 16:23:29 +0000 (11:23 -0500)]
CRM-10693 - Trigger crmLoad event when loading content
Coleman Watts [Sat, 8 Mar 2014 15:16:32 +0000 (10:16 -0500)]
Common.js - pass data with event crmOptionsUpdated
colemanw [Sat, 8 Mar 2014 02:26:31 +0000 (21:26 -0500)]
Merge pull request #2629 from colemanw/master
CRM_Core_Form::add - don't mess with non-arrays
Coleman Watts [Sat, 8 Mar 2014 02:25:47 +0000 (21:25 -0500)]
CRM_Core_Form::add - don't mess with non-arrays
colemanw [Sat, 8 Mar 2014 01:46:30 +0000 (20:46 -0500)]
Merge pull request #2628 from colemanw/master
Normalize multiple property in CRM_Core_Form::add
Coleman Watts [Sat, 8 Mar 2014 01:33:17 +0000 (20:33 -0500)]
Normalize multiple property in CRM_Core_Form::add
colemanw [Fri, 7 Mar 2014 21:55:20 +0000 (16:55 -0500)]
Merge pull request #2627 from colemanw/ov
CRM-13970 - Remove unused templates
Coleman Watts [Fri, 7 Mar 2014 21:55:05 +0000 (16:55 -0500)]
SurveyType - fix wysiwyg in popups
Coleman Watts [Fri, 7 Mar 2014 20:52:12 +0000 (15:52 -0500)]
CRM-13970 - Remove unused templates
Coleman Watts [Fri, 7 Mar 2014 20:21:47 +0000 (15:21 -0500)]
TabHeader.js - error checking
Coleman Watts [Fri, 7 Mar 2014 19:22:52 +0000 (14:22 -0500)]
Summary.js cleanup
colemanw [Fri, 7 Mar 2014 18:59:24 +0000 (13:59 -0500)]
Merge pull request #2625 from colemanw/edits
Form work
Dave Greenberg [Fri, 7 Mar 2014 16:06:01 +0000 (08:06 -0800)]
Merge pull request #2623 from pratik-joshi/CRM-13973-fixes
CRM-13973-fixes : email receipt line item fix
Dave Greenberg [Fri, 7 Mar 2014 16:04:56 +0000 (08:04 -0800)]
Merge pull request #2624 from colemanw/soft
CRM-13981 - Fix options edit link for soft-credits
Coleman Watts [Fri, 7 Mar 2014 15:41:48 +0000 (10:41 -0500)]
Group form tweak - add select2
Coleman Watts [Fri, 7 Mar 2014 15:34:05 +0000 (10:34 -0500)]
HR-301 - Remove jquery.crmContactField.js
Coleman Watts [Fri, 7 Mar 2014 15:05:43 +0000 (10:05 -0500)]
CRM_Core_Form addSelect tweaks
Coleman Watts [Fri, 7 Mar 2014 14:47:49 +0000 (09:47 -0500)]
CRM-13981 - Fix options edit link for soft-credits
Pratik Joshi [Fri, 7 Mar 2014 10:31:43 +0000 (16:01 +0530)]
CRM-13973-fixes : email receipt line item fix
Dave Greenberg [Fri, 7 Mar 2014 03:05:05 +0000 (19:05 -0800)]
Merge pull request #2619 from pratik-joshi/CRM-13965-qa-fixes
Crm 13965 qa fixes and work on CRM-13973
Coleman Watts [Fri, 7 Mar 2014 02:36:17 +0000 (21:36 -0500)]
Relationship form tweaks
Coleman Watts [Fri, 7 Mar 2014 02:16:52 +0000 (21:16 -0500)]
Icon css tweaks
Coleman Watts [Fri, 7 Mar 2014 01:36:25 +0000 (20:36 -0500)]
Rename unselectable to allowClear for consistency with select2
Coleman Watts [Fri, 7 Mar 2014 01:18:40 +0000 (20:18 -0500)]
common.js and EntityRef documentation updates
Dave Greenberg [Fri, 7 Mar 2014 01:03:11 +0000 (17:03 -0800)]
Merge pull request #2609 from lcdservices/CRM-14312
CRM-14312 include prefix/suffix when passing to contact create so displa...
Dave Greenberg [Thu, 6 Mar 2014 22:04:14 +0000 (14:04 -0800)]
Merge pull request #2621 from colemanw/selector
CRM-11610 - Add row-highlight class to search tables
Dave Greenberg [Thu, 6 Mar 2014 21:44:09 +0000 (13:44 -0800)]
Merge pull request #2622 from colemanw/fi
Popups - error checking on event listner
Coleman Watts [Thu, 6 Mar 2014 21:35:47 +0000 (16:35 -0500)]
Popups - error checking on event listner
Coleman Watts [Thu, 6 Mar 2014 21:26:32 +0000 (16:26 -0500)]
CRM-11610 - Add row-highlight class to search tables
Dave Greenberg [Thu, 6 Mar 2014 20:33:40 +0000 (12:33 -0800)]
Merge pull request #2565 from deepak-srivastava/CRM-12467-soft-credit-search
CRM-12467 soft credit searches and export
Coleman Watts [Thu, 6 Mar 2014 16:48:32 +0000 (11:48 -0500)]
Select2 tweaks
Coleman Watts [Thu, 6 Mar 2014 16:45:53 +0000 (11:45 -0500)]
Add jquery.mousewheel.js
Pratik Joshi [Thu, 6 Mar 2014 16:17:25 +0000 (21:47 +0530)]
CRM-13965 : regenerated data
Pratik Joshi [Thu, 6 Mar 2014 15:46:30 +0000 (21:16 +0530)]
CRM-13965 : improvement; CRM-13973 : done with all handling except for email receipt
colemanw [Thu, 6 Mar 2014 14:49:07 +0000 (09:49 -0500)]
Merge pull request #2618 from colemanw/master
Fix undefined index
Coleman Watts [Thu, 6 Mar 2014 14:47:23 +0000 (09:47 -0500)]
Fix undefined index
Brian Shaughnessy [Thu, 6 Mar 2014 14:32:24 +0000 (09:32 -0500)]
CRM-14312 include full main/other details when triggered from single pair merge
Deepak Srivastava [Thu, 6 Mar 2014 14:02:06 +0000 (19:32 +0530)]
make reverting from soft-credit search to contributions-only clean, based on queryparams - soft credits columns should disappear
Deepak Srivastava [Thu, 6 Mar 2014 13:23:00 +0000 (18:53 +0530)]
re-add missing contributionID column for soft-credit export
Deepak Srivastava [Thu, 6 Mar 2014 13:12:30 +0000 (18:42 +0530)]
include join with soft credit by default, when softcredit search is active
Deepak Srivastava [Thu, 6 Mar 2014 12:34:49 +0000 (18:04 +0530)]
QILL, Overall Results Counter, Export duplicate bug, Moving/renaming amount column fixes
Pratik Joshi [Thu, 6 Mar 2014 08:51:39 +0000 (14:21 +0530)]
CRM-13965-qa-fixes : fix for participant status not getting changed for credit card form submission
Pratik Joshi [Thu, 6 Mar 2014 07:55:14 +0000 (13:25 +0530)]
CRM-13965-qa-fixes : email message template fixes
Kurund Jalmi [Thu, 6 Mar 2014 07:43:39 +0000 (13:13 +0530)]
Merge pull request #2605 from kurund/CRM-14201
fixed duplicate count of relationship, CRM-14201
kurund [Thu, 6 Mar 2014 07:43:03 +0000 (13:13 +0530)]
changed page size to 10, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
Pratik Joshi [Thu, 6 Mar 2014 04:40:47 +0000 (10:10 +0530)]
CRM-13965-qa-fixes : some major improvements and #5 issue fix mentioned in comment by dgg after the initial QA round
colemanw [Thu, 6 Mar 2014 02:45:38 +0000 (21:45 -0500)]
Merge pull request #2617 from colemanw/pp
HR-301 - Support contact create on clientside
Coleman Watts [Thu, 6 Mar 2014 02:29:13 +0000 (21:29 -0500)]
CRM-13966 HR-301 - Update relationship form with new entityRef methods
Coleman Watts [Thu, 6 Mar 2014 01:28:04 +0000 (20:28 -0500)]
CRM-13966 HR-301 - Support contact create on clientside, toward refactoring out jquery.crmContactField.js
Dave Greenberg [Thu, 6 Mar 2014 01:24:23 +0000 (17:24 -0800)]
Merge pull request #2616 from davecivicrm/relationshipFormNotice
Fix notice in Relationship.php postProcess caused by typo, $this->action...
Dave Greenberg [Thu, 6 Mar 2014 01:23:36 +0000 (17:23 -0800)]
Fix notice in Relationship.php postProcess caused by typo, $this->action s/b $this->_action
Dave Greenberg [Thu, 6 Mar 2014 01:16:16 +0000 (17:16 -0800)]
Merge pull request #2613 from colemanw/employer
CurrentEmployer and select-list cleanup
Coleman Watts [Wed, 5 Mar 2014 22:28:27 +0000 (17:28 -0500)]
CRM-13966 HR-301 - More robust cliet-side entityRef, toward refactoring out jquery.crmContactField.js
Dave Greenberg [Wed, 5 Mar 2014 20:22:38 +0000 (12:22 -0800)]
Merge pull request #2614 from davecivicrm/CRM-14316
CRM-14316 - update link for info on ReCaptcha on Miscellaneous Settings ...
Dave Greenberg [Wed, 5 Mar 2014 20:21:05 +0000 (12:21 -0800)]
CRM-14316 - update link for info on ReCaptcha on Miscellaneous Settings page.
----------------------------------------
* CRM-14316: Recaptcha documentation link is incorrect
http://issues.civicrm.org/jira/browse/CRM-14316
Coleman Watts [Wed, 5 Mar 2014 18:52:14 +0000 (13:52 -0500)]
Address location type cleanup
Coleman Watts [Wed, 5 Mar 2014 18:31:14 +0000 (13:31 -0500)]
Fix IM label
Coleman Watts [Wed, 5 Mar 2014 18:26:03 +0000 (13:26 -0500)]
CRM-10693 - Trigger events and support drupal wysiwyg in popups
Coleman Watts [Wed, 5 Mar 2014 18:25:26 +0000 (13:25 -0500)]
CRM-14165 - Remove placeholder where it's not wanted
Coleman Watts [Wed, 5 Mar 2014 18:23:33 +0000 (13:23 -0500)]
Common.js - default select tweaks
Coleman Watts [Wed, 5 Mar 2014 16:23:42 +0000 (11:23 -0500)]
CurrentEmployer cleanup
Pratik Joshi [Wed, 5 Mar 2014 08:44:01 +0000 (14:14 +0530)]
CRM-13965-qa-fixes : activity selector links for Payment, Refund, Change Registration types
Pratik Joshi [Wed, 5 Mar 2014 05:36:39 +0000 (11:06 +0530)]
CRM-13965-qa-fixes : BAO renaming, event.balance token money formatting
Pratik Joshi [Wed, 5 Mar 2014 05:18:51 +0000 (10:48 +0530)]
CRM-13965-qa-fixes: fix for status message, financial_type select box removal, default date setting to current
Dave Greenberg [Wed, 5 Mar 2014 00:33:20 +0000 (16:33 -0800)]
Merge pull request #2611 from davecivicrm/CRM-13981
CRM-13981 - Remove reference to obsolete column honor_contact_id in Merg...
Dave Greenberg [Wed, 5 Mar 2014 00:32:23 +0000 (16:32 -0800)]
CRM-13981 - Remove reference to obsolete column honor_contact_id in Merger.php which was causing fatal error on merge. Remove Honoree.tpl which is no longer used.
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
Tim Otten [Tue, 4 Mar 2014 23:45:32 +0000 (15:45 -0800)]
Merge pull request #2610 from totten/master-fix-api-abort
api_v3_SyntaxConformanceTest - Fix hard failure
Tim Otten [Tue, 4 Mar 2014 23:39:33 +0000 (15:39 -0800)]
api_v3_SyntaxConformanceTest - Fix hard failure
The arbitrarily generated value of "tax_rate" violates the MySQL precision
constraints. This commit ensures that the arbitrarily chosen values meet
the constraint (while trying to preserve the old series of generated
numbers for most use-cases).
Brian Shaughnessy [Tue, 4 Mar 2014 20:16:42 +0000 (15:16 -0500)]
CRM-14312 include prefix/suffix when passing to contact create so display/sort name is constructed properly; fix prefix/suffix display in merge diff page
Deepak Srivastava [Tue, 4 Mar 2014 14:26:13 +0000 (19:56 +0530)]
use group by to ensure row count correctness in any case.
Deepak Srivastava [Tue, 4 Mar 2014 12:26:29 +0000 (17:56 +0530)]
soft credit filter form layout fixes
Deepak Srivastava [Tue, 4 Mar 2014 12:05:02 +0000 (17:35 +0530)]
make contributions only - the default option
Deepak Srivastava [Tue, 4 Mar 2014 11:20:50 +0000 (16:50 +0530)]
soft credit statistics, hyperlink for soft-credit-for-name
Deepak Srivastava [Tue, 4 Mar 2014 08:15:05 +0000 (13:45 +0530)]
soft credit multi-line export
kurund [Tue, 4 Mar 2014 07:14:37 +0000 (12:44 +0530)]
fixed duplicate count of relationship, removed extra space, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Tue, 4 Mar 2014 07:12:08 +0000 (12:42 +0530)]
fixed duplicate count of relationship, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
pratik-joshi [Tue, 4 Mar 2014 07:05:31 +0000 (12:35 +0530)]
Merge pull request #2602 from pratik-joshi/CRM-13964-qa
Crm 13964 QA fixes
Pratik Joshi [Tue, 4 Mar 2014 07:02:00 +0000 (12:32 +0530)]
CRM-13964-qa : some more fixes / additions done
Tim Otten [Tue, 4 Mar 2014 01:37:01 +0000 (17:37 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
Dave Greenberg [Mon, 3 Mar 2014 22:41:49 +0000 (14:41 -0800)]
Merge pull request #2588 from lcdservices/CRM-14190-2
CRM-14190 restructure how we handle parent group selection; add to smart...
Pratik Joshi [Mon, 3 Mar 2014 22:29:03 +0000 (03:59 +0530)]
CRM-13964-qa
colemanw [Mon, 3 Mar 2014 21:45:15 +0000 (16:45 -0500)]
Merge pull request #2603 from davecivicrm/CRM-9877
CRM-9877 - Revert prior patch which was unintentionally removing filter...
Dave Greenberg [Mon, 3 Mar 2014 21:44:15 +0000 (13:44 -0800)]
CRM-9877 - Revert second section of patch.
----------------------------------------
* CRM-9877: Relationship type ommited in dropdown list when it's for all contacts
http://issues.civicrm.org/jira/browse/CRM-9877
Dave Greenberg [Mon, 3 Mar 2014 21:39:59 +0000 (13:39 -0800)]
CRM-9877 - Revert prior patch which was unintentionally removing filters on contact types when creating relationships.
----------------------------------------
* CRM-9877: Relationship type ommited in dropdown list when it's for all contacts
http://issues.civicrm.org/jira/browse/CRM-9877
Pratik Joshi [Mon, 3 Mar 2014 21:09:43 +0000 (02:39 +0530)]
CRM-13964-qa : upgrade message template adding
Pratik Joshi [Mon, 3 Mar 2014 21:08:35 +0000 (02:38 +0530)]
CRM-13964-qa : includes 1st QA cycle fixes mentioned in issue comment