civicrm-core.git
10 years agoCRM-13965 : webtest, handling one more thing to check
Pratik Joshi [Fri, 31 Jan 2014 03:33:29 +0000 (09:03 +0530)]
CRM-13965 : webtest, handling one more thing to check

10 years agoCRM-13965 : webtest adding, also few minor improvements done while coding webtest
Pratik Joshi [Fri, 31 Jan 2014 02:20:44 +0000 (07:50 +0530)]
CRM-13965 : webtest adding, also few minor improvements done while coding webtest

10 years agoMerge pull request #2435 from davecivicrm/CRM-13833
Dave Greenberg [Fri, 31 Jan 2014 01:26:45 +0000 (17:26 -0800)]
Merge pull request #2435 from davecivicrm/CRM-13833

CRM-13833 - Fix bad variable in message templates.

10 years agoCRM-13833 - Fix bad variable in message templates.
Dave Greenberg [Fri, 31 Jan 2014 01:25:58 +0000 (17:25 -0800)]
CRM-13833 - Fix bad variable in message templates.

----------------------------------------
* CRM-13833: Implement Soft Credit Types
  http://issues.civicrm.org/jira/browse/CRM-13833

10 years agoMerge pull request #2433 from colemanw/autocomplete
colemanw [Thu, 30 Jan 2014 19:10:28 +0000 (11:10 -0800)]
Merge pull request #2433 from colemanw/autocomplete

Autocomplete work in progress

10 years agoCRM-10760 - Autocomplte - Add css
Coleman Watts [Thu, 30 Jan 2014 18:55:47 +0000 (10:55 -0800)]
CRM-10760 - Autocomplte - Add css

10 years agoCRM-10760 - Autocomplte - Simplify single contact check
Coleman Watts [Thu, 30 Jan 2014 01:02:41 +0000 (17:02 -0800)]
CRM-10760 - Autocomplte - Simplify single contact check

10 years agoCRM-10760 - Autocomplte - Place menu in front
Coleman Watts [Thu, 30 Jan 2014 00:50:11 +0000 (16:50 -0800)]
CRM-10760 - Autocomplte - Place menu in front

10 years agoCRM-10760 - Autocomplte - Remove unused function with the same name
Coleman Watts [Wed, 29 Jan 2014 21:25:43 +0000 (13:25 -0800)]
CRM-10760 - Autocomplte - Remove unused function with the same name

10 years agoCRM-10760 - Autocomplte - Convert quicksearch bar to use jQuery.ui + CRM.api
Coleman Watts [Wed, 29 Jan 2014 20:53:49 +0000 (12:53 -0800)]
CRM-10760 - Autocomplte - Convert quicksearch bar to use jQuery.ui + CRM.api

10 years agoMerge pull request #2430 from pratik-joshi/fix-for-regression
Kurund Jalmi [Thu, 30 Jan 2014 04:20:07 +0000 (20:20 -0800)]
Merge pull request #2430 from pratik-joshi/fix-for-regression

fix-for-regression : caused by PR#2314

10 years agofix-for-regression : caused by PR#2314
Pratik Joshi [Thu, 30 Jan 2014 03:57:22 +0000 (09:27 +0530)]
fix-for-regression : caused by PR#2314

10 years agoMerge pull request #2427 from pratik-joshi/CRM-13964
Kurund Jalmi [Thu, 30 Jan 2014 03:26:52 +0000 (19:26 -0800)]
Merge pull request #2427 from pratik-joshi/CRM-13964

Crm 13964

10 years agoCRM-13964 : CRM test
Pratik Joshi [Wed, 29 Jan 2014 09:35:56 +0000 (15:05 +0530)]
CRM-13964 : CRM test

10 years agoCRM-10760 - Autocomplte - Create utility to abstract rendering of autocomplete output
Coleman Watts [Tue, 28 Jan 2014 23:01:55 +0000 (15:01 -0800)]
CRM-10760 - Autocomplte - Create utility to abstract rendering of autocomplete output

10 years agoSharpen logo image
Coleman Watts [Wed, 29 Jan 2014 01:37:08 +0000 (17:37 -0800)]
Sharpen logo image

10 years agoCRM/Contact/Page/AJAX - Remove unused variables
Coleman Watts [Tue, 28 Jan 2014 23:03:10 +0000 (15:03 -0800)]
CRM/Contact/Page/AJAX - Remove unused variables

