civicrm-core.git
11 years agoCRM-13474 : fix for warning displayed - undefined index 'street_address'
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

11 years agoMerge pull request #1715 from davecivicrm/CRM-10128
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.

11 years agoMerge pull request #1712 from eileenmcnaughton/master
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

11 years agoMerge pull request #1718 from monishdeb/CRM-13426
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

11 years agoCRM-13426 fix - Fatal error on search that includes a smart group created by custom...
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

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

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

11 years agoUpdate Detail.php
Dave Greenberg [Mon, 30 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Update Detail.php

Fixed missing space in soft credit stats.

11 years agoCRM-10128 - updated to reflect changed names for gender, prefix, suffix.
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

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

11 years agoMerge pull request #1714 from deepak-srivastava/profile
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...

11 years agoCRM-10128 - fix to address core fields like nickname, middle name, first, last, gende...
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

11 years agoMerge pull request #1705 from ravishnair/CRM-13417fix
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

11 years agoAPI Metadata, document field type
Eileen [Mon, 30 Sep 2013 01:26:46 +0000 (14:26 +1300)]
API Metadata, document field type

11 years agoMerge pull request #1699 from eileenmcnaughton/master
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

11 years agoCRM-13161 change token names back to the familiar old ones
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

11 years agoCRM-13344 Update search test
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

11 years agoMerge pull request #1645 from eileenmcnaughton/CRM-13379
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

11 years agoMerge pull request #1709 from colemanw/CRM-13344
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

11 years agoCRM-13379 fix merge bug
Eileen [Sat, 28 Sep 2013 09:13:47 +0000 (05:13 -0400)]
CRM-13379 fix merge bug

11 years agoCRM-13379 fix prev commit - still include emailcommon.js in email form
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

11 years agoCRM-13379 prevent double click on confirm button on main contribution page to prevent...
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

11 years agoCRM-13161 Add support for legacy tokens
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

11 years agoCRM-13344 - Revert "Fix convertToPseudoNames for CRM-13318"
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.

11 years agoCRM-13344 - Revert commit 827659b2 schema changes from CRM-13161
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

11 years agoMerge pull request #1707 from lcdservices/CRM-13455
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

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

11 years ago-- CRM-13417 changes as per comment
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

11 years ago-- fix for 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

11 years agoMerge pull request #1704 from ravishnair/CRM-13450
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

11 years agoMerge pull request #1703 from pratik-joshi/CRM-13459
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'

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

11 years agoMerge pull request #1652 from vivekarora/CRM-13368
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

11 years agoMerge pull request #1702 from dlobo/master
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

11 years agoFix 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

11 years ago-- fix for CRM-13450
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

11 years agoMerge pull request #1701 from deepak-srivastava/profile
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

11 years agoMerge branch 'master' into profile
Deepak Srivastava [Thu, 26 Sep 2013 10:15:35 +0000 (15:45 +0530)]
Merge branch 'master' into profile

11 years agoMerge pull request #1700 from pratik-joshi/CRM-13449
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

11 years agoCRM-13234 profile submit api - support propert DB fields
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

11 years agoCRM-13449 : while onclick on submit button - putting execution of disbled = true...
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

11 years agoMerge pull request #1691 from eileenmcnaughton/CRM-13234
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)

11 years agoMerge pull request #1641 from PalanteJon/CRM-13396
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...

11 years agoMerge pull request #1697 from davecivicrm/CRM-13451
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...

11 years agoExpose max_related field in EDIT membership types if relationship_type_id has a value.
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.

11 years agoMerge pull request #1696 from monishdeb/CRM-13436
deepak-srivastava [Wed, 25 Sep 2013 13:30:04 +0000 (06:30 -0700)]
Merge pull request #1696 from monishdeb/CRM-13436

CRM-13436 fix

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

11 years agoMerge pull request #1695 from deepak-srivastava/subtype
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

11 years agoCRM-13438 - detect / render subtype templates
Deepak Srivastava [Wed, 25 Sep 2013 12:11:26 +0000 (17:41 +0530)]
CRM-13438 - detect / render subtype templates

