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
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
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...
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
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...
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
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.
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.
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()
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...
dlobo [Tue, 24 Sep 2013 14:17:55 +0000 (07:17 -0700)]
Merge pull request #1684 from joannechester/master
Update Smtp.tpl
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
dlobo [Tue, 24 Sep 2013 14:10:16 +0000 (07:10 -0700)]
Merge pull request #1668 from monishdeb/CRM-13378
CRM-13378 fix
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
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
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
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
Deepak Srivastava [Tue, 24 Sep 2013 06:22:16 +0000 (11:52 +0530)]
CRM-13382, add the ability to archive a canceled mailing
Dave Greenberg [Tue, 24 Sep 2013 01:27:31 +0000 (18:27 -0700)]
Merge pull request #1669 from PalanteJon/CRM-13405
Crm-13405
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
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
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
Mathieu Lutfy [Mon, 23 Sep 2013 19:56:23 +0000 (15:56 -0400)]
Fix ts usage in upgrade success.tpl
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
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...
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
Deepak Srivastava [Mon, 23 Sep 2013 09:27:07 +0000 (02:27 -0700)]
CRM-13413 - fix to address datetime to timestamp conversion
deepak-srivastava [Fri, 20 Sep 2013 09:59:28 +0000 (02:59 -0700)]
Merge pull request #1671 from deepak-srivastava/mailings
CRM-13382 - fixes based on brian's feedback - allow draft & other status...
Deepak Srivastava [Fri, 20 Sep 2013 08:41:58 +0000 (14:11 +0530)]
CRM-13382 - fixes based on brian's feedback - allow draft & other status combination, archive & cancel ambiguity fix, default elements for archive screen.
CiviCRM [Thu, 19 Sep 2013 20:53:23 +0000 (13:53 -0700)]
Update version to 4.4.beta4
Jon goldberg - Linux laptop [Thu, 19 Sep 2013 17:43:08 +0000 (13:43 -0400)]
CRM-13405 - CiviReport - Add Phone Extension to Contact Summary and Detail Reports
----------------------------------------
* CRM-13405: Phone extensions not available to search preferences/contact reports
http://issues.civicrm.org/jira/browse/CRM-13405
Jon goldberg - Linux laptop [Thu, 19 Sep 2013 17:40:29 +0000 (13:40 -0400)]
CRM-13405 - API - Return phone extension on Contact getquick when phone is selected
----------------------------------------
* CRM-13405: Phone extensions not available to search preferences/contact reports
http://issues.civicrm.org/jira/browse/CRM-13405
monishdeb [Thu, 19 Sep 2013 15:36:07 +0000 (21:06 +0530)]
CRM-13378 fix
----------------------------------------
* CRM-13378: "CC" not displaying when viewing sent email
http://issues.civicrm.org/jira/browse/CRM-13378
deepak-srivastava [Thu, 19 Sep 2013 12:40:25 +0000 (05:40 -0700)]
Merge pull request #1667 from deepak-srivastava/mailings
CRM-13382 - Make 'Mailings' searches more comprehensive
Deepak Srivastava [Thu, 19 Sep 2013 12:36:42 +0000 (18:06 +0530)]
CRM-13382 - default behavior for archive screen + jquery for invalid search combinations
Deepak Srivastava [Thu, 19 Sep 2013 09:54:22 +0000 (15:24 +0530)]
CRM-13382 - default searches for draft/scheduled/archived screens
colemanw [Wed, 18 Sep 2013 21:13:52 +0000 (14:13 -0700)]
Merge pull request #1664 from colemanw/master
CRM-12464 - Pseudoconstant::get - fix context/onlyActive
Coleman Watts [Wed, 18 Sep 2013 21:11:12 +0000 (14:11 -0700)]
CRM-12464 - Pseudoconstant::get - fix context/onlyActive
----------------------------------------
* CRM-12464:
http://issues.civicrm.org/jira/browse/CRM-12464
Tim Otten [Wed, 18 Sep 2013 20:55:51 +0000 (13:55 -0700)]
Merge pull request #1647 from vivekarora/CRM-13365
CRM-13365 - Removed the extra closing DIV
Tim Otten [Wed, 18 Sep 2013 19:16:14 +0000 (12:16 -0700)]
CRM-13364 - Use .crm-container-snippet instead of .ui-dialog
----------------------------------------
* CRM-13364: Date fields in all popups should display calendar icon
http://issues.civicrm.org/jira/browse/CRM-13364
Tim Otten [Wed, 18 Sep 2013 19:09:57 +0000 (12:09 -0700)]
Merge branch 'CRM-13364Css' of git://github.com/vivekarora/civicrm-core into pull-request-1655
Dave Greenberg [Wed, 18 Sep 2013 17:58:38 +0000 (10:58 -0700)]
Merge pull request #1640 from pradpnayak/CRM-12970
Crm 12970
Still one edge case that breaks the discount grid, but this is an improvement.
Deepak Srivastava [Wed, 18 Sep 2013 14:14:50 +0000 (19:44 +0530)]
CRM-13382
Kurund Jalmi [Wed, 18 Sep 2013 12:58:27 +0000 (05:58 -0700)]
Merge pull request #1651 from davecivicrm/CRM-13407
CRM-13407 - Conditionally add HTML markup for HEAD and TITLE if not pres...
Kurund Jalmi [Wed, 18 Sep 2013 12:57:35 +0000 (05:57 -0700)]
Merge pull request #1661 from yashodha/webtest-fixes
fix webtest for profile group subscription
Kurund Jalmi [Wed, 18 Sep 2013 07:31:39 +0000 (00:31 -0700)]
Merge pull request #1625 from pradpnayak/CRM-13340
-- fixed for CRM-13340
yashodha [Wed, 18 Sep 2013 07:24:27 +0000 (12:54 +0530)]
fix webtest for profile group subscription
Kurund Jalmi [Wed, 18 Sep 2013 06:44:30 +0000 (23:44 -0700)]
Merge pull request #1660 from kurund/CRM-13327
CRM-13327, do not expose name badge, option
Kurund Jalmi [Wed, 18 Sep 2013 06:42:00 +0000 (23:42 -0700)]
Merge pull request #1659 from monishdeb/CRM-13383
CRM-13383, add crmaselect widget to bounce type option
kurund [Wed, 18 Sep 2013 06:41:25 +0000 (12:11 +0530)]
CRM-13327, do not expose name badge, option
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
monishdeb [Wed, 18 Sep 2013 06:38:39 +0000 (12:08 +0530)]
CRM-13383, add crmaselect widget to bounce type option
----------------------------------------
* CRM-13383: Add Bounce Type option in Advance Search/Mailing section
http://issues.civicrm.org/jira/browse/CRM-13383
Kurund Jalmi [Wed, 18 Sep 2013 06:26:28 +0000 (23:26 -0700)]
Merge pull request #1658 from kurund/CRM-13327
CRM-13327, added new format
kurund [Wed, 18 Sep 2013 06:22:42 +0000 (11:52 +0530)]
CRM-13327, added new format
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
Kurund Jalmi [Wed, 18 Sep 2013 05:53:58 +0000 (22:53 -0700)]
Merge pull request #1657 from kurund/CRM-13328
CRM-13328, fixes
kurund [Wed, 18 Sep 2013 05:52:54 +0000 (11:22 +0530)]
CRM-13328, fixes
----------------------------------------
* CRM-13328: Add support for image scaling
http://issues.civicrm.org/jira/browse/CRM-13328
Kurund Jalmi [Wed, 18 Sep 2013 05:10:18 +0000 (22:10 -0700)]
Merge pull request #1656 from yashodha/CRM-13404
CRM-13404
yashodha [Tue, 17 Sep 2013 14:46:31 +0000 (20:16 +0530)]
CRM-13404
vivekarora [Tue, 17 Sep 2013 12:21:02 +0000 (17:51 +0530)]
CRM-13364 - Date fields in all popups should display calendar icon
----------------------------------------
* CRM-13364: Date fields in all popups should display calendar icon
http://issues.civicrm.org/jira/browse/CRM-13364
Kurund Jalmi [Tue, 17 Sep 2013 09:49:16 +0000 (02:49 -0700)]
Merge pull request #1654 from monishdeb/WebTestFixes
Webtest fixes - Related to Search Builder
monishdeb [Tue, 17 Sep 2013 09:44:47 +0000 (15:14 +0530)]
Webtest fixes - Related to Search Builder
Kurund Jalmi [Tue, 17 Sep 2013 08:47:19 +0000 (01:47 -0700)]
Merge pull request #1646 from monishdeb/CRM-13383
CRM-13383 fix
Tim Otten [Tue, 17 Sep 2013 07:21:58 +0000 (00:21 -0700)]
CRM-13410 - CiviCase - Automatically register/unregister case-types defined via hook_civicrm_caseTypes
----------------------------------------
* CRM-13410: Allow extensions to define case-types
http://issues.civicrm.org/jira/browse/CRM-13410
Tim Otten [Tue, 17 Sep 2013 07:21:28 +0000 (00:21 -0700)]
CRM-13410 - Allow "Components" to define managed-entities
----------------------------------------
* CRM-13410: Allow extensions to define case-types
http://issues.civicrm.org/jira/browse/CRM-13410
Tim Otten [Tue, 17 Sep 2013 07:20:48 +0000 (00:20 -0700)]
CRM-13410 - CiviCase - Load XML files from extensions (as defined with hook_civicrm_caseTypes)
----------------------------------------
* CRM-13410: Allow extensions to define case-types
http://issues.civicrm.org/jira/browse/CRM-13410
Tim Otten [Mon, 16 Sep 2013 23:35:32 +0000 (16:35 -0700)]
Merge pull request #1639 from eileenmcnaughton/master
test fixes (api tests) - one real fix (getfields action alias) & one in test class only
Dave Greenberg [Mon, 16 Sep 2013 21:35:03 +0000 (14:35 -0700)]
CRM-13407 - Conditionally add HTML markup for HEAD and TITLE if not present, using mailing subject
----------------------------------------
* CRM-13407: View CiviMail Mailings - page should include an HTML title if one isn't provided in the message body
http://issues.civicrm.org/jira/browse/CRM-13407
colemanw [Mon, 16 Sep 2013 18:20:44 +0000 (11:20 -0700)]
Merge pull request #1650 from colemanw/master
CRM-13313 - Payments - prevent fatal error when line-item has no price set
Coleman Watts [Mon, 16 Sep 2013 18:19:29 +0000 (11:19 -0700)]
CRM-13313 - Payments - prevent fatal error when line-item has no price set
----------------------------------------
* CRM-13313: "Pay Later" for Drupal Webforms
http://issues.civicrm.org/jira/browse/CRM-13313
colemanw [Mon, 16 Sep 2013 17:50:52 +0000 (10:50 -0700)]
Merge pull request #1629 from totten/master-email-proc-btn
CRM-13377 - Manipulate the main "Send Email" button but not the "Cancel"...
Kurund Jalmi [Mon, 16 Sep 2013 13:32:47 +0000 (06:32 -0700)]
Merge pull request #1644 from davecivicrm/CRM-13399
CRM-13399 - Include Available status activities in Assigned Activities s...
Kurund Jalmi [Mon, 16 Sep 2013 13:29:50 +0000 (06:29 -0700)]
Merge pull request #1642 from davecivicrm/CRM-13341
CRM-13341 - Fix typos in subscribe message.
Eileen [Mon, 16 Sep 2013 12:23:28 +0000 (12:23 +0000)]
CRM-13402 fix git error in prev
----------------------------------------
* CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems
http://issues.civicrm.org/jira/browse/CRM-13402
Eileen [Mon, 16 Sep 2013 12:07:59 +0000 (00:07 +1200)]
CRM-13402 error handling in profile_form - record transaction rollback in log file
----------------------------------------
* CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems
http://issues.civicrm.org/jira/browse/CRM-13402
Eileen [Mon, 16 Sep 2013 09:39:12 +0000 (21:39 +1200)]
emailProcessor add details about the account that failed
Eileen [Mon, 16 Sep 2013 11:41:29 +0000 (23:41 +1200)]
CRM-13402 error handling, prevent loop if mysql server has 'gone away'
----------------------------------------
* CRM-13402: Improve debug logging around server unavailble (ditch the loop), missing contributions, mail store problems
http://issues.civicrm.org/jira/browse/CRM-13402
vivekarora [Mon, 16 Sep 2013 10:28:52 +0000 (15:58 +0530)]
CRM-13365 - Removed the extra closing DIV
----------------------------------------
* CRM-13365: Popups should work in Internet Explorer
http://issues.civicrm.org/jira/browse/CRM-13365
monishdeb [Mon, 16 Sep 2013 08:45:14 +0000 (14:15 +0530)]
CRM-13383 fix
----------------------------------------
* CRM-13383: Add Bounce Type option in Advance Search/Mailing section
http://issues.civicrm.org/jira/browse/CRM-13383
deepak-srivastava [Mon, 16 Sep 2013 07:43:39 +0000 (00:43 -0700)]
Merge pull request #1631 from josephlacey/bookkeeping-report-updates
Adding Contact Sort Name, Financial Type, Contribution ID and Status and...
Dave Greenberg [Mon, 16 Sep 2013 01:41:20 +0000 (18:41 -0700)]
CRM-13399 - Include Available status activities in Assigned Activities section of User Dashboard. This will be valuable for sites using CiviVolunteer.
----------------------------------------
* CRM-13399: User Dashboard Assigned Activities should also show activities with Available status
http://issues.civicrm.org/jira/browse/CRM-13399
Dave Greenberg [Mon, 16 Sep 2013 01:33:34 +0000 (18:33 -0700)]
CRM-13398 - Update markup in Block.tpl for profile pre and post field help to match the <div> layout used in Dynamic.tpl. Fixes alignment issues.
----------------------------------------
* CRM-13398: Profile pre and post field help markup in Block.tpl messes up page layout
http://issues.civicrm.org/jira/browse/CRM-13398
Dave Greenberg [Mon, 16 Sep 2013 01:28:22 +0000 (18:28 -0700)]
CRM-13341 - Fix typos in subscribe message.
----------------------------------------
* CRM-13341: group subscription emails fail for multiple groups
http://issues.civicrm.org/jira/browse/CRM-13341
Dave Greenberg [Mon, 16 Sep 2013 01:23:50 +0000 (18:23 -0700)]
Merge pull request #1597 from lcdservices/CRM-13341
CRM-13341 add group_id clause to subscription confirm query
Tested the patch, works as expected.
Eileen [Mon, 16 Sep 2013 00:02:27 +0000 (00:02 +0000)]
CRM-13338 remove trailing whitespace introduced by previous commit on this issue
----------------------------------------
* CRM-13338: Profile field defaults not getting populated in contribution live page
http://issues.civicrm.org/jira/browse/CRM-13338
Pradeep Nayak [Sun, 15 Sep 2013 12:28:54 +0000 (17:58 +0530)]
--CRM-12970, fixed for more than one event discount set
----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
http://issues.civicrm.org/jira/browse/CRM-12970
Pradeep Nayak [Sun, 15 Sep 2013 12:17:54 +0000 (17:47 +0530)]
Revert "fixes to setdefaults, CRM-12970"
This reverts commit
66094995512afa0a8c37f0a0b5304ce394ec6bb1.
Pradeep Nayak [Sun, 15 Sep 2013 12:17:37 +0000 (17:47 +0530)]
Revert "minor fix, CRM-12970"
This reverts commit
a8ec0901625fd3c2d6c4199ab547af3420a82945.
Eileen [Sun, 15 Sep 2013 04:03:49 +0000 (04:03 +0000)]
test fix - for some reason JENKINs fails on these (although my local doesn't)
Eileen [Sun, 15 Sep 2013 04:03:00 +0000 (04:03 +0000)]
test fix - EventTest fix getfields api_action alias (for rest)
Kurund Jalmi [Sat, 14 Sep 2013 19:15:21 +0000 (12:15 -0700)]
Merge pull request #1636 from pratik-joshi/CRM-13380
CRM-13380 : fix status and date filters for mailing search pages
Kurund Jalmi [Sat, 14 Sep 2013 19:12:19 +0000 (12:12 -0700)]
Merge pull request #1634 from eileenmcnaughton/master
CRM-13234 api/v3/Profile fix tests & support lower case primary fields
Kurund Jalmi [Sat, 14 Sep 2013 19:10:06 +0000 (12:10 -0700)]
Merge pull request #1633 from yashodha/CRM-13386
CRM-13386
Kurund Jalmi [Sat, 14 Sep 2013 19:08:54 +0000 (12:08 -0700)]
Merge pull request #1630 from yashodha/CRM-13366
worked on CRM-13366
Tim Otten [Fri, 13 Sep 2013 23:12:04 +0000 (16:12 -0700)]
CRM_Admin_Form_Setting_Smtp - Every call to Error::ignoreException should have matching call to Error::setCallback
Tim Otten [Fri, 13 Sep 2013 23:11:40 +0000 (16:11 -0700)]
CRM_Case_BAO_Case - Every call to Error::ignoreException should have matching call to Error::setCallback
Tim Otten [Fri, 13 Sep 2013 21:25:24 +0000 (14:25 -0700)]
Merge pull request #1632 from totten/master-ufgroup-upgrade-error
CRM-13388 - Fix upgrade error due to undefined column, "description"
Pratik Joshi [Fri, 13 Sep 2013 16:49:20 +0000 (22:19 +0530)]
CRM-13382 : exposing of 'Canceled', 'All Status' status option of mailing status filter on mailing search pages for easy search
----------------------------------------
* CRM-13382: Make 'Mailings' searches more comprehensive
http://issues.civicrm.org/jira/browse/CRM-13382
* CRM-13380: 'Mailings' pages: search doesn't work correctly.
http://issues.civicrm.org/jira/browse/CRM-13380
Pratik Joshi [Fri, 13 Sep 2013 11:25:17 +0000 (16:55 +0530)]
CRM-13380 : fix status and date filters for mailing search pages
----------------------------------------
* CRM-13380: 'Mailings' pages: search doesn't work correctly.
http://issues.civicrm.org/jira/browse/CRM-13380
projects / civicrm-core.git / log