10 years agoMerge pull request #2423 from eileenmcnaughton/CRM-14139-static
colemanw [Tue, 28 Jan 2014 18:16:04 +0000 (10:16 -0800)]
Merge pull request #2423 from eileenmcnaughton/CRM-14139-static

CRM-14139 Group Selector Code - make static functions static

10 years agoCRM-14139 Group Selector Code - make static functions static
Eileen McNaughton [Tue, 28 Jan 2014 17:54:48 +0000 (06:54 +1300)]
CRM-14139 Group Selector Code - make static functions static

----------------------------------------
* CRM-14139: Static methods called non-statically
  http://issues.civicrm.org/jira/browse/CRM-14139

10 years agoCRM-13964 : webtest
Pratik Joshi [Tue, 28 Jan 2014 12:48:53 +0000 (18:18 +0530)]
CRM-13964 : webtest

10 years agoMerge pull request #2420 from kurund/CRM-13965
Kurund Jalmi [Tue, 28 Jan 2014 04:12:59 +0000 (20:12 -0800)]
Merge pull request #2420 from kurund/CRM-13965

CRM-13965

10 years agoMerge branch 'CRM-13965' of git://github.com/pratik-joshi/civicrm-core into CRM-13965
kurund [Tue, 28 Jan 2014 04:11:12 +0000 (23:11 -0500)]
Merge branch 'CRM-13965' of git://github.com/pratik-joshi/civicrm-core into CRM-13965

Conflicts:
CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl

----------------------------------------
* CRM-13965: Record additional payments or refunds for pending-pay later OR partially paid event registrations
  http://issues.civicrm.org/jira/browse/CRM-13965

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-27-22-52-52
kurund [Tue, 28 Jan 2014 03:59:18 +0000 (22:59 -0500)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-27-22-52-52

Conflicts:
sql/civicrm_generated.mysql

10 years agoMerge pull request #2418 from colemanw/master
colemanw [Tue, 28 Jan 2014 00:22:03 +0000 (16:22 -0800)]
Merge pull request #2418 from colemanw/master

CRM-13863 Fix group popups

10 years agoCRM-13863 Fix group popups
Coleman Watts [Tue, 28 Jan 2014 00:16:23 +0000 (16:16 -0800)]
CRM-13863 Fix group popups

10 years agoMerge pull request #2417 from monishdeb/CRM-13981
Kurund Jalmi [Mon, 27 Jan 2014 16:11:23 +0000 (08:11 -0800)]
Merge pull request #2417 from monishdeb/CRM-13981

CRM-13981 additional fixes

10 years agoCRM-13981 additional fixes
monishdeb [Tue, 28 Jan 2014 12:50:49 +0000 (18:20 +0530)]
CRM-13981 additional fixes

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  http://issues.civicrm.org/jira/browse/CRM-13981

10 years agoCRM-13965 : upgrade modifications
Pratik Joshi [Mon, 27 Jan 2014 11:10:39 +0000 (16:40 +0530)]
CRM-13965 : upgrade modifications

10 years agoCRM-13965 : email sending template fixes
Pratik Joshi [Mon, 27 Jan 2014 11:08:35 +0000 (16:38 +0530)]
CRM-13965 : email sending template fixes

10 years agoCRM-13965 : email template handling for refund payment and partial payment
Pratik Joshi [Mon, 27 Jan 2014 08:29:58 +0000 (13:59 +0530)]
CRM-13965 : email template handling for refund payment and partial payment

10 years agoMerge pull request #2414 from kurund/profile-builder
Kurund Jalmi [Sun, 26 Jan 2014 05:01:51 +0000 (21:01 -0800)]
Merge pull request #2414 from kurund/profile-builder

renamed function to be more intuitive

10 years agorenamed function to be more intuitive
kurund [Sun, 26 Jan 2014 05:01:22 +0000 (00:01 -0500)]
renamed function to be more intuitive

10 years agoMerge pull request #2413 from colemanw/master
colemanw [Sat, 25 Jan 2014 07:08:05 +0000 (23:08 -0800)]
Merge pull request #2413 from colemanw/master

CRM-13863 - Soft credit js - move back to a template

10 years agoCRM-13863 - Soft credit js - move back to a template
Coleman Watts [Sat, 25 Jan 2014 07:06:51 +0000 (23:06 -0800)]
CRM-13863 - Soft credit js - move back to a template

10 years agoTag & search js cleanup
Coleman Watts [Sat, 25 Jan 2014 06:23:12 +0000 (22:23 -0800)]
Tag & search js cleanup

10 years agoMerge pull request #2412 from dlobo/CRM-14125
dlobo [Sat, 25 Jan 2014 01:51:17 +0000 (17:51 -0800)]
Merge pull request #2412 from dlobo/CRM-14125

CRM-14125 - Joining a group from the user dashboard throws a fatal error...

10 years agoCRM-14125 - Joining a group from the user dashboard throws a fatal error IF assigned...
Donald A. Lobo [Sat, 25 Jan 2014 01:50:50 +0000 (17:50 -0800)]
CRM-14125 - Joining a group from the user dashboard throws a fatal error IF assigned activities pane is enabled

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

10 years agoMerge pull request #2411 from davecivicrm/CRM-10043testFix
Dave Greenberg [Sat, 25 Jan 2014 01:09:04 +0000 (17:09 -0800)]
Merge pull request #2411 from davecivicrm/CRM-10043testFix

CRM-10043 - Fix activity assignee unit test.

10 years agoCRM-10043 - Fix activity assignee unit test.
Dave Greenberg [Sat, 25 Jan 2014 01:07:35 +0000 (17:07 -0800)]
CRM-10043 - Fix activity assignee unit test.

10 years agoMerge pull request #2410 from dlobo/CRM-14127
dlobo [Fri, 24 Jan 2014 23:19:58 +0000 (15:19 -0800)]
Merge pull request #2410 from dlobo/CRM-14127

CRM-14127 - CiviCRM WordPress not correctly generating frontend URL

10 years agoCRM-14127 - CiviCRM WordPress not correctly generating frontend URL
Donald A. Lobo [Fri, 24 Jan 2014 23:19:21 +0000 (15:19 -0800)]
CRM-14127 - CiviCRM WordPress not correctly generating frontend URL

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

10 years agoMerge pull request #2405 from kurund/profile-builder
Kurund Jalmi [Fri, 24 Jan 2014 23:04:23 +0000 (15:04 -0800)]
Merge pull request #2405 from kurund/profile-builder

Profile builder

10 years agodefault value fixes
kurund [Fri, 24 Jan 2014 22:58:12 +0000 (14:58 -0800)]
default value fixes

10 years agomore fixes to profile builder
kurund [Fri, 24 Jan 2014 22:05:27 +0000 (14:05 -0800)]
more fixes to profile builder

10 years agoMerge pull request #2407 from colemanw/ajaxSearch2
Kurund Jalmi [Fri, 24 Jan 2014 21:30:02 +0000 (13:30 -0800)]
Merge pull request #2407 from colemanw/ajaxSearch2

Ajax search work

10 years agoMerge pull request #2409 from davecivicrm/CRM-14117
Dave Greenberg [Fri, 24 Jan 2014 20:23:55 +0000 (12:23 -0800)]
Merge pull request #2409 from davecivicrm/CRM-14117

CRM-14117 - Rebuilt generated with navigation fix.

10 years agoCRM-14117 - Rebuilt generated with navigation fix.
Dave Greenberg [Fri, 24 Jan 2014 20:23:10 +0000 (12:23 -0800)]
CRM-14117 - Rebuilt generated with navigation fix.

----------------------------------------
* CRM-14117: Help/About leads to a non-existant page
  http://issues.civicrm.org/jira/browse/CRM-14117

10 years agoremoved redundant code
kurund [Fri, 24 Jan 2014 11:03:00 +0000 (03:03 -0800)]
removed redundant code

10 years agomore work on profile builder, set correct filter defaults
kurund [Fri, 24 Jan 2014 09:52:47 +0000 (01:52 -0800)]
more work on profile builder, set correct filter defaults

10 years agowhitepace fixes
kurund [Fri, 24 Jan 2014 08:49:59 +0000 (00:49 -0800)]
whitepace fixes

10 years agochanged label
kurund [Fri, 24 Jan 2014 08:48:50 +0000 (00:48 -0800)]
changed label

10 years agoadd filter based on entity types for profile builder
kurund [Fri, 24 Jan 2014 08:45:13 +0000 (00:45 -0800)]
add filter based on entity types for profile builder

10 years agoadd filter based on entity types for profile builder
kurund [Fri, 24 Jan 2014 08:44:01 +0000 (00:44 -0800)]
add filter based on entity types for profile builder

10 years agoCRM-12872 - Search js - fix searchBuilder to work with new ajax
Coleman Watts [Fri, 24 Jan 2014 07:17:45 +0000 (23:17 -0800)]
CRM-12872 - Search js - fix searchBuilder to work with new ajax

10 years agoCRM-11610 - Search js - Abstract table row highlight/select
Coleman Watts [Wed, 15 Jan 2014 20:55:01 +0000 (12:55 -0800)]
CRM-11610 - Search js - Abstract table row highlight/select

10 years agoCRM-12872 - Search js - move search-only js out of Common.js
Coleman Watts [Sat, 11 Jan 2014 19:14:30 +0000 (11:14 -0800)]
CRM-12872 - Search js - move search-only js out of Common.js

10 years agoCRM-10773 - Tag form - remove unused js
Coleman Watts [Sat, 11 Jan 2014 19:00:27 +0000 (11:00 -0800)]
CRM-10773 - Tag form - remove unused js

10 years agoCRM-13863 - Prevent "Manage Case" from opening in popup
Coleman Watts [Fri, 10 Jan 2014 05:25:10 +0000 (21:25 -0800)]
CRM-13863 - Prevent "Manage Case" from opening in popup

10 years agoCRM-12872 - Get campaign search to conform
Coleman Watts [Fri, 10 Jan 2014 01:03:50 +0000 (17:03 -0800)]
CRM-12872 - Get campaign search to conform

10 years agoTask.php - code cleanup
Coleman Watts [Fri, 10 Jan 2014 00:34:40 +0000 (16:34 -0800)]
Task.php - code cleanup

10 years agoCRM-12872 - Clarify print label
Coleman Watts [Fri, 10 Jan 2014 00:22:26 +0000 (16:22 -0800)]
CRM-12872 - Clarify print label

10 years agoCRM-12872 - Remove print button from search results (except campaign)
Coleman Watts [Fri, 10 Jan 2014 00:11:07 +0000 (16:11 -0800)]
CRM-12872 - Remove print button from search results (except campaign)

10 years agoCRM-14106 - Fix treating object as array
Coleman Watts [Fri, 24 Jan 2014 06:22:28 +0000 (22:22 -0800)]
CRM-14106 - Fix treating object as array

10 years agoCRM-13965 : introduce new event token for 'balance' amount info display for schedule...
Pratik Joshi [Thu, 23 Jan 2014 13:36:26 +0000 (19:06 +0530)]
CRM-13965 : introduce new event token for 'balance' amount info display for schedule reminders

10 years agoCRM-13965 : refund payment handling and some major improvements
Pratik Joshi [Thu, 23 Jan 2014 08:39:22 +0000 (14:09 +0530)]
CRM-13965 : refund payment handling and some major improvements

10 years agoadd filter based on entity types for profile builder
kurund [Fri, 24 Jan 2014 01:06:29 +0000 (17:06 -0800)]
add filter based on entity types for profile builder

10 years agoMerge pull request #2404 from davecivicrm/CRM-14119
Dave Greenberg [Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)]
Merge pull request #2404 from davecivicrm/CRM-14119

CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/240...

10 years agoCRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/2400 and adds...
Dave Greenberg [Fri, 24 Jan 2014 00:50:16 +0000 (16:50 -0800)]
CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/2400 and adds truncation of Details column display with conditional (more) link as we do with Notes selector.

----------------------------------------
* CRM-14119: Add activity details as field / filter on activity details report
  http://issues.civicrm.org/jira/browse/CRM-14119

10 years agoMerge pull request #2403 from dlobo/CRM-14117
Dave Greenberg [Thu, 23 Jan 2014 23:56:55 +0000 (15:56 -0800)]
Merge pull request #2403 from dlobo/CRM-14117

CRM-14117 - Help/About leads to a non-existant page

10 years agoCRM-14117 - Help/About leads to a non-existant page
Donald A. Lobo [Thu, 23 Jan 2014 23:30:02 +0000 (15:30 -0800)]
CRM-14117 - Help/About leads to a non-existant page

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

10 years agoMerge pull request #2402 from dlobo/CRM-14118
dlobo [Thu, 23 Jan 2014 22:56:50 +0000 (14:56 -0800)]
Merge pull request #2402 from dlobo/CRM-14118

CRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job

10 years agoCRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job
Donald A. Lobo [Thu, 23 Jan 2014 22:50:53 +0000 (14:50 -0800)]
CRM-14118 - Unescaped user input sent to MySQL from geolocation scheduled job

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