11 years agoMerge pull request #1516 from cividesk/CRM-13293
deepak-srivastava [Wed, 25 Sep 2013 08:44:57 +0000 (01:44 -0700)]
Merge pull request #1516 from cividesk/CRM-13293

Looks good. Merged.

11 years agoCRM-13234 amend previous commit (commit hooks crash when I try to do a commit --amend)
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

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-09-25-01-46-57
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

11 years agoMerge pull request #1690 from eileenmcnaughton/CRM-13447
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

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

11 years agoCRM-13234 fix profile api treatment of fields where DB doesn't match api name
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

11 years agoprofile api test fixes (caching & case on entities)
Eileen [Thu, 19 Sep 2013 12:45:22 +0000 (00:45 +1200)]
profile api test fixes (caching & case on entities)

11 years agoMerge pull request #1689 from davecivicrm/CRM-13445
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.

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

11 years agoMerge pull request #1688 from davecivicrm/CRM-13442
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...

11 years agoCRM-13442 Removing help text which references the Redirect to DB setting since we...
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

11 years agoConverted to the address functions in base class
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()

11 years agoMerge pull request #1686 from pradpnayak/CRM-13421
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

11 years agoMerge pull request #1687 from davecivicrm/CRM-13442
Dave Greenberg [Tue, 24 Sep 2013 18:18:52 +0000 (11:18 -0700)]
Merge pull request #1687 from davecivicrm/CRM-13442

CRM-13442 Clarify new help text for Record to Database, and explain usag...

11 years agoCRM-13442 Clarify new help text for Record to Database, and explain usage.
Dave Greenberg [Tue, 24 Sep 2013 18:18:03 +0000 (11:18 -0700)]
CRM-13442 Clarify new help text for Record to Database, and explain usage.

----------------------------------------
* CRM-13442: Update Outbound Email help text
  http://issues.civicrm.org/jira/browse/CRM-13442

11 years agoMerge pull request #1682 from pradpnayak/CRM-13400
Dave Greenberg [Tue, 24 Sep 2013 17:14:33 +0000 (10:14 -0700)]
Merge pull request #1682 from pradpnayak/CRM-13400

-- CRM-13400, removed obsolete code and fixed default settting of curren...

11 years agoMerge pull request #1683 from pradpnayak/CRM-12970
dlobo [Tue, 24 Sep 2013 16:50:59 +0000 (09:50 -0700)]
Merge pull request #1683 from pradpnayak/CRM-12970

--CRM-12970, fixed for more then one discount set

11 years agoMerge pull request #1555 from donordepot/master
dlobo [Tue, 24 Sep 2013 16:18:40 +0000 (09:18 -0700)]
Merge pull request #1555 from donordepot/master

Only throw error when employers are involved.

11 years agoMerge pull request #1677 from davecivicrm/CRM-13432
dlobo [Tue, 24 Sep 2013 16:13:18 +0000 (09:13 -0700)]
Merge pull request #1677 from davecivicrm/CRM-13432

CRM-13432 - Fix notices for Fixed Period memberships.

11 years agoMerge pull request #1681 from pratik-joshi/v43
dlobo [Tue, 24 Sep 2013 15:59:56 +0000 (08:59 -0700)]
Merge pull request #1681 from pratik-joshi/v43

webtest fixes

11 years agoMerge pull request #1685 from monishdeb/43Webtestfixes
dlobo [Tue, 24 Sep 2013 15:58:43 +0000 (08:58 -0700)]
Merge pull request #1685 from monishdeb/43Webtestfixes

WebTest fixed for v4.3

11 years agoMerge pull request #1674 from systopia/CRM-13440
dlobo [Tue, 24 Sep 2013 15:57:27 +0000 (08:57 -0700)]
Merge pull request #1674 from systopia/CRM-13440

proposed patch for CRM-13440

11 years agoMerge pull request #1638 from totten/master-restore-handler
dlobo [Tue, 24 Sep 2013 15:05:39 +0000 (08:05 -0700)]
Merge pull request #1638 from totten/master-restore-handler

