civicrm-core.git
10 years agoMerge pull request #2568 from seamuslee001/master
Kurund Jalmi [Thu, 13 Mar 2014 12:39:19 +0000 (18:09 +0530)]
Merge pull request #2568 from seamuslee001/master

Fix CRM-14275 membership contribution-detail report

10 years agoMerge pull request #2659 from kurund/test-fixes
Kurund Jalmi [Thu, 13 Mar 2014 12:28:26 +0000 (17:58 +0530)]
Merge pull request #2659 from kurund/test-fixes

more test fixes

10 years agomore test fixes
kurund [Thu, 13 Mar 2014 12:27:23 +0000 (17:57 +0530)]
more test fixes

10 years agoMerge pull request #2657 from kurund/test-fixes
Kurund Jalmi [Thu, 13 Mar 2014 10:34:45 +0000 (16:04 +0530)]
Merge pull request #2657 from kurund/test-fixes

test fixes related to enum to varchar changes

10 years agotest fixes related to enum to varchar changes
kurund [Thu, 13 Mar 2014 10:33:41 +0000 (16:03 +0530)]
test fixes related to enum to varchar changes

10 years agoMerge pull request #2655 from colemanw/mini
colemanw [Thu, 13 Mar 2014 01:38:37 +0000 (21:38 -0400)]
Merge pull request #2655 from colemanw/mini

Mini notification updates

10 years agoFix incorrect variable
Coleman Watts [Thu, 13 Mar 2014 01:07:38 +0000 (21:07 -0400)]
Fix incorrect variable

10 years agoMerge pull request #2651 from pratik-joshi/CRM-13973-qa
Dave Greenberg [Thu, 13 Mar 2014 01:06:43 +0000 (18:06 -0700)]
Merge pull request #2651 from pratik-joshi/CRM-13973-qa

Crm 13973 qa fixes

10 years agoCRM-13817 - mini notification default messages based on api action
Coleman Watts [Thu, 13 Mar 2014 00:13:13 +0000 (20:13 -0400)]
CRM-13817 - mini notification default messages based on api action

10 years agoCRM-13863 - Ensure cancel button gets needed css class
Coleman Watts [Thu, 13 Mar 2014 00:12:26 +0000 (20:12 -0400)]
CRM-13863 - Ensure cancel button gets needed css class

10 years agoMerge pull request #2654 from davecivicrm/CRM-14133
Dave Greenberg [Wed, 12 Mar 2014 22:41:12 +0000 (15:41 -0700)]
Merge pull request #2654 from davecivicrm/CRM-14133

CRM-14133 - Fix add2Group query when Show No. of Top Donors field has a ...

