Tim Otten [Wed, 4 Mar 2015 00:10:41 +0000 (16:10 -0800)]
CRM-15854 - MailingAB API - Restrict to 'access CiviMail'
We haven't thought through how it would work with workflow-based
permissions.
Dave Greenberg [Tue, 3 Mar 2015 23:38:33 +0000 (15:38 -0800)]
Merge pull request #5275 from totten/master-civimail-workflow
CRM-15854 - crmMailing - Support for approval workflows
Eileen McNaughton [Tue, 3 Mar 2015 22:42:19 +0000 (09:42 +1100)]
Merge pull request #5299 from eileenmcnaughton/master
a few comment fixes
Eileen McNaughton [Tue, 3 Mar 2015 22:24:41 +0000 (09:24 +1100)]
comment fixes
Eileen McNaughton [Tue, 3 Mar 2015 21:44:16 +0000 (08:44 +1100)]
a few comment fixes
kurund [Tue, 3 Mar 2015 18:16:07 +0000 (23:46 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14
Conflicts:
CRM/Profile/Page/Dynamic.php
colemanw [Tue, 3 Mar 2015 17:50:57 +0000 (12:50 -0500)]
Merge pull request #5296 from monishdeb/CRM-16042
CRM-16042 fix - Unable to Create Personal Campaign Pages from Contact Da...
Kurund Jalmi [Tue, 3 Mar 2015 17:31:52 +0000 (23:01 +0530)]
Merge pull request #5295 from jitendrapurohit/webtestfixes
webtest fixes 4.6
colemanw [Tue, 3 Mar 2015 14:18:43 +0000 (09:18 -0500)]
Merge pull request #5286 from eileenmcnaughton/master
CRM-15941 separate parts of criteria tpl
monishdeb [Tue, 3 Mar 2015 13:49:47 +0000 (19:19 +0530)]
CRM-16042 fix - Unable to Create Personal Campaign Pages from Contact Dashboard
https://issues.civicrm.org/jira/browse/CRM-16042
Monish Deb [Tue, 3 Mar 2015 13:41:13 +0000 (19:11 +0530)]
Merge pull request #5293 from monishdeb/CRM-16043
CRM-16043 fix - Search Participant doesn't retrieves participant with mo...
jitendrapurohit [Tue, 3 Mar 2015 13:05:36 +0000 (18:35 +0530)]
webtest fixes 4.6
Kurund Jalmi [Tue, 3 Mar 2015 12:27:54 +0000 (17:57 +0530)]
Merge pull request #5294 from monishdeb/CRM-16006
CRM-16006 fix
monishdeb [Tue, 3 Mar 2015 10:25:00 +0000 (15:55 +0530)]
CRM-16009 fix - URL for Contact Image in View incorrectly generating
https://issues.civicrm.org/jira/browse/CRM-16009
monishdeb [Tue, 3 Mar 2015 10:16:47 +0000 (15:46 +0530)]
CRM-16043 fix - Search Participant doesn't retrieves participant with more then one role
https://issues.civicrm.org/jira/browse/CRM-16043
Tim Otten [Tue, 3 Mar 2015 02:35:23 +0000 (18:35 -0800)]
CRM-15854 - crmMailing, crmMailingAB - Respect 'delete in CiviMail' permission
Tim Otten [Tue, 3 Mar 2015 02:11:58 +0000 (18:11 -0800)]
CRM-15854 - CiviMail workflow, new UI - Consistent interpretation of 'access CiviMail'
Tim Otten [Tue, 3 Mar 2015 02:06:01 +0000 (18:06 -0800)]
CRM-15854 - CiviMail workflow, old UI - Consistent interpretation of 'access CiviMail'
There are inconstencies in how permissions are interpreted:
1. Some parts of the UI treat 'access CiviMail' as an overarching permission
(which implies create+schedule+approve mailings) and treat
create+schedule+approve as standalone permissions.
2. Other parts treat 'access CiviMail' as a pre-requisite for create+schedule+approve.
This revision updates various legacy UI's to consistently use the first approach.
Tim Otten [Sat, 28 Feb 2015 01:48:34 +0000 (18:48 -0700)]
crmMailing/review.html - Show preview for text (if text is derived from html)
Tim Otten [Sat, 28 Feb 2015 01:38:57 +0000 (18:38 -0700)]
CRM-15854 - Fix previews for user without 'create mailings'
Tim Otten [Tue, 3 Mar 2015 00:59:50 +0000 (16:59 -0800)]
Merge pull request #5290 from totten/4.5-watchdog
CRM-15929 - Drupal watchdog
Tim Otten [Sat, 28 Feb 2015 00:18:27 +0000 (17:18 -0700)]
CRM-15854 - Fix crash on review form
Tim Otten [Sat, 28 Feb 2015 00:17:17 +0000 (17:17 -0700)]
CRM-15854 - CRM_Core_IDS - Allow AJAX calls with HTML documents.
Tim Otten [Fri, 27 Feb 2015 00:19:57 +0000 (17:19 -0700)]
CRM-15854 - crmMailing - Adapt layout (w/conditionals) if workflow enabled
Tim Otten [Thu, 26 Feb 2015 23:30:15 +0000 (16:30 -0700)]
CRM-15854 - crmMailing - Fix initialization of scope.mailing
Tim Otten [Fri, 27 Feb 2015 01:08:39 +0000 (18:08 -0700)]
crmMetadata - Provide both options and optionsMap
Tim Otten [Thu, 26 Feb 2015 23:05:50 +0000 (16:05 -0700)]
crmUiWizard - Fix error when first wizard step is conditional
Tim Otten [Thu, 26 Feb 2015 23:05:16 +0000 (16:05 -0700)]
CRM-15854 - CRM_Mailing_Info - Export workflow details to Angular
Dave Greenberg [Mon, 2 Mar 2015 23:41:14 +0000 (15:41 -0800)]
Update EventFees.tpl
Adding missing closing angle bracket in span closure on line 44.
Tim Otten [Mon, 2 Mar 2015 23:31:54 +0000 (15:31 -0800)]
CRM-15929 - Drupal watchdog
Dave Greenberg [Mon, 2 Mar 2015 22:45:01 +0000 (14:45 -0800)]
Merge pull request #5195 from pradpnayak/CRM-15989
--CRM-15989, Added code to show (deceased) for Contact taged as deceased
Dave Greenberg [Mon, 2 Mar 2015 22:01:19 +0000 (14:01 -0800)]
Merge pull request #5205 from rohankatkar/CRM_15860
Fix for CRM-15860
Pradeep Nayak [Mon, 2 Mar 2015 21:32:12 +0000 (03:02 +0530)]
--CRM-15989, replaced font tag with span tag and add css
colemanw [Mon, 2 Mar 2015 21:23:54 +0000 (16:23 -0500)]
Merge pull request #5282 from mallezie/crm-16028
update eventtype selector to select2
Tim Mallezie [Mon, 2 Mar 2015 21:21:34 +0000 (22:21 +0100)]
add 'context' => 'search'
Pradeep Nayak [Thu, 26 Feb 2015 21:33:11 +0000 (03:03 +0530)]
--CRM-15989, fixed indentation
Pradeep Nayak [Thu, 26 Feb 2015 17:42:23 +0000 (23:12 +0530)]
-- CRM-15989, removed white spaces
----------------------------------------
* CRM-15989: Merge Show Deceased Contact extension into core
https://issues.civicrm.org/jira/browse/CRM-15989
Pradeep Nayak [Wed, 25 Feb 2015 20:57:19 +0000 (02:27 +0530)]
--CRM-15989, added webtest
Pradeep Nayak [Mon, 23 Feb 2015 16:40:24 +0000 (22:10 +0530)]
-- CRM-15989, removed whitespace
----------------------------------------
* CRM-15989: Merge Show Deceased Contact extension into core
https://issues.civicrm.org/jira/browse/CRM-15989
Pradeep Nayak [Wed, 18 Feb 2015 22:37:29 +0000 (04:07 +0530)]
--CRM-15989, Added code to show (deceased) for Contact taged as deceased
Tim Otten [Mon, 2 Mar 2015 21:09:16 +0000 (13:09 -0800)]
Merge pull request #5281 from totten/4.5-email-test
CRM_Mailing_Form_Test - Email formatting
Tim Mallezie [Mon, 2 Mar 2015 20:42:17 +0000 (21:42 +0100)]
update to addSelect
Eileen McNaughton [Mon, 2 Mar 2015 19:56:58 +0000 (06:56 +1100)]
comment function to indicate it should use ->tabs
Eileen McNaughton [Mon, 2 Mar 2015 19:44:47 +0000 (06:44 +1100)]
move instance.tpl to tabs as it presents tabs
Eileen McNaughton [Mon, 2 Mar 2015 18:21:50 +0000 (05:21 +1100)]
CRM-15941 further fix including renaming folder for tab files to tabs
Eileen McNaughton [Wed, 25 Feb 2015 06:42:22 +0000 (19:42 +1300)]
a few comment tidy ups
Eileen McNaughton [Wed, 25 Feb 2015 06:34:02 +0000 (19:34 +1300)]
CRM-15941 separate parts of the report 'criteria' form
This puts them in regions & allows them to be overridden on a more granular level
Kurund Jalmi [Mon, 2 Mar 2015 16:21:59 +0000 (21:51 +0530)]
Merge pull request #5284 from jitendrapurohit/webtestfixes
webtest fixes 4.6
kurund [Mon, 2 Mar 2015 16:11:34 +0000 (21:41 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-02-21-30-06
Conflicts:
CRM/Contact/Form/Search.php
CRM/Contact/Form/Search/Custom.php
CRM/Contact/Form/Search/Custom/ActivitySearch.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EmployerListing.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Contact/Form/Search/Interface.php
colemanw [Mon, 2 Mar 2015 15:43:40 +0000 (10:43 -0500)]
Merge pull request #5285 from colemanw/dateDefaults
CRM-16019 - Expose date/time format preferences to clientside
Coleman Watts [Mon, 2 Mar 2015 15:30:32 +0000 (10:30 -0500)]
CRM-16019 - Reset dynamic js when changing date defaults
Coleman Watts [Thu, 26 Feb 2015 21:55:02 +0000 (16:55 -0500)]
CRM-16019 - Expose date/time format preferences to clientside
jitendrapurohit [Mon, 2 Mar 2015 13:13:04 +0000 (18:43 +0530)]
webtest fixes 4.6
Tim Mallezie [Mon, 2 Mar 2015 07:18:38 +0000 (08:18 +0100)]
update eventtype selector to select2
Dave Greenberg [Mon, 2 Mar 2015 02:10:08 +0000 (18:10 -0800)]
Merge pull request #5278 from kurund/CRM-15756
CRM-15756, validation for CC fixes
Tim Otten [Mon, 2 Mar 2015 01:18:05 +0000 (17:18 -0800)]
CRM_Mailing_Form_Test - Email formatting
Tim Otten [Mon, 2 Mar 2015 00:01:29 +0000 (17:01 -0700)]
Merge pull request #5157 from GinkgoFJG/CRM-15965
CRM-15965: Custom searches cannot specify custom task menu
Frank J. Gómez [Sun, 1 Mar 2015 22:06:06 +0000 (17:06 -0500)]
CRM-15965: Until the search interface is updated, guard calls the new method.
Frank J. Gómez [Sun, 1 Mar 2015 21:38:26 +0000 (16:38 -0500)]
Removed unused custom search (see thread in CRM-15965).
Frank J. Gómez [Sun, 1 Mar 2015 20:59:17 +0000 (15:59 -0500)]
CRM-15965: Postpone interface update until 4.6.
Frank J. Gómez [Sun, 1 Mar 2015 20:44:29 +0000 (15:44 -0500)]
CRM-15965: Resolved strict warning re compatibility of declaration of contactIDs with parent method.
Frank J. Gómez [Sun, 1 Mar 2015 20:13:08 +0000 (15:13 -0500)]
CRM-15965: Updated built-in custom reports to be consistent with changes to CRM_Contact_Form_Search_Interface (namely the addition of the buildTaskList method).
colemanw [Sat, 28 Feb 2015 22:02:22 +0000 (17:02 -0500)]
Merge pull request #5277 from colemanw/jitendrapurohit-CRM-15889
Additional fixes with test coverage
kurund [Sat, 28 Feb 2015 20:51:30 +0000 (02:21 +0530)]
CRM-15756, more fixes
----------------------------------------
* CRM-15756: Back-office Submit Credit Card Contribution form: card # validation is no longer working
https://issues.civicrm.org/jira/browse/CRM-15756
colemanw [Sat, 28 Feb 2015 20:41:51 +0000 (15:41 -0500)]
Merge pull request #5253 from totten/4.5-dompdf-alert
Verify dompdf upgrade
Coleman Watts [Sat, 28 Feb 2015 20:19:43 +0000 (15:19 -0500)]
CRM-15889 - More specific condition and add test coverage
kurund [Sat, 28 Feb 2015 13:34:46 +0000 (19:04 +0530)]
CRM-15756, more fixes for validation
----------------------------------------
* CRM-15756: Back-office Submit Credit Card Contribution form: card # validation is no longer working
https://issues.civicrm.org/jira/browse/CRM-15756
Dave Greenberg [Sat, 28 Feb 2015 00:26:15 +0000 (16:26 -0800)]
Merge pull request #5269 from agh1/grant-date-search
CRM-16024 - CiviGrant / Report: money transfer date filter wasn't working
colemanw [Sat, 28 Feb 2015 00:16:42 +0000 (19:16 -0500)]
Merge pull request #5255 from totten/master-replyto-setting
CRM-15943 - Move replyTo option from $config to a setting.
kurund [Fri, 27 Feb 2015 21:28:54 +0000 (02:58 +0530)]
CRM-15756, validation for CC fixes
----------------------------------------
* CRM-15756: Back-office Submit Credit Card Contribution form: card # validation is no longer working
https://issues.civicrm.org/jira/browse/CRM-15756
colemanw [Fri, 27 Feb 2015 21:08:53 +0000 (16:08 -0500)]
Merge pull request #5235 from atif-shaikh/CRM-5039MinorFixes
CRM-5039 Minor Fixes
colemanw [Fri, 27 Feb 2015 21:05:26 +0000 (16:05 -0500)]
Merge pull request #5274 from mlutfy/4.6-crm16031
CRM-16031: Case View Activity: add the fieldID of custom fields for easier theming.
colemanw [Fri, 27 Feb 2015 21:01:56 +0000 (16:01 -0500)]
Merge pull request #5273 from colemanw/CRM-16007
CRM-16007 - Consistently represent primary address/email/etc in contactSummary
Mathieu Lutfy [Fri, 27 Feb 2015 20:35:58 +0000 (15:35 -0500)]
CRM-16031: Case View Activity: add the fieldID of custom fields for easier theming.
Coleman Watts [Fri, 27 Feb 2015 19:53:09 +0000 (14:53 -0500)]
CRM-16007 - Consistently represent primary address/email/etc in contactSummary
colemanw [Fri, 27 Feb 2015 16:27:41 +0000 (11:27 -0500)]
Merge pull request #5267 from mlutfy/4.6-crm16020
CRM-16020: fix invalid HTML in templates/CRM/Case/Form/Activity.tpl.
colemanw [Fri, 27 Feb 2015 16:15:03 +0000 (11:15 -0500)]
Merge pull request #5271 from samuelsov/CRM-15650
Translate subscribe status
samuelsov [Fri, 27 Feb 2015 15:05:49 +0000 (10:05 -0500)]
Translate subscribe status
jitendrapurohit [Fri, 27 Feb 2015 13:03:19 +0000 (18:33 +0530)]
alter related membership if the is_active param is changed
jitendrapurohit [Thu, 26 Feb 2015 11:52:45 +0000 (17:22 +0530)]
additional changes for CRM-15889
Andrew Hunt [Fri, 27 Feb 2015 05:06:03 +0000 (00:06 -0500)]
CRM-16024 - CiviGrant / Report: money transfer date filter wasn't working
Dave Greenberg [Fri, 27 Feb 2015 01:03:52 +0000 (17:03 -0800)]
Merge pull request #5268 from davecivicrm/CRM-16016
CRM-16016 - Remove Add Note link for users without permission.
Dave Greenberg [Fri, 27 Feb 2015 01:02:14 +0000 (17:02 -0800)]
Merge pull request #5266 from davecivicrm/CRM-13901
CRM-13901 - Fix unintentional suppression of Membership Dashboard Summar...
Dave Greenberg [Fri, 27 Feb 2015 00:58:01 +0000 (16:58 -0800)]
CRM-16016 - Remove Add Note link for users without permission.
----------------------------------------
* CRM-16016: Permission on Contact Notes- Users with only View Permission can add notes
https://issues.civicrm.org/jira/browse/CRM-16016
Mathieu Lutfy [Fri, 27 Feb 2015 00:09:34 +0000 (19:09 -0500)]
CRM-16020: fix invalid HTML in templates/CRM/Case/Form/Activity.tpl.
Dave Greenberg [Fri, 27 Feb 2015 00:06:54 +0000 (16:06 -0800)]
Merge pull request #5265 from davecivicrm/CRM-16018
CRM-16018 - Increase column size for membership_block.membership_types t...
Dave Greenberg [Thu, 26 Feb 2015 23:32:17 +0000 (15:32 -0800)]
CRM-13901 - Fix unintentional suppression of Membership Dashboard Summary table for users with view all contacts permission.
----------------------------------------
* CRM-13901: Suppress Membership Dashboard for contacts who may not see all users as it contains info about members they are blocked from
https://issues.civicrm.org/jira/browse/CRM-13901
Dave Greenberg [Thu, 26 Feb 2015 22:20:12 +0000 (14:20 -0800)]
CRM-16018 - Increase column size for membership_block.membership_types to 1024 to avoid fatal error when large number of membership types.
----------------------------------------
* CRM-16018: DB error when >20 membership types are created
https://issues.civicrm.org/jira/browse/CRM-16018
colemanw [Thu, 26 Feb 2015 21:43:56 +0000 (16:43 -0500)]
Merge pull request #5263 from samuelsov/CRM-15947
Add hook_civicrm_pre / hook_civicrm_post for Campaign
colemanw [Thu, 26 Feb 2015 19:59:43 +0000 (14:59 -0500)]
Merge pull request #5264 from colemanw/CRM-15988
CRM-15988 - Test fixes
samuelsov [Thu, 26 Feb 2015 19:41:17 +0000 (14:41 -0500)]
Fix non standard syntax
samuelsov [Thu, 26 Feb 2015 19:32:31 +0000 (14:32 -0500)]
Fix non standard syntax
Kurund Jalmi [Thu, 26 Feb 2015 18:54:46 +0000 (00:24 +0530)]
Merge pull request #5106 from cividesk/CRM-14974-4.6
Fix for CRM-14974
Coleman Watts [Thu, 26 Feb 2015 17:53:12 +0000 (12:53 -0500)]
CRM-15988 - Test fixes
Monish Deb [Thu, 26 Feb 2015 14:27:12 +0000 (19:57 +0530)]
Merge pull request #5262 from pratikshad/FixedWebtest5
Fixed broken webtest
samuelsov [Thu, 26 Feb 2015 14:11:03 +0000 (09:11 -0500)]
Add hook_civicrm_pre / hook_civicrm_post for Campaign
pratikshad [Thu, 26 Feb 2015 13:09:39 +0000 (18:39 +0530)]
Fixed broken webtest
Tim Otten [Thu, 26 Feb 2015 04:28:15 +0000 (21:28 -0700)]
Merge pull request #5260 from totten/4.5-test-tz2
CRM-14423 - CiviUnitTestCase - UnitTest UF should set MySQL TZ (like Drupal/WP)
Tim Otten [Thu, 26 Feb 2015 02:11:45 +0000 (19:11 -0700)]
CRM-14423 - CiviUnitTestCase - UnitTest UF should set MySQL TZ (like Drupal/WP)
Tim Otten [Thu, 26 Feb 2015 01:07:42 +0000 (17:07 -0800)]
Merge pull request #5256 from totten/master-composer-lock
composer.lock - Re-add to git
projects / civicrm-core.git / log