10 years agorename contact_1 to individual_1 for individual model
kurund [Thu, 23 Jan 2014 22:37:37 +0000 (14:37 -0800)]
rename contact_1 to individual_1 for individual model

10 years agoMerge pull request #2401 from eileenmcnaughton/CRM-14120
dlobo [Thu, 23 Jan 2014 22:13:18 +0000 (14:13 -0800)]
Merge pull request #2401 from eileenmcnaughton/CRM-14120

CRM-14120 e-notice error due to returning NULL not by reference,

10 years agoCRM-14120 e-notice error due to returning NULL not by reference, From what I recall...
Eileen McNaughton [Thu, 23 Jan 2014 20:57:27 +0000 (09:57 +1300)]
CRM-14120 e-notice error due to returning NULL not by reference, From what I recall php lazy copying means that we don't lose any performance benefit by not returning as a referenct

----------------------------------------
* CRM-14120: Notice Notice: Only variable references should be returned by reference in event() (line 122 of /srv/www/womenslibrary.org.uk/sites/all/modules/civicrm/CRM/Event/PseudoConstant.php).
  http://issues.civicrm.org/jira/browse/CRM-14120

10 years agoMerge pull request #2399 from kurund/CRM-13981b
Kurund Jalmi [Thu, 23 Jan 2014 08:46:32 +0000 (00:46 -0800)]
Merge pull request #2399 from kurund/CRM-13981b

fixes for CRM-13981

10 years agomanual merge of fixes for CRM-13981
kurund [Thu, 23 Jan 2014 08:44:42 +0000 (00:44 -0800)]
manual merge of fixes for CRM-13981

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  http://issues.civicrm.org/jira/browse/CRM-13981

10 years agoMerge pull request #2398 from kurund/CRM-13981
Kurund Jalmi [Thu, 23 Jan 2014 01:27:13 +0000 (17:27 -0800)]
Merge pull request #2398 from kurund/CRM-13981

fixes broken field display/error when new field is dragged

10 years agoMerge pull request #2395 from yashodha/HR-252
Kurund Jalmi [Wed, 22 Jan 2014 21:17:49 +0000 (13:17 -0800)]
Merge pull request #2395 from yashodha/HR-252

fix activity type name/label in api's

10 years agoMerge pull request #2387 from pratik-joshi/CRM-13973
Kurund Jalmi [Wed, 22 Jan 2014 21:16:13 +0000 (13:16 -0800)]
Merge pull request #2387 from pratik-joshi/CRM-13973

Crm 13973

10 years agofix activity type name/label in api's
yashodha [Wed, 22 Jan 2014 10:52:19 +0000 (16:22 +0530)]
fix activity type name/label in api's

10 years agoMerge pull request #2393 from yashodha/HR-252
Yashodha Chaku [Wed, 22 Jan 2014 06:56:27 +0000 (22:56 -0800)]
Merge pull request #2393 from yashodha/HR-252

HR-252 : limit activity types to NULL grouping

10 years agoHR-252 : limit activity types to NULL grouping
yashodha [Wed, 22 Jan 2014 06:59:08 +0000 (12:29 +0530)]
HR-252 : limit activity types to NULL grouping

10 years agoMerge pull request #2391 from colemanw/arrayEmpty
Tim Otten [Wed, 22 Jan 2014 06:54:50 +0000 (22:54 -0800)]
Merge pull request #2391 from colemanw/arrayEmpty

Mass replace CRM_Utils_Array::value() with !empty for performance & readability

10 years agoCRM-14106 - Regex targeting other conditionals
Coleman Watts [Wed, 22 Jan 2014 05:50:44 +0000 (21:50 -0800)]
CRM-14106 - Regex targeting other conditionals