10 years agoCRM-14133 - Fix add2Group query when Show No. of Top Donors field has a value (e...
Dave Greenberg [Wed, 12 Mar 2014 22:40:12 +0000 (15:40 -0700)]
CRM-14133 - Fix add2Group query when Show No. of Top Donors field has a value (e.g. limit). Prior version was returning empty result set.

----------------------------------------
* CRM-14133: Top Donor Report Results "Add to Group" Doesn't Work if "Show no." Filter Used
  http://issues.civicrm.org/jira/browse/CRM-14133

10 years agoMenu js tweak
Coleman Watts [Wed, 12 Mar 2014 21:41:37 +0000 (17:41 -0400)]
Menu js tweak

10 years agoMerge pull request #2653 from colemanw/mini
colemanw [Wed, 12 Mar 2014 21:37:34 +0000 (17:37 -0400)]
Merge pull request #2653 from colemanw/mini

CRM-13817 - Improve mini notification styling and function signature

10 years agoCRM-13817 - Improve mini notification styling and function signature
Coleman Watts [Wed, 12 Mar 2014 21:35:57 +0000 (17:35 -0400)]
CRM-13817 - Improve mini notification styling and function signature

10 years agoMerge pull request #2647 from sushantpaste/activitydatesort
Dave Greenberg [Wed, 12 Mar 2014 21:14:48 +0000 (14:14 -0700)]
Merge pull request #2647 from sushantpaste/activitydatesort

Fix for Activity  tab date column sorting

10 years agoCRM-13973-qa : financial_item statuses fix on change selection
Pratik Joshi [Wed, 12 Mar 2014 14:23:14 +0000 (19:53 +0530)]
CRM-13973-qa : financial_item statuses fix on change selection

10 years agoMerge pull request #2650 from atif-shaikh/CRM-10256
Kurund Jalmi [Wed, 12 Mar 2014 14:18:56 +0000 (19:48 +0530)]
Merge pull request #2650 from atif-shaikh/CRM-10256

CRM-10256 fix - Deleted Contacts included in Reports

10 years agoCRM-10256 fix - Deleted Contacts included in Reports
Atif Shaikh [Wed, 12 Mar 2014 13:44:23 +0000 (19:14 +0530)]
CRM-10256 fix - Deleted Contacts included in Reports

http://issues.civicrm.org/jira/browse/CRM-10256

10 years agoCRM-13973-qa : fix for the critical bug found mentioned in comment : 58222
Pratik Joshi [Wed, 12 Mar 2014 08:01:37 +0000 (13:31 +0530)]
CRM-13973-qa : fix for the critical bug found mentioned in comment : 58222

10 years agoCRM-13973-qa : consists of fix for most of the points mentioned in #58122
Pratik Joshi [Wed, 12 Mar 2014 01:29:30 +0000 (06:59 +0530)]
CRM-13973-qa : consists of fix for most of the points mentioned in #58122

10 years agoMerge pull request #2646 from colemanw/editable
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

10 years agoAutocomplete & option list fixes
Coleman Watts [Wed, 12 Mar 2014 01:28:06 +0000 (21:28 -0400)]
Autocomplete & option list fixes

10 years agocrmeditable - code cleanup and remove crmForm fn
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

10 years agoCRM-13863 - Ensure scrollbars get re-enabled
Coleman Watts [Wed, 12 Mar 2014 00:31:12 +0000 (20:31 -0400)]
CRM-13863 - Ensure scrollbars get re-enabled

10 years agoMerge pull request #2645 from colemanw/dialog
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

10 years agoCRM-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

10 years agoMerge pull request #2642 from pratik-joshi/CRM-13965-qa-fixes
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

10 years agoCRM-13965-qa-fixes
Pratik Joshi [Wed, 12 Mar 2014 07:06:13 +0000 (12:36 +0530)]
CRM-13965-qa-fixes

10 years agoGetlist api - respect search_autocomplete_count vis-a-vis pager
Coleman Watts [Tue, 11 Mar 2014 15:49:18 +0000 (11:49 -0400)]
Getlist api - respect search_autocomplete_count vis-a-vis pager

10 years agoFix for activity report date column sorting
sushantpaste [Tue, 11 Mar 2014 14:09:45 +0000 (19:39 +0530)]
Fix for activity report date column sorting

10 years agoMerge pull request #2635 from colemanw/master
colemanw [Mon, 10 Mar 2014 13:25:55 +0000 (09:25 -0400)]
Merge pull request #2635 from colemanw/master

Relationship form/xml tweaks

10 years agoRelationship form/xml tweaks
Coleman Watts [Mon, 10 Mar 2014 13:25:11 +0000 (09:25 -0400)]
Relationship form/xml tweaks

10 years agoMerge pull request #2630 from colemanw/ajax
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

10 years agoCRM-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

10 years agoCommon.js - pass data with event crmOptionsUpdated
Coleman Watts [Sat, 8 Mar 2014 15:16:32 +0000 (10:16 -0500)]
Common.js - pass data with event crmOptionsUpdated

10 years agoMerge pull request #2629 from colemanw/master
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

10 years agoCRM_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

10 years agoMerge pull request #2628 from colemanw/master
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

10 years agoNormalize 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

10 years agoMerge pull request #2627 from colemanw/ov
colemanw [Fri, 7 Mar 2014 21:55:20 +0000 (16:55 -0500)]
Merge pull request #2627 from colemanw/ov

CRM-13970 - Remove unused templates

10 years agoSurveyType - fix wysiwyg in popups
Coleman Watts [Fri, 7 Mar 2014 21:55:05 +0000 (16:55 -0500)]
SurveyType - fix wysiwyg in popups

10 years agoCRM-13970 - Remove unused templates
Coleman Watts [Fri, 7 Mar 2014 20:52:12 +0000 (15:52 -0500)]
CRM-13970 - Remove unused templates

10 years agoTabHeader.js - error checking
Coleman Watts [Fri, 7 Mar 2014 20:21:47 +0000 (15:21 -0500)]
TabHeader.js - error checking

10 years agoSummary.js cleanup
Coleman Watts [Fri, 7 Mar 2014 19:22:52 +0000 (14:22 -0500)]
Summary.js cleanup

10 years agoMerge pull request #2625 from colemanw/edits
colemanw [Fri, 7 Mar 2014 18:59:24 +0000 (13:59 -0500)]
Merge pull request #2625 from colemanw/edits

Form work

10 years agoMerge pull request #2623 from pratik-joshi/CRM-13973-fixes
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

10 years agoMerge pull request #2624 from colemanw/soft
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

10 years agoGroup form tweak - add select2
Coleman Watts [Fri, 7 Mar 2014 15:41:48 +0000 (10:41 -0500)]
Group form tweak - add select2

10 years agoHR-301 - Remove jquery.crmContactField.js
Coleman Watts [Fri, 7 Mar 2014 15:34:05 +0000 (10:34 -0500)]
HR-301 - Remove jquery.crmContactField.js

10 years agoCRM_Core_Form addSelect tweaks
Coleman Watts [Fri, 7 Mar 2014 15:05:43 +0000 (10:05 -0500)]
CRM_Core_Form addSelect tweaks

10 years agoCRM-13981 - Fix options edit link for soft-credits
Coleman Watts [Fri, 7 Mar 2014 14:47:49 +0000 (09:47 -0500)]
CRM-13981 - Fix options edit link for soft-credits

10 years agoCRM-13973-fixes : email receipt line item fix
Pratik Joshi [Fri, 7 Mar 2014 10:31:43 +0000 (16:01 +0530)]
CRM-13973-fixes : email receipt line item fix

10 years agoMerge pull request #2619 from pratik-joshi/CRM-13965-qa-fixes
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

10 years agoRelationship form tweaks
Coleman Watts [Fri, 7 Mar 2014 02:36:17 +0000 (21:36 -0500)]
Relationship form tweaks

10 years agoIcon css tweaks
Coleman Watts [Fri, 7 Mar 2014 02:16:52 +0000 (21:16 -0500)]
Icon css tweaks

10 years agoRename unselectable to allowClear for consistency with select2
Coleman Watts [Fri, 7 Mar 2014 01:36:25 +0000 (20:36 -0500)]
Rename unselectable to allowClear for consistency with select2

10 years agocommon.js and EntityRef documentation updates
Coleman Watts [Fri, 7 Mar 2014 01:18:40 +0000 (20:18 -0500)]
common.js and EntityRef documentation updates

10 years agoMerge pull request #2609 from lcdservices/CRM-14312
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...

10 years agoMerge pull request #2621 from colemanw/selector
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

10 years agoMerge pull request #2622 from colemanw/fi
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

10 years agoPopups - error checking on event listner
Coleman Watts [Thu, 6 Mar 2014 21:35:47 +0000 (16:35 -0500)]
Popups - error checking on event listner

10 years agoCRM-11610 - Add row-highlight class to search tables
Coleman Watts [Thu, 6 Mar 2014 21:26:32 +0000 (16:26 -0500)]
CRM-11610 - Add row-highlight class to search tables

10 years agoMerge pull request #2565 from deepak-srivastava/CRM-12467-soft-credit-search
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

10 years agoSelect2 tweaks
Coleman Watts [Thu, 6 Mar 2014 16:48:32 +0000 (11:48 -0500)]
Select2 tweaks

10 years agoAdd jquery.mousewheel.js
Coleman Watts [Thu, 6 Mar 2014 16:45:53 +0000 (11:45 -0500)]
Add jquery.mousewheel.js

10 years agoCRM-13965 : regenerated data
Pratik Joshi [Thu, 6 Mar 2014 16:17:25 +0000 (21:47 +0530)]
CRM-13965 : regenerated data

10 years agoCRM-13965 : improvement; CRM-13973 : done with all handling except for email receipt
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

10 years agoMerge pull request #2618 from colemanw/master
colemanw [Thu, 6 Mar 2014 14:49:07 +0000 (09:49 -0500)]
Merge pull request #2618 from colemanw/master

Fix undefined index

10 years agoFix undefined index
Coleman Watts [Thu, 6 Mar 2014 14:47:23 +0000 (09:47 -0500)]
Fix undefined index

10 years agoCRM-14312 include full main/other details when triggered from single pair merge
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

10 years agomake reverting from soft-credit search to contributions-only clean, based on querypar...
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

10 years agore-add missing contributionID column for soft-credit export
Deepak Srivastava [Thu, 6 Mar 2014 13:23:00 +0000 (18:53 +0530)]
re-add missing contributionID column for soft-credit export

10 years agoinclude join with soft credit by default, when softcredit search is active
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

10 years agoQILL, Overall Results Counter, Export duplicate bug, Moving/renaming amount column...
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

10 years agoCRM-13965-qa-fixes : fix for participant status not getting changed for credit card...
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

10 years agoCRM-13965-qa-fixes : email message template fixes
Pratik Joshi [Thu, 6 Mar 2014 07:55:14 +0000 (13:25 +0530)]
CRM-13965-qa-fixes : email message template fixes

10 years agoMerge pull request #2605 from kurund/CRM-14201
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

10 years agochanged page size to 10, 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

10 years agoCRM-13965-qa-fixes : some major improvements and #5 issue fix mentioned in comment...
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

10 years agoMerge pull request #2617 from colemanw/pp
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

10 years agoCRM-13966 HR-301 - Update relationship form with new entityRef methods
Coleman Watts [Thu, 6 Mar 2014 02:29:13 +0000 (21:29 -0500)]
CRM-13966 HR-301 - Update relationship form with new entityRef methods

10 years agoCRM-13966 HR-301 - Support contact create on clientside, toward refactoring out jquer...
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

10 years agoMerge pull request #2616 from davecivicrm/relationshipFormNotice
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...

10 years agoFix notice in Relationship.php postProcess caused by typo, $this->action s/b $this...
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

10 years agoMerge pull request #2613 from colemanw/employer
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

10 years agoCRM-13966 HR-301 - More robust cliet-side entityRef, toward refactoring out jquery...
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

10 years agoMerge pull request #2614 from davecivicrm/CRM-14316
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 ...

10 years agoCRM-14316 - update link for info on ReCaptcha on Miscellaneous Settings page.
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

10 years agoAddress location type cleanup
Coleman Watts [Wed, 5 Mar 2014 18:52:14 +0000 (13:52 -0500)]
Address location type cleanup

10 years agoFix IM label
Coleman Watts [Wed, 5 Mar 2014 18:31:14 +0000 (13:31 -0500)]
Fix IM label

10 years agoCRM-10693 - Trigger events and support drupal wysiwyg in popups
Coleman Watts [Wed, 5 Mar 2014 18:26:03 +0000 (13:26 -0500)]
CRM-10693 - Trigger events and support drupal wysiwyg in popups

10 years agoCRM-14165 - Remove placeholder where it's not wanted
Coleman Watts [Wed, 5 Mar 2014 18:25:26 +0000 (13:25 -0500)]
CRM-14165 - Remove placeholder where it's not wanted

10 years agoCommon.js - default select tweaks
Coleman Watts [Wed, 5 Mar 2014 18:23:33 +0000 (13:23 -0500)]
Common.js - default select tweaks

10 years agoCurrentEmployer cleanup
Coleman Watts [Wed, 5 Mar 2014 16:23:42 +0000 (11:23 -0500)]
CurrentEmployer cleanup

10 years agoCRM-13965-qa-fixes : activity selector links for Payment, Refund, Change Registration...
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

10 years agoCRM-13965-qa-fixes : BAO renaming, event.balance token money formatting
Pratik Joshi [Wed, 5 Mar 2014 05:36:39 +0000 (11:06 +0530)]
CRM-13965-qa-fixes : BAO renaming, event.balance token money formatting

10 years agoCRM-13965-qa-fixes: fix for status message, financial_type select box removal, defaul...
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

10 years agoMerge pull request #2611 from davecivicrm/CRM-13981
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...

10 years agoCRM-13981 - Remove reference to obsolete column honor_contact_id in Merger.php which...
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