Every call to Error::ignoreException() should have matching call to setCallback()

11 years agoCRM-13421, fixed lineitem array for mail template for event
Pradeep Nayak [Tue, 24 Sep 2013 14:23:36 +0000 (19:53 +0530)]
CRM-13421, fixed lineitem array for mail template for event

----------------------------------------
* CRM-13421: Off-line Contribution Receipt Line-Items Garbled
  http://issues.civicrm.org/jira/browse/CRM-13421

11 years agoMerge pull request #1679 from davecivicrm/CRM-13428
dlobo [Tue, 24 Sep 2013 14:18:39 +0000 (07:18 -0700)]
Merge pull request #1679 from davecivicrm/CRM-13428

CRM-13428 - Changed other instances of the event confirmation PDF filena...

11 years agoMerge pull request #1684 from joannechester/master
dlobo [Tue, 24 Sep 2013 14:17:55 +0000 (07:17 -0700)]
Merge pull request #1684 from joannechester/master

Update Smtp.tpl

11 years agoWebtest fixes for 43
monishdeb [Tue, 24 Sep 2013 14:16:49 +0000 (19:46 +0530)]
Webtest fixes for 43

11 years agoMerge pull request #1649 from eileenmcnaughton/CRM-13402
dlobo [Tue, 24 Sep 2013 14:16:46 +0000 (07:16 -0700)]
Merge pull request #1649 from eileenmcnaughton/CRM-13402

CRM-13402 error logging improvements incl fix to infinite loop when sql server gone away

11 years agoMerge pull request #1668 from monishdeb/CRM-13378
dlobo [Tue, 24 Sep 2013 14:10:16 +0000 (07:10 -0700)]
Merge pull request #1668 from monishdeb/CRM-13378

CRM-13378 fix

11 years agowebtest fix for WebTest_Contribute_PCPAddTest::testPCPAdd
Pratik Joshi [Tue, 24 Sep 2013 12:43:49 +0000 (18:13 +0530)]
webtest fix for WebTest_Contribute_PCPAddTest::testPCPAdd

11 years agofix for webtest : WebTest_Contribute_OnlineContributionTest::testOnlineContributionAdd
Pratik Joshi [Tue, 24 Sep 2013 12:31:23 +0000 (18:01 +0530)]
fix for webtest : WebTest_Contribute_OnlineContributionTest::testOnlineContributionAdd

11 years agoUpdate Smtp.tpl
joannechester [Tue, 24 Sep 2013 12:20:00 +0000 (22:20 +1000)]
Update Smtp.tpl

CRM-13442 Added location of archived mailing in help text

11 years ago--CRM-12970, fixed for more then one discount set
Pradeep Nayak [Tue, 24 Sep 2013 11:32:57 +0000 (17:02 +0530)]
--CRM-12970, fixed for more then one discount set

----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
  http://issues.civicrm.org/jira/browse/CRM-12970

11 years agomore test fixes : WebTest_Contribute_ContributionPageAddTest::testContributionPageSep...
Pratik Joshi [Tue, 24 Sep 2013 11:24:59 +0000 (16:54 +0530)]
more test fixes : WebTest_Contribute_ContributionPageAddTest::testContributionPageSeparatePaymentPayLater

11 years ago-- CRM-13400, removed obsolete code and fixed default settting of current membership
Pradeep Nayak [Tue, 24 Sep 2013 10:57:04 +0000 (16:27 +0530)]
-- CRM-13400, removed obsolete code and fixed default settting of current membership

----------------------------------------
* CRM-13400: Online membership renewal via contribution page no longer sets existing membership as default
  http://issues.civicrm.org/jira/browse/CRM-13400

11 years agowebtest fixes
Pratik Joshi [Tue, 24 Sep 2013 10:40:14 +0000 (16:10 +0530)]
webtest fixes

11 years agoMerge pull request #1680 from deepak-srivastava/mailings
deepak-srivastava [Tue, 24 Sep 2013 06:25:20 +0000 (23:25 -0700)]
Merge pull request #1680 from deepak-srivastava/mailings

