Dave Greenberg [Thu, 5 Mar 2015 22:52:14 +0000 (14:52 -0800)]
Merge pull request #5314 from mlutfy/4.6-crm16059
CRM-16059: Fix Bulgarian province names.
Kurund Jalmi [Thu, 5 Mar 2015 22:32:26 +0000 (04:02 +0530)]
Merge pull request #5312 from atif-shaikh/CRM-16034
CRM-16034 - comma acts as decimal in price set text pricing
Kurund Jalmi [Thu, 5 Mar 2015 22:32:02 +0000 (04:02 +0530)]
Merge pull request #5311 from jitendrapurohit/CRM-testfix
CRM test fix for deleteContact
Dave Greenberg [Thu, 5 Mar 2015 19:18:51 +0000 (11:18 -0800)]
Merge pull request #5309 from mlutfy/4.6-crm13584-3
CRM-13584: Finish internationalisation of the installer, and minor cleanups
Mathieu Lutfy [Thu, 5 Mar 2015 15:19:49 +0000 (10:19 -0500)]
CRM-16059: Fix Bulgarian province names.
colemanw [Thu, 5 Mar 2015 14:58:04 +0000 (09:58 -0500)]
Merge pull request #5289 from mallezie/crm-16040
CRM-16040: updates on basic criteria advanced search pane
Kurund Jalmi [Thu, 5 Mar 2015 14:07:42 +0000 (19:37 +0530)]
Merge pull request #5310 from monishdeb/testFailures
api Test failure fixes
atif-shaikh [Thu, 5 Mar 2015 12:15:33 +0000 (17:45 +0530)]
CRM-16034 - comma acts as decimal in price set text pricing
https://issues.civicrm.org/jira/browse/CRM-16034
monishdeb [Thu, 5 Mar 2015 10:31:31 +0000 (16:01 +0530)]
api Test failure fixes
jitendrapurohit [Thu, 5 Mar 2015 09:10:54 +0000 (14:40 +0530)]
CRM test fix for deleteContact
monishdeb [Thu, 5 Mar 2015 08:47:40 +0000 (14:17 +0530)]
api Test failure fixes
Mathieu Lutfy [Thu, 5 Mar 2015 02:55:30 +0000 (21:55 -0500)]
CRM-13584: Minor fix to code style per build feedback.
Mathieu Lutfy [Thu, 5 Mar 2015 02:31:48 +0000 (21:31 -0500)]
CRM-13584: Finish internationalisation of the installer, and minor cleanups.
Dave Greenberg [Wed, 4 Mar 2015 20:51:44 +0000 (12:51 -0800)]
Merge pull request #5297 from rohankatkar/CRM15729
Fix for CRM-15729
Tim Otten [Wed, 4 Mar 2015 20:23:11 +0000 (12:23 -0800)]
Merge pull request #5302 from totten/master-karma-phantom
CRM-16046 - karma - Use PhantomJS by default.
Dave Greenberg [Wed, 4 Mar 2015 15:53:08 +0000 (07:53 -0800)]
Merge pull request #5292 from jitendrapurohit/CRM-15933
CRM-15933 Profile HTML Snippets don't respect CIVICRM_UF_WP_BASEPAGE
CiviCRM [Wed, 4 Mar 2015 15:07:32 +0000 (07:07 -0800)]
Update version to 4.6.beta3
Kurund Jalmi [Wed, 4 Mar 2015 13:24:24 +0000 (18:54 +0530)]
Merge pull request #5303 from davecivicrm/CRM-15578b
CRM-15578 - Change A/B test navigation permissions to require access Civ...
kurund [Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
Conflicts:
CRM/Mailing/BAO/Mailing.php
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Wed, 4 Mar 2015 12:16:47 +0000 (17:46 +0530)]
Merge pull request #5306 from kurund/PR-5111
re-adding changes done in #5111
Kurund Jalmi [Wed, 4 Mar 2015 11:53:32 +0000 (17:23 +0530)]
Merge pull request #5287 from mlutfy/4.6-crm13584-2
CRM-13584: After non-en_US installation in Drupal, revert settings...
kurund [Wed, 4 Mar 2015 10:15:52 +0000 (15:45 +0530)]
also update generated data
kurund [Wed, 4 Mar 2015 10:14:14 +0000 (15:44 +0530)]
re-adding PR-5111
Web Access [Wed, 4 Mar 2015 06:51:41 +0000 (12:21 +0530)]
Updated code to fix jScript error
Web Access [Tue, 3 Mar 2015 15:58:43 +0000 (21:28 +0530)]
Changes to CRm-15729
Web Access [Tue, 3 Mar 2015 15:36:43 +0000 (21:06 +0530)]
Fix for CRM-15729
colemanw [Wed, 4 Mar 2015 01:21:18 +0000 (20:21 -0500)]
Merge pull request #5304 from colemanw/CRM-15932
CRM-15932 - Fix exclude date format
Coleman Watts [Wed, 4 Mar 2015 01:20:39 +0000 (20:20 -0500)]
CRM-15932 - Fix exclude date format
Dave Greenberg [Wed, 4 Mar 2015 01:18:48 +0000 (17:18 -0800)]
Merge pull request #5301 from totten/master-abtest-perm
CRM-15854 - MailingAB API - Restrict to 'access CiviMail'
Dave Greenberg [Wed, 4 Mar 2015 01:17:28 +0000 (17:17 -0800)]
CRM-15578 - Change A/B test navigation permissions to require access CiviMail.
----------------------------------------
* CRM-15578: Implement "New Mailing" + "AB Testing" in Angular
https://issues.civicrm.org/jira/browse/CRM-15578
Dave Greenberg [Wed, 4 Mar 2015 00:44:39 +0000 (16:44 -0800)]
Merge pull request #5288 from colemanw/CRM-15932
CRM-15932 - Recurring entity QA fixes
Tim Otten [Wed, 4 Mar 2015 00:28:10 +0000 (16:28 -0800)]
CRM-16046 - Move karma.conf.js to default location
This allows one to call "karma start" without specifying the name of the config file.
Tim Otten [Wed, 4 Mar 2015 00:26:20 +0000 (16:26 -0800)]
CRM-16046 - karma - Use PhantomJS by default
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.
Coleman Watts [Tue, 3 Mar 2015 23:41:44 +0000 (18:41 -0500)]
CRM-15932 - Enable/disable form buttons appropriately
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
Coleman Watts [Tue, 3 Mar 2015 23:34:49 +0000 (18:34 -0500)]
CRM.confirm - re-use adjustDialogDefaults function
Tim Otten [Tue, 3 Mar 2015 23:29:27 +0000 (15:29 -0800)]
Merge pull request #5300 from totten/4.5-setupsh-hostport
setup.conf.txt - Add DBHOST and DBPORT
Coleman Watts [Tue, 3 Mar 2015 23:15:08 +0000 (18:15 -0500)]
CRM-15932 - Fix activity date default recurring values
Eileen McNaughton [Tue, 3 Mar 2015 22:42:19 +0000 (09:42 +1100)]
Merge pull request #5299 from eileenmcnaughton/master
a few comment fixes
Tim Otten [Tue, 3 Mar 2015 22:38:36 +0000 (14:38 -0800)]
setup.conf.txt - Add DBHOST and DBPORT
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
Coleman Watts [Tue, 3 Mar 2015 14:38:50 +0000 (09:38 -0500)]
CRM-15932 - Cleanup unnecessary use of CRM_Utils_Array
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:29:53 +0000 (18:59 +0530)]
warning fixes
jitendrapurohit [Tue, 3 Mar 2015 13:05:36 +0000 (18:35 +0530)]
webtest fixes 4.6
jitendrapurohit [Tue, 3 Mar 2015 13:03:44 +0000 (18:33 +0530)]
warning fix
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
jitendrapurohit [Tue, 3 Mar 2015 08:26:46 +0000 (13:56 +0530)]
CRM-15933 Profile HTML Snippets don't respect CIVICRM_UF_WP_BASEPAGE
Tim Mallezie [Tue, 3 Mar 2015 08:13:44 +0000 (09:13 +0100)]
remove whitespace
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.
Coleman Watts [Tue, 3 Mar 2015 02:57:59 +0000 (21:57 -0500)]
CRM-15932 - Additional QA fixes
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
Tim Mallezie [Mon, 2 Mar 2015 21:57:30 +0000 (22:57 +0100)]
updates on basic criteria advanced search pane
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
Coleman Watts [Mon, 2 Mar 2015 21:17:04 +0000 (16:17 -0500)]
CRM-15932 - Decouple frequency units of contributions and recurring entities
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
Mathieu Lutfy [Mon, 2 Mar 2015 21:06:59 +0000 (16:06 -0500)]
CRM-13584: After non-en_US installation in Drupal, revert settings to force defaults, otherwise the defaults will be NULL.
Coleman Watts [Mon, 2 Mar 2015 20:37:56 +0000 (15:37 -0500)]
CRM-15932 - Fix recurring entity form validation
Tim Mallezie [Mon, 2 Mar 2015 20:42:17 +0000 (21:42 +0100)]
update to addSelect
Coleman Watts [Mon, 2 Mar 2015 20:37:34 +0000 (15:37 -0500)]
Fix appearance of disabled form inputs
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
Coleman Watts [Mon, 2 Mar 2015 02:24:11 +0000 (21:24 -0500)]
Don't translate empty strings
That was... silly.
Coleman Watts [Mon, 2 Mar 2015 02:19:03 +0000 (21:19 -0500)]
CRM-15932 - Fix untranslated strings & localize dates
projects / civicrm-core.git / log