kurund [Sun, 6 Oct 2013 13:10:31 +0000 (14:10 +0100)]
Revert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"
This reverts commit
dcb91473ed06b6f221d2b726e6a41f2d844b7c16, reversing
changes made to
bb40618ddaed08fc84508dc2178a9f37a016487a.
Kurund Jalmi [Sun, 6 Oct 2013 10:59:17 +0000 (03:59 -0700)]
Merge pull request #1734 from davecivicrm/CRM-13475
CRM-13475 - Tweak to error message text.
Dave Greenberg [Sun, 6 Oct 2013 10:47:40 +0000 (11:47 +0100)]
CRM-13475 - Tweak to error message text.
----------------------------------------
* CRM-13475: Entering an invalid credit card number gives the wrong field validation error
http://issues.civicrm.org/jira/browse/CRM-13475
dlobo [Sun, 6 Oct 2013 10:37:21 +0000 (03:37 -0700)]
Merge pull request #1728 from demeritcowboy/CRM-13444
CRM-13444: undo CRM-13445 and prevent archived mailing appearing as sche...
Kurund Jalmi [Sun, 6 Oct 2013 09:17:17 +0000 (02:17 -0700)]
Merge pull request #1719 from pratik-joshi/CRM-13472
CRM-13472 fix for - the total number of amount and count didn't matched with its corresponding search result because the receive date value varied in sql queries for both cases
Kurund Jalmi [Sat, 5 Oct 2013 20:40:04 +0000 (13:40 -0700)]
Merge pull request #1727 from davecivicrm/CRM-13279a
CRM-13279 Adding filters for Age, Age at Event and Birth Date. Also addi...
deepak-srivastava [Fri, 4 Oct 2013 06:50:18 +0000 (23:50 -0700)]
Merge pull request #1729 from pratik-joshi/CRM-13479
CRM-13479 : introduced a display column named 'Enabled?' to distinguish between active and in-active relationsip types
colemanw [Thu, 3 Oct 2013 13:03:09 +0000 (06:03 -0700)]
Merge pull request #1730 from colemanw/master
CRM-13475 Fix credit-card error messages
Coleman Watts [Thu, 3 Oct 2013 13:00:07 +0000 (14:00 +0100)]
CRM-13475 Fix credit-card error messages
----------------------------------------
* CRM-13475: Entering an invalid credit card number gives the wrong field validation error
http://issues.civicrm.org/jira/browse/CRM-13475
Pratik Joshi [Thu, 3 Oct 2013 07:15:18 +0000 (12:45 +0530)]
CRM-13479 : introduced a display column named 'Enabled?' to distinguish between active and in-active relationsip types
----------------------------------------
* CRM-13479: Enabled/Disabled column on the "Relationships Types" admin screen
http://issues.civicrm.org/jira/browse/CRM-13479
DemeritCowboy [Wed, 2 Oct 2013 16:30:06 +0000 (12:30 -0400)]
CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled
Dave Greenberg [Wed, 2 Oct 2013 13:57:13 +0000 (14:57 +0100)]
CRM-13279 Adding filters for Age, Age at Event and Birth Date. Also adding jQuery in the report template to expose a valid range of dates for birth date filter.
----------------------------------------
* CRM-13279: Include gender and date of birth in (participant) reports
http://issues.civicrm.org/jira/browse/CRM-13279
CiviCRM [Wed, 2 Oct 2013 13:35:11 +0000 (06:35 -0700)]
Update version to 4.4.beta5
kurund [Wed, 2 Oct 2013 10:20:37 +0000 (11:20 +0100)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44
Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
xml/version.xml
Tim Otten [Tue, 1 Oct 2013 23:41:15 +0000 (01:41 +0200)]
CRM-13460 - CRM_Utils_RuleTest - Remove dead code
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Tim Otten [Tue, 1 Oct 2013 23:37:57 +0000 (01:37 +0200)]
Merge branch 'CRM-13460' of git://github.com/dlobo/civicrm-core into pull-request-1708
Tim Otten [Tue, 1 Oct 2013 21:52:44 +0000 (14:52 -0700)]
Merge pull request #1726 from totten/master-replace-address-test-2
CRM-13312 - CRM_Utils_API_MatchOptionTest
Tim Otten [Tue, 1 Oct 2013 21:49:30 +0000 (23:49 +0200)]
CRM-13312 - CRM_Utils_API_MatchOptionTest
Make sure that the "noise" records are not touched by other operations. Clean up noise.
See http://forum.civicrm.org/index.php/topic,30133.0.html
----------------------------------------
* CRM-13312: Implement API support for options.match
http://issues.civicrm.org/jira/browse/CRM-13312
Kurund Jalmi [Tue, 1 Oct 2013 21:10:36 +0000 (14:10 -0700)]
Merge pull request #1724 from totten/master-replace-address-test
CRM-13312 - CRM_Utils_API_MatchOptionTest
Kurund Jalmi [Tue, 1 Oct 2013 21:03:15 +0000 (14:03 -0700)]
Merge pull request #1725 from kurund/CRM-13329
added event badge to default data
kurund [Tue, 1 Oct 2013 16:33:49 +0000 (17:33 +0100)]
added event badge to default data
Tim Otten [Tue, 1 Oct 2013 16:17:32 +0000 (18:17 +0200)]
CRM-13312 - CRM_Utils_API_MatchOptionTest - forum.civicrm.org/index.php/topic,30133.0.html
----------------------------------------
* CRM-13312: Implement API support for options.match
http://issues.civicrm.org/jira/browse/CRM-13312
Kurund Jalmi [Tue, 1 Oct 2013 15:13:19 +0000 (08:13 -0700)]
Merge pull request #1722 from pratik-joshi/CRM-13474
CRM-13474 : fix for warning displayed - undefined index 'street_address'
Kurund Jalmi [Tue, 1 Oct 2013 15:13:01 +0000 (08:13 -0700)]
Merge pull request #1723 from monishdeb/WebTestFixes
Webtest Fixes
monishdeb [Tue, 1 Oct 2013 14:56:13 +0000 (20:26 +0530)]
Webtest Fixes
Pratik Joshi [Tue, 1 Oct 2013 14:19:48 +0000 (19:49 +0530)]
CRM-13474 : fix for warning displayed - undefined index 'street_address'
----------------------------------------
* CRM-13474: Undefined index: street_address in CRM_Import_Parser_Contact->createContact()
http://issues.civicrm.org/jira/browse/CRM-13474
Kurund Jalmi [Tue, 1 Oct 2013 13:41:09 +0000 (06:41 -0700)]
Merge pull request #1720 from kurund/CRM-13476
CRM-13476, IE 8 related fixes for advance search
kurund [Tue, 1 Oct 2013 13:38:17 +0000 (14:38 +0100)]
fixes for CRM-13476
----------------------------------------
* CRM-13476: In IE8, accordion controls do not work for Advanced Search form
http://issues.civicrm.org/jira/browse/CRM-13476
deepak-srivastava [Tue, 1 Oct 2013 13:28:36 +0000 (06:28 -0700)]
Merge pull request #1715 from davecivicrm/CRM-10128
CRM-10128 - updated to reflect changed names for gender, prefix, suffix.
Kurund Jalmi [Tue, 1 Oct 2013 13:27:00 +0000 (06:27 -0700)]
Merge pull request #1712 from eileenmcnaughton/master
API Metadata, document field type
Kurund Jalmi [Tue, 1 Oct 2013 13:22:03 +0000 (06:22 -0700)]
Merge pull request #1716 from dlobo/CRM-13355
CRM-13355 - add support to allow retrieval of non-public events also
Kurund Jalmi [Tue, 1 Oct 2013 13:21:27 +0000 (06:21 -0700)]
Merge pull request #1718 from monishdeb/CRM-13426
CRM-13426 fix - Fatal error on search that includes a smart group created by custom search
monishdeb [Tue, 1 Oct 2013 08:12:08 +0000 (13:42 +0530)]
CRM-13426 fix - Fatal error on search that includes a smart group created by custom group
http://issues.civicrm.org/jira/browse/CRM-13426
colemanw [Tue, 1 Oct 2013 00:29:04 +0000 (17:29 -0700)]
Merge pull request #1717 from colemanw/master
CRM-13344 - Update search builder and other code for pseudoconstant fields
Coleman Watts [Tue, 1 Oct 2013 00:27:52 +0000 (17:27 -0700)]
CRM-13344 - Update search builder and other code for pseudoconstant fields
----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
Dave Greenberg [Mon, 30 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Update Detail.php
Fixed missing space in soft credit stats.
Donald A. Lobo [Mon, 30 Sep 2013 22:23:05 +0000 (15:23 -0700)]
CRM-13355 - add support to retrieve non-public events
----------------------------------------
* CRM-13355: CiviDiscount Codes Should Be Available on Non-Public Events
http://issues.civicrm.org/jira/browse/CRM-13355
Dave Greenberg [Mon, 30 Sep 2013 18:32:38 +0000 (11:32 -0700)]
CRM-10128 - updated to reflect changed names for gender, prefix, suffix.
----------------------------------------
* CRM-10128: Inconsistent Behavior when saving profile with blank fields
http://issues.civicrm.org/jira/browse/CRM-10128
Dave Greenberg [Mon, 30 Sep 2013 16:46:25 +0000 (09:46 -0700)]
Merge pull request #1711 from colemanw/master
CRM-13161 change token names back to the familiar old ones
deepak-srivastava [Mon, 30 Sep 2013 12:50:21 +0000 (05:50 -0700)]
Merge pull request #1714 from deepak-srivastava/profile
CRM-10128 - fix to address core fields like nickname, middle name, first...
Deepak Srivastava [Mon, 30 Sep 2013 12:49:23 +0000 (18:19 +0530)]
CRM-10128 - fix to address core fields like nickname, middle name, first, last, gender, current employer, prefix, suffix
Pratik Joshi [Mon, 30 Sep 2013 10:22:24 +0000 (15:52 +0530)]
CRM-13472 fix for - the total number of amount and count didn't matched with its corresponding search result because the receive date value varied in sql queries for both cases
----------------------------------------
* CRM-13472: Contribution Dashboard "Table Layout" query inaccurate
http://issues.civicrm.org/jira/browse/CRM-13472
deepak-srivastava [Mon, 30 Sep 2013 06:36:37 +0000 (23:36 -0700)]
Merge pull request #1705 from ravishnair/CRM-13417fix
-- fix for CRM-13417
Eileen [Mon, 30 Sep 2013 01:26:46 +0000 (14:26 +1300)]
API Metadata, document field type
colemanw [Mon, 30 Sep 2013 01:22:45 +0000 (18:22 -0700)]
Merge pull request #1699 from eileenmcnaughton/master
CRM-13234 profile submit api - support propert DB fields
Coleman Watts [Sun, 29 Sep 2013 22:03:15 +0000 (15:03 -0700)]
CRM-13161 change token names back to the familiar old ones
----------------------------------------
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161
Coleman Watts [Sat, 28 Sep 2013 21:04:39 +0000 (14:04 -0700)]
CRM-13344 Update search test
----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
colemanw [Sat, 28 Sep 2013 20:28:02 +0000 (13:28 -0700)]
Merge pull request #1645 from eileenmcnaughton/CRM-13379
CRM-13379 disable button on Contribution_Main form after click to prevent multiple submits
colemanw [Sat, 28 Sep 2013 20:22:11 +0000 (13:22 -0700)]
Merge pull request #1709 from colemanw/CRM-13344
Revert unique names and add legacy token support
Eileen [Sat, 28 Sep 2013 09:13:47 +0000 (05:13 -0400)]
CRM-13379 fix merge bug
Eileen [Mon, 16 Sep 2013 02:16:33 +0000 (02:16 +0000)]
CRM-13379 fix prev commit - still include emailcommon.js in email form
----------------------------------------
* CRM-13379: Delete mailing from Archived, next page is Find Mailings
http://issues.civicrm.org/jira/browse/CRM-13379
Eileen [Sat, 28 Sep 2013 09:07:54 +0000 (05:07 -0400)]
CRM-13379 prevent double click on confirm button on main contribution page to prevent double payment or error
Coleman Watts [Sat, 28 Sep 2013 04:36:31 +0000 (21:36 -0700)]
CRM-13161 Add support for legacy tokens
----------------------------------------
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161
Donald A. Lobo [Fri, 27 Sep 2013 21:20:12 +0000 (14:20 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Donald A. Lobo [Fri, 27 Sep 2013 21:03:04 +0000 (14:03 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Donald A. Lobo [Fri, 27 Sep 2013 21:01:13 +0000 (14:01 -0700)]
CRM-13460 - Add is_numeric checks and test coverage
----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
http://issues.civicrm.org/jira/browse/CRM-13460
Coleman Watts [Fri, 27 Sep 2013 17:39:16 +0000 (10:39 -0700)]
CRM-13344 - Revert "Fix convertToPseudoNames for CRM-13318"
This reverts commit
ffe16a66e691cdb6dcd889cde5778c7a9bca9c72.
Coleman Watts [Fri, 27 Sep 2013 17:36:24 +0000 (10:36 -0700)]
CRM-13344 - Revert commit
827659b2 schema changes from CRM-13161
----------------------------------------
* CRM-13344: Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161
Dave Greenberg [Fri, 27 Sep 2013 17:20:11 +0000 (10:20 -0700)]
Merge pull request #1707 from lcdservices/CRM-13455
CRM-13455 improve getEvents query to account for empty end_date
Brian Shaughnessy [Fri, 27 Sep 2013 16:53:10 +0000 (12:53 -0400)]
CRM-13455 improve getEvents query to account for empty end_date
Ravish Nair [Fri, 27 Sep 2013 13:32:27 +0000 (19:02 +0530)]
-- CRM-13417 changes as per comment
----------------------------------------
* CRM-13417: Dedupe Rule Creation error trapping fails on length selections for substrings of numeric fields or out of range numbers for text fields
http://issues.civicrm.org/jira/browse/CRM-13417
Ravish Nair [Fri, 27 Sep 2013 11:36:25 +0000 (17:06 +0530)]
-- fix for CRM-13417
----------------------------------------
* CRM-13417: Dedupe Rule Creation error trapping fails on length selections for substrings of numeric fields or out of range numbers for text fields
http://issues.civicrm.org/jira/browse/CRM-13417
deepak-srivastava [Fri, 27 Sep 2013 10:26:24 +0000 (03:26 -0700)]
Merge pull request #1704 from ravishnair/CRM-13450
-- fix for CRM-13450
deepak-srivastava [Fri, 27 Sep 2013 07:42:31 +0000 (00:42 -0700)]
Merge pull request #1703 from pratik-joshi/CRM-13459
CRM-13459 fix : added additional filter of entity_table = 'civicrm_pcp'
Pratik Joshi [Fri, 27 Sep 2013 07:32:30 +0000 (13:02 +0530)]
CRM-13459 fix : added additional filter of entity_table = 'civicrm_pcp'
----------------------------------------
* CRM-13459: PCP Image does not display correct image
http://issues.civicrm.org/jira/browse/CRM-13459
colemanw [Thu, 26 Sep 2013 20:59:03 +0000 (13:59 -0700)]
Merge pull request #1652 from vivekarora/CRM-13368
CRM-13368 - Fixed js code to work same in all browsers
dlobo [Thu, 26 Sep 2013 19:57:06 +0000 (12:57 -0700)]
Merge pull request #1702 from dlobo/master
CRM-7355: Fix cc/bcc address merged with to address for Mail_mail class
Donald A. Lobo [Thu, 26 Sep 2013 19:50:41 +0000 (12:50 -0700)]
Fix cc/bcc address merged with to address for Mail_mail class
Ravish Nair [Thu, 26 Sep 2013 14:48:32 +0000 (20:18 +0530)]
-- fix for CRM-13450
----------------------------------------
* CRM-13450: enhanced logging detail overlay broken
http://issues.civicrm.org/jira/browse/CRM-13450
deepak-srivastava [Thu, 26 Sep 2013 13:51:48 +0000 (06:51 -0700)]
Merge pull request #1701 from deepak-srivastava/profile
CRM-10128 - ignore updates for blank custom fields by anonymous users via profile / create, or profiles embedded in event reg / online contrib forms
Deepak Srivastava [Thu, 26 Sep 2013 10:15:35 +0000 (15:45 +0530)]
Merge branch 'master' into profile
deepak-srivastava [Thu, 26 Sep 2013 10:12:04 +0000 (03:12 -0700)]
Merge pull request #1700 from pratik-joshi/CRM-13449
CRM-13449 : while onclick on submit button - putting execution of disbled = true inside timeout function to process the submit of form and then disbling submit button
Eileen [Thu, 26 Sep 2013 08:59:18 +0000 (20:59 +1200)]
CRM-13234 profile submit api - support propert DB fields
----------------------------------------
* CRM-13234: facilitate data-entry-entities via api
http://issues.civicrm.org/jira/browse/CRM-13234
Pratik Joshi [Thu, 26 Sep 2013 08:48:46 +0000 (14:18 +0530)]
CRM-13449 : while onclick on submit button - putting execution of disbled = true inside timeout function to process the submit of form and then disbling submit button
----------------------------------------
* CRM-13449: send email activity: submit button in Chrome
http://issues.civicrm.org/jira/browse/CRM-13449
colemanw [Thu, 26 Sep 2013 02:31:24 +0000 (19:31 -0700)]
Merge pull request #1691 from eileenmcnaughton/CRM-13234
CRM-13234 fixes on profile api required due to added tests (caching issue, field mapping issue)
Dave Greenberg [Wed, 25 Sep 2013 21:49:33 +0000 (14:49 -0700)]
Merge pull request #1641 from PalanteJon/CRM-13396
Mailing Labels - CRM-13396 - use addressee_display when possible when co...
CiviCRM [Wed, 25 Sep 2013 17:58:38 +0000 (10:58 -0700)]
Update version to 4.3.7
colemanw [Wed, 25 Sep 2013 17:02:14 +0000 (10:02 -0700)]
Merge pull request #1697 from davecivicrm/CRM-13451
Expose max_related field in EDIT membership types if relationship_type_i...
colemanw [Wed, 25 Sep 2013 16:53:40 +0000 (09:53 -0700)]
Merge pull request #1693 from pradpnayak/CRM-13446
--CRM-13446, fixed Upgrade code for fatal error if civicrm_financial_acc...
colemanw [Wed, 25 Sep 2013 16:51:52 +0000 (09:51 -0700)]
Merge pull request #1694 from pradpnayak/CRM-13340
-- CRM-13340, this PR should be merged in 4.3, but merged in master so s...
Dave Greenberg [Wed, 25 Sep 2013 16:50:42 +0000 (09:50 -0700)]
Expose max_related field in EDIT membership types if relationship_type_id has a value.
deepak-srivastava [Wed, 25 Sep 2013 13:30:04 +0000 (06:30 -0700)]
Merge pull request #1696 from monishdeb/CRM-13436
CRM-13436 fix
monishdeb [Wed, 25 Sep 2013 13:24:02 +0000 (18:54 +0530)]
CRM-13436 fix
----------------------------------------
* CRM-13436: Notices when saving Profile Settings
http://issues.civicrm.org/jira/browse/CRM-13436
deepak-srivastava [Wed, 25 Sep 2013 12:14:03 +0000 (05:14 -0700)]
Merge pull request #1695 from deepak-srivastava/subtype
CRM-13438 - detect / render subtype templates
Deepak Srivastava [Wed, 25 Sep 2013 12:11:26 +0000 (17:41 +0530)]
CRM-13438 - detect / render subtype templates
Pradeep Nayak [Wed, 25 Sep 2013 10:08:58 +0000 (15:38 +0530)]
-- CRM-13340, this PR should be merged in 4.3, but merged in master so sending it again for 4.3 branch.
----------------------------------------
* CRM-13340: upgrading to (unreleased) 4.3.6 gets sql error on some sites
http://issues.civicrm.org/jira/browse/CRM-13340
Pradeep Nayak [Wed, 25 Sep 2013 10:02:31 +0000 (15:32 +0530)]
--CRM-13446, fixed Upgrade code for fatal error if civicrm_financial_account.contact_id is NOT NULL by default.
----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
http://issues.civicrm.org/jira/browse/CRM-13446
deepak-srivastava [Wed, 25 Sep 2013 08:44:57 +0000 (01:44 -0700)]
Merge pull request #1516 from cividesk/CRM-13293
Looks good. Merged.
Eileen [Wed, 25 Sep 2013 00:16:07 +0000 (12:16 +1200)]
CRM-13234 amend previous commit (commit hooks crash when I try to do a commit --amend)
----------------------------------------
* CRM-13234: facilitate data-entry-entities via api
http://issues.civicrm.org/jira/browse/CRM-13234
kurund [Wed, 25 Sep 2013 00:01:34 +0000 (02:01 +0200)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-09-25-01-46-57
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
tests/phpunit/WebTest/Contribute/OnlineContributionTest.php
tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php
dlobo [Tue, 24 Sep 2013 23:33:42 +0000 (16:33 -0700)]
Merge pull request #1690 from eileenmcnaughton/CRM-13447
CRM-13447 (closes) include domain_id in job load criteria
Eileen [Tue, 24 Sep 2013 22:54:42 +0000 (10:54 +1200)]
CRM-13447 (closes) include domain_id in job load criteria
----------------------------------------
* CRM-13447: Scheduled jobs should only run for relevant domain (they are stored by domain_id but don't always respect it)
http://issues.civicrm.org/jira/browse/CRM-13447
Eileen [Tue, 24 Sep 2013 22:50:03 +0000 (10:50 +1200)]
CRM-13234 fix profile api treatment of fields where DB doesn't match api name
----------------------------------------
* CRM-13234: facilitate data-entry-entities via api
http://issues.civicrm.org/jira/browse/CRM-13234
Eileen [Thu, 19 Sep 2013 12:45:22 +0000 (00:45 +1200)]
profile api test fixes (caching & case on entities)
dlobo [Tue, 24 Sep 2013 19:54:34 +0000 (12:54 -0700)]
Merge pull request #1689 from davecivicrm/CRM-13445
CRM-13445 Suppressing Redirect to DB option for Outbound Mail.
Dave Greenberg [Tue, 24 Sep 2013 19:50:12 +0000 (12:50 -0700)]
CRM-13445 Suppressing Redirect to DB option for Outbound Mail.
----------------------------------------
* CRM-13445: Outbound Email Settings: Suppress the Redirect to Database option
http://issues.civicrm.org/jira/browse/CRM-13445
Dave Greenberg [Tue, 24 Sep 2013 19:43:42 +0000 (12:43 -0700)]
Merge pull request #1688 from davecivicrm/CRM-13442
CRM-13442 Removing help text which references the Redirect to DB setting...
Dave Greenberg [Tue, 24 Sep 2013 19:42:29 +0000 (12:42 -0700)]
CRM-13442 Removing help text which references the Redirect to DB setting since we are suppressing it.
----------------------------------------
* CRM-13442: Update Outbound Email help text
http://issues.civicrm.org/jira/browse/CRM-13442
Nicolas Ganivet [Tue, 24 Sep 2013 19:00:42 +0000 (13:00 -0600)]
Converted to the address functions in base class
Added missing $entryFound logic in alterDisplay()
Dave Greenberg [Tue, 24 Sep 2013 18:21:51 +0000 (11:21 -0700)]
Merge pull request #1686 from pradpnayak/CRM-13421
CRM-13421, fixed lineitem array for mail template for event