CRM-13382, add the ability to archive a canceled mailing

11 years agoCRM-13382, add the ability to archive a canceled mailing
Deepak Srivastava [Tue, 24 Sep 2013 06:22:16 +0000 (11:52 +0530)]
CRM-13382, add the ability to archive a canceled mailing

11 years agoMerge pull request #1669 from PalanteJon/CRM-13405
Dave Greenberg [Tue, 24 Sep 2013 01:27:31 +0000 (18:27 -0700)]
Merge pull request #1669 from PalanteJon/CRM-13405

Crm-13405

11 years agoMerge pull request #1653 from totten/master-case-type-ext
dlobo [Mon, 23 Sep 2013 23:39:11 +0000 (16:39 -0700)]
Merge pull request #1653 from totten/master-case-type-ext

CRM-13410 - CiviCase - Add hook_civicrm_caseTypes

11 years agoCRM-13428 - Changed other instances of the event confirmation PDF filename to confirm...
Dave Greenberg [Mon, 23 Sep 2013 23:06:22 +0000 (16:06 -0700)]
CRM-13428 - Changed other instances of the event confirmation PDF filename to confirmation.pdf from eventReceipt.pdf.

----------------------------------------
* CRM-13428: Email receipt/confirmation do not attach PDF files
  http://issues.civicrm.org/jira/browse/CRM-13428

11 years agoMerge pull request #1670 from systopia/CRM-13428
Dave Greenberg [Mon, 23 Sep 2013 22:36:54 +0000 (15:36 -0700)]
Merge pull request #1670 from systopia/CRM-13428

prosed fix for CRM-13428

11 years agoMerge pull request #1678 from mlutfy/i18n-tpl-success
Dave Greenberg [Mon, 23 Sep 2013 22:26:58 +0000 (15:26 -0700)]
Merge pull request #1678 from mlutfy/i18n-tpl-success

Fix ts usage in upgrade success.tpl

11 years agoFix ts usage in upgrade success.tpl
Mathieu Lutfy [Mon, 23 Sep 2013 19:56:23 +0000 (15:56 -0400)]
Fix ts usage in upgrade success.tpl

11 years agoCRM-13432 - Fix notices for Fixed Period memberships.
Dave Greenberg [Mon, 23 Sep 2013 19:06:48 +0000 (12:06 -0700)]
CRM-13432 - Fix notices for Fixed Period memberships.

----------------------------------------
* CRM-13432: Creating membershiptype with period fixed and start date/rolling date gives warning.
  http://issues.civicrm.org/jira/browse/CRM-13432

11 years agoMerge pull request #1675 from deepak-srivastava/logs
deepak-srivastava [Mon, 23 Sep 2013 13:56:16 +0000 (06:56 -0700)]
Merge pull request #1675 from deepak-srivastava/logs

CRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest

11 years agoCRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest
Deepak Srivastava [Mon, 23 Sep 2013 13:55:04 +0000 (19:25 +0530)]
CRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest

11 years agoMerge pull request #1643 from davecivicrm/CRM-13398
pratik-joshi [Mon, 23 Sep 2013 11:17:28 +0000 (04:17 -0700)]
Merge pull request #1643 from davecivicrm/CRM-13398

CRM-13398 - Update markup in Block.tpl for profile pre and post field he...

11 years agoMerge pull request #1673 from deepak-srivastava/timestamp
deepak-srivastava [Mon, 23 Sep 2013 09:51:24 +0000 (02:51 -0700)]
Merge pull request #1673 from deepak-srivastava/timestamp

CRM-13413 - fix to address datetime to timestamp conversion

11 years agoproposed patch for CRM-13440
systopia [Mon, 23 Sep 2013 09:50:39 +0000 (11:50 +0200)]
proposed patch for CRM-13440

11 years agoCRM-13413 - fix to address datetime to timestamp conversion
Deepak Srivastava [Mon, 23 Sep 2013 09:27:07 +0000 (02:27 -0700)]
CRM-13413 - fix to address datetime to timestamp conversion