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
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
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
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
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
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
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).
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
Deepak Srivastava [Mon, 3 Mar 2014 18:20:13 +0000 (23:50 +0530)]
soft credits as multiple rows via temp table
colemanw [Mon, 3 Mar 2014 15:39:54 +0000 (10:39 -0500)]
Merge pull request #2601 from colemanw/popups
Popups improvement
Kurund Jalmi [Mon, 3 Mar 2014 14:39:14 +0000 (20:09 +0530)]
Merge pull request #2599 from JKingsnorth/CRM-14301
CRM-14301 - Add 'is not one of' to report filtering on multiple select fields
Kurund Jalmi [Mon, 3 Mar 2014 14:37:12 +0000 (20:07 +0530)]
Merge pull request #2600 from kurund/relationship-cleanup
removed obsolete code
kurund [Mon, 3 Mar 2014 14:36:30 +0000 (20:06 +0530)]
removed obsolete code
JKingsnorth [Mon, 3 Mar 2014 13:23:15 +0000 (13:23 +0000)]
CRM-14301
Add 'is not one of' to report filtering on multiple select fields
Kurund Jalmi [Mon, 3 Mar 2014 11:31:19 +0000 (17:01 +0530)]
Merge pull request #2597 from pratik-joshi/atif_work_on_fix_for_js_break
fix for : js break when adding new participant through contact screen
Tim Otten [Mon, 3 Mar 2014 09:07:57 +0000 (01:07 -0800)]
Merge pull request #2598 from totten/master-invoker-cleanup
CRM_Core_Invoke - Cleanup weird callbacks. Simplify callback convention.
Tim Otten [Mon, 3 Mar 2014 09:03:17 +0000 (01:03 -0800)]
Invoker cleanup - Remove unused calling convention.
We'll want to introduce a different calling convention in the future.
Tim Otten [Mon, 3 Mar 2014 09:00:35 +0000 (01:00 -0800)]
Invoker cleanup - Move profile() to its own class
Tim Otten [Mon, 3 Mar 2014 08:28:19 +0000 (00:28 -0800)]
Invoker cleanup - Remove dead AJAX callbacks
Tim Otten [Mon, 3 Mar 2014 08:27:39 +0000 (00:27 -0800)]
Invoker cleanup - Fix AJAX callbacks which misuse '::' notation
Pratik Joshi [Mon, 3 Mar 2014 07:57:21 +0000 (13:27 +0530)]
atif_work_on_fix_for_js_break : moved inclusion of common/customData.tpl
Coleman Watts [Mon, 3 Mar 2014 03:00:38 +0000 (22:00 -0500)]
CRM-13863 Trigger change after contact create
Coleman Watts [Mon, 3 Mar 2014 01:59:35 +0000 (20:59 -0500)]
CRM-13966 - Default value for entityRef label
Coleman Watts [Mon, 3 Mar 2014 01:59:10 +0000 (20:59 -0500)]
CRM-13863 Focus first form element in popups
colemanw [Sun, 2 Mar 2014 21:44:57 +0000 (16:44 -0500)]
Merge pull request #2594 from colemanw/entityRef
CRM-13966 - Refactor autocomplete custom field
Coleman Watts [Sun, 2 Mar 2014 21:25:21 +0000 (16:25 -0500)]
CRM-13966 - Cleanup profile dialog
Kurund Jalmi [Sun, 2 Mar 2014 20:07:22 +0000 (01:37 +0530)]
Merge pull request #2593 from kurund/relationship-form-fixes
relationship edit fixes: form breaks if note is not entered during add
kurund [Sun, 2 Mar 2014 20:06:19 +0000 (01:36 +0530)]
relationship edit fixes: form breaks if note is not entered during add
Kurund Jalmi [Sun, 2 Mar 2014 19:57:58 +0000 (01:27 +0530)]
Merge pull request #2592 from kurund/relationship-form-fixes
fixed broken relationship form, bad ts() call
kurund [Sun, 2 Mar 2014 19:47:47 +0000 (01:17 +0530)]
fixed broken relationship form, bad ts() call
Kurund Jalmi [Sun, 2 Mar 2014 19:19:09 +0000 (00:49 +0530)]
Merge pull request #2590 from colemanw/forms
CRM-14288 - Additional cleanup
Kurund Jalmi [Sun, 2 Mar 2014 18:20:52 +0000 (23:50 +0530)]
Merge pull request #2591 from kurund/CRM-14201
CRM-14201, implement pager for contact relationship listing
kurund [Sun, 2 Mar 2014 18:19:42 +0000 (23:49 +0530)]
code cleanup, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
Coleman Watts [Sun, 2 Mar 2014 02:37:27 +0000 (21:37 -0500)]
CRM-13966 - Refactor autocomplete custom field
kurund [Sun, 2 Mar 2014 09:24:41 +0000 (14:54 +0530)]
fixed enable action for past relationships CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sun, 2 Mar 2014 09:11:47 +0000 (14:41 +0530)]
no need to block and unblock, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
Coleman Watts [Sun, 2 Mar 2014 01:37:14 +0000 (20:37 -0500)]
CRM-13966 - Refactor event fee autocomplete
kurund [Sat, 1 Mar 2014 23:36:33 +0000 (05:06 +0530)]
zero record text fixes CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 23:06:27 +0000 (04:36 +0530)]
zero record text fixes CRM-14201
----------------------------------------
* CRM-14201:
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 22:57:36 +0000 (04:27 +0530)]
added relationship selector on user dashboard CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 22:05:33 +0000 (03:35 +0530)]
refresh all datatables on the page during enable/disable action CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 21:21:58 +0000 (02:51 +0530)]
fixed enable/disable actions, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 20:57:31 +0000 (02:27 +0530)]
CRM-14201, converted contact relationship listing to ajax/datatable listing
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
colemanw [Sat, 1 Mar 2014 16:14:23 +0000 (11:14 -0500)]
Merge pull request #2589 from tttp/crm-14289
remove ".js" suffix so it doesn't broke under nginx
Coleman Watts [Sat, 1 Mar 2014 12:59:53 +0000 (07:59 -0500)]
CRM-14288 - Remove unused datatable callback
Xavier Dutoit [Sat, 1 Mar 2014 10:13:44 +0000 (11:13 +0100)]
remove .js so it doesn't broke under nginx
Brian Shaughnessy [Sat, 1 Mar 2014 06:56:55 +0000 (01:56 -0500)]
CRM-14190 restructure how we handle parent group selection; add to smart group task
Kurund Jalmi [Sat, 1 Mar 2014 06:34:20 +0000 (12:04 +0530)]
Merge pull request #2587 from colemanw/forms
CRM-14288 - Refactor and simplify relationship form
Coleman Watts [Sat, 1 Mar 2014 03:19:36 +0000 (22:19 -0500)]
CRM-13966 - Remove CRM_Contact_Form_NewContact and related functions
Coleman Watts [Sat, 1 Mar 2014 03:03:38 +0000 (22:03 -0500)]
CRM-14288 - Remove unnecessary relationship ajax callback
Coleman Watts [Sat, 1 Mar 2014 03:02:54 +0000 (22:02 -0500)]
CRM-14288 - Change th ids to prevent dom conflicts with date fields
Coleman Watts [Sat, 1 Mar 2014 03:01:55 +0000 (22:01 -0500)]
CRM-14288 - Refactor and simplify relationship form
Coleman Watts [Sat, 1 Mar 2014 03:01:38 +0000 (22:01 -0500)]
CRM-14288 - Make select2 renderer a public utility fn
Coleman Watts [Sat, 1 Mar 2014 02:59:43 +0000 (21:59 -0500)]
Add no-popup to contact links
Dave Greenberg [Sat, 1 Mar 2014 01:19:09 +0000 (17:19 -0800)]
Merge pull request #2585 from davecivicrm/CRM-14286
CRM-14286 - Contact mailings tab should show opens and clicks for curren...
Dave Greenberg [Sat, 1 Mar 2014 01:16:53 +0000 (17:16 -0800)]
CRM-14286 - Contact mailings tab should show opens and clicks for currently viewed contact. This commit cannot be backported to 4.3 without adjustment since CRM_Mailing_BAO_Job has been renamed to CRM_Mailing_BAO_MailingJob as of 4.4.
----------------------------------------
* CRM-14286: Contact Mailings tab selector should show Open and Click activity specfic to the currently viewed contact
http://issues.civicrm.org/jira/browse/CRM-14286
Dave Greenberg [Sat, 1 Mar 2014 00:59:08 +0000 (16:59 -0800)]
Merge pull request #2584 from davecivicrm/fixCiviMailSampleLink
Fix deprecated link in sample message template - should go to new hostin...
Dave Greenberg [Sat, 1 Mar 2014 00:58:03 +0000 (16:58 -0800)]
Fix deprecated link in sample message template - should go to new hosting provider page.
dlobo [Fri, 28 Feb 2014 23:24:34 +0000 (15:24 -0800)]
Merge pull request #2571 from mlutfy/4.4-crm13859
CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).
projects / civicrm-core.git / log