Pattern used:
\s*(&&|\|\|)\s*CRM_Utils_Array::value\s*\([ ]*(['"$0-9][^,]*),\s*(\$[^ )]*)\s*\)\s*(\&\&|\|\||\))
 $1 !empty\($3\[$2\]\)$4

10 years agoCRM-14106 - Regex targeting the first part of if statements
Coleman Watts [Wed, 22 Jan 2014 05:25:13 +0000 (21:25 -0800)]
CRM-14106 - Regex targeting the first part of if statements

Pattern used
if\s*\(\s*CRM_Utils_Array::value\s*\([ ]*(['"$0-9][^,]*),\s*(\$[^ )]*)\s*\)\s*(\&\&|\|\||\))
if \(!empty\($2\[$1\]\)$3

10 years agoCRM-14106 - Regex targeting inline conditonal statements
Coleman Watts [Wed, 22 Jan 2014 00:57:22 +0000 (16:57 -0800)]
CRM-14106 - Regex targeting inline conditonal statements

Pattern used:
=\s*CRM_Utils_Array::value\s*\([ ]*(['"$0-9][^,]*),\s*(\$[^ )]*)\s*\)\s*\?
= \!empty\($2\[$1\]\) \?

10 years agoMerge pull request #2390 from dlobo/CRM-14085
dlobo [Tue, 21 Jan 2014 21:55:09 +0000 (13:55 -0800)]
Merge pull request #2390 from dlobo/CRM-14085

CRM-14085 - wrong syntax on inner join for contribution report

10 years agoCRM-14085 - wrong syntax on inner join for contribution report
Donald A. Lobo [Tue, 21 Jan 2014 21:54:38 +0000 (13:54 -0800)]
CRM-14085 - wrong syntax on inner join for contribution report

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

10 years agofixes broken field display/error when new field is dragged
kurund [Tue, 21 Jan 2014 20:11:04 +0000 (12:11 -0800)]
fixes broken field display/error when new field is dragged

10 years agoMerge pull request #2370 from kurund/CRM-14087
Kurund Jalmi [Tue, 21 Jan 2014 19:24:31 +0000 (11:24 -0800)]
Merge pull request #2370 from kurund/CRM-14087

fix contact subtype unset during domain update, CRM-14087

10 years agoMerge pull request #2388 from colemanw/4.4
colemanw [Tue, 21 Jan 2014 17:47:52 +0000 (09:47 -0800)]
Merge pull request #2388 from colemanw/4.4

CRM-14028 - Fix test

10 years agoCRM-14028 - Fix test
Coleman Watts [Tue, 21 Jan 2014 17:47:34 +0000 (09:47 -0800)]
CRM-14028 - Fix test

10 years agoCRM-13973 : corrected the to_financial_account_id vals while selection changes
Pratik Joshi [Tue, 21 Jan 2014 16:03:21 +0000 (21:33 +0530)]
CRM-13973 : corrected the to_financial_account_id vals while selection changes

10 years agoCRM-13973 : post process handling
Pratik Joshi [Tue, 21 Jan 2014 12:39:41 +0000 (18:09 +0530)]
CRM-13973 : post process handling

10 years agofixed bug in saving email, phone and address CRM-14087
kurund [Tue, 21 Jan 2014 07:15:23 +0000 (23:15 -0800)]
fixed bug in saving email, phone and address CRM-14087

----------------------------------------
* CRM-14087:
  http://issues.civicrm.org/jira/browse/CRM-14087

10 years agoMerge pull request #2386 from colemanw/tokenFix
colemanw [Tue, 21 Jan 2014 04:24:28 +0000 (20:24 -0800)]
Merge pull request #2386 from colemanw/tokenFix

CRM-14095 - Fix bug where email token hook not called if no core tokens present

10 years agoCRM-14095 - Fix bug where email token hook not called if no core tokens present
Coleman Watts [Tue, 21 Jan 2014 01:00:43 +0000 (17:00 -0800)]
CRM-14095 - Fix bug where email token hook not called if no core tokens present

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-20-19-00-14
kurund [Tue, 21 Jan 2014 03:00:20 +0000 (19:00 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-20-19-00-14

10 years agoMerge pull request #2385 from kurund/CRM-13964
Kurund Jalmi [Tue, 21 Jan 2014 02:38:34 +0000 (18:38 -0800)]
Merge pull request #2385 from kurund/CRM-13964

CRM-13964 CRM-13965 CRM-13973