civicrm-core.git
9 years agoCore.settings.php - doNotAttachPDFReceipt - Match previous defaults
Tim Otten [Sat, 12 Sep 2015 21:47:04 +0000 (14:47 -0700)]
Core.settings.php - doNotAttachPDFReceipt - Match previous defaults

9 years agoconfig->countryLimit - Don't directly modify array
Tim Otten [Sat, 12 Sep 2015 20:58:37 +0000 (13:58 -0700)]
config->countryLimit - Don't directly modify array

When using magic method for countryLimit, it's difficult to directly modify
the array.  It's easier to replace the array as a whole.

9 years agoSettings - Remove special cases for `prefetch` and `config_only`
Tim Otten [Sat, 12 Sep 2015 07:15:21 +0000 (00:15 -0700)]
Settings - Remove special cases for `prefetch` and `config_only`

9 years agoRemove invalid $config->defaultSymbol
Tim Otten [Sat, 12 Sep 2015 07:00:03 +0000 (00:00 -0700)]
Remove invalid $config->defaultSymbol

Even in v4.5, this field appears to have been undefined, but it probably
behaved correctly anyway because the undefined value was passed into a
function which didn't need it.

9 years agoCleanup `config_only` settings (maxFileSize, doNotAttachPDFReceipt, resCacheCode)
Tim Otten [Sat, 12 Sep 2015 06:34:49 +0000 (23:34 -0700)]
Cleanup `config_only` settings (maxFileSize, doNotAttachPDFReceipt, resCacheCode)

9 years agoMove BAO_Setting::getSettingSpecification => SettingsMetdata::getMetadata
Tim Otten [Sat, 12 Sep 2015 06:16:24 +0000 (23:16 -0700)]
Move BAO_Setting::getSettingSpecification => SettingsMetdata::getMetadata

When this function is in the BAO, it requires that the DAO exist. In a new
installation running GenCode, this can create dependency loop (where
generating code requires ts(), and using ts() requires settings, and using
settings requires that you already have the generated code).

9 years agoCRM_Core_I18n - Use CRM_Core_Config less
Tim Otten [Sat, 12 Sep 2015 06:15:34 +0000 (23:15 -0700)]
CRM_Core_I18n - Use CRM_Core_Config less

9 years agoCRM_Utils_Cache::create - Use factory function
Tim Otten [Sat, 12 Sep 2015 03:36:44 +0000 (20:36 -0700)]
CRM_Utils_Cache::create - Use factory function

Low-level tools like GenCode may run without access to a database. When we
try to use caching in central code, the cache-accesses are prone to
crashing. The problem -- in this environment, we shouldn't even try to use
databse for caching.

`CRM_Utils_Cache::create()` will attempt to create the best cache it can,
depending on what services are available.

9 years agoCRM_Core_I18n::crm_translate_raw - Don't lookup $config->lcMessages for every string
Tim Otten [Sat, 12 Sep 2015 03:22:49 +0000 (20:22 -0700)]
CRM_Core_I18n::crm_translate_raw - Don't lookup $config->lcMessages for every string

Accessing `$config` is now be a little slower, and this function accounted
for about half of all calls.

9 years agoGenCode - More complete env
Tim Otten [Sat, 12 Sep 2015 01:15:26 +0000 (18:15 -0700)]
GenCode - More complete env

9 years agoCRM_Utils_System - Cleanup useFrameworkRelativeBase
Tim Otten [Fri, 11 Sep 2015 08:15:01 +0000 (01:15 -0700)]
CRM_Utils_System - Cleanup useFrameworkRelativeBase

9 years agoCRM-16373 - CRM_Core_Config - Use `Runtime` and `MagicMerge`
Tim Otten [Fri, 11 Sep 2015 08:07:25 +0000 (01:07 -0700)]
CRM-16373 - CRM_Core_Config - Use `Runtime` and `MagicMerge`

9 years agoCivi\Core\SettingsManager - Don't try to read settings if there's no DB
Tim Otten [Fri, 11 Sep 2015 05:03:37 +0000 (22:03 -0700)]
Civi\Core\SettingsManager - Don't try to read settings if there's no DB

9 years agoCRM-16373 - Civi\Core\SettingsManager - Load defaults *after* core bootstrap.
Tim Otten [Thu, 10 Sep 2015 23:36:28 +0000 (16:36 -0700)]
CRM-16373 - Civi\Core\SettingsManager - Load defaults *after* core bootstrap.

9 years agoCRM_Extension_System - Make it a little easier to skim.
Tim Otten [Thu, 10 Sep 2015 23:34:05 +0000 (16:34 -0700)]
CRM_Extension_System - Make it a little easier to skim.

9 years agoCRM-16373 - CRM_Core_Config_Variables should be strictly about data
Tim Otten [Thu, 10 Sep 2015 21:38:55 +0000 (14:38 -0700)]
CRM-16373 - CRM_Core_Config_Variables should be strictly about data

The distribution of variables and functions between `CRM_Core_Config` and
`CRM_Core_Config_Variables` seems pretty random.  In anticipation of
swapping out `CRM_Core_Config_Variables`, make a few changes:

 * Move various functions from `CRM_Core_Config_Variables` to BAOs (`provinceLimit, `countryLimit`, `defaultContactCountry`, `defaultContactCountryName`, `defaultCurrencySymbol`)
 * Put deprecated stubs in `CRM_Core_Config`
 * Move most variables from `CRM_Core_Config` to `CRM_Core_Config_Variables`.

9 years agoCRM_Core_Config - Fix bugs in path/dir settings
Tim Otten [Wed, 9 Sep 2015 20:50:11 +0000 (13:50 -0700)]
CRM_Core_Config - Fix bugs in path/dir settings

9 years agoCRM-16373 - Search Settings - Fix dupes (eg contact_reference_options/autocompleteCon...
Tim Otten [Wed, 9 Sep 2015 06:18:34 +0000 (23:18 -0700)]
CRM-16373 - Search Settings - Fix dupes (eg contact_reference_options/autocompleteContactReference)

Note:
 * The `autocompleteContactReference` and `autocompleteContactSearch` settings don't seem to be really stored as such.
 * The form includes various hacks which effectively saves these fields in `contact_reference_options` and `contact_autocomplete_options`.
 * At runtime, the application logic checks for `contact_reference_options` and `contact_autocomplete_options`.
 * This situation predates the declarations of `autocompleteContactReference` and `autocompleteContactSearch` in `Search.setting.php`. It seems likely
   that these settings have never been useful.

The fields still have some hacks, but they should be a bit easier to read/trace/grep.

9 years agoCRM-16373 - Localization - Rearrange load/save logic
Tim Otten [Tue, 8 Sep 2015 21:23:42 +0000 (14:23 -0700)]
CRM-16373 - Localization - Rearrange load/save logic

 * Declare missing setting `languageLimit`
 * Allow saving admin form -- even when using makeMultilingual, makeSinglelingual, addLanguage, and/or languageLimit
 * Move onChange logic for `lcMessages` from `ConfigSetting::add()` to `onChangeLcMessages()`
 * Move locale init from `ConfigSetting::retrieve()` to `applyLocale()`

9 years agoCRM-16373 - CRM_Admin_Form_Setting - Generate error instead of saving config fields
Tim Otten [Tue, 8 Sep 2015 00:14:32 +0000 (17:14 -0700)]
CRM-16373 - CRM_Admin_Form_Setting - Generate error instead of saving config fields

9 years agoCRM-16373 - CRM_Admin_Form_Setting_Search - Don't save through ConfigSetting::add()
Tim Otten [Tue, 8 Sep 2015 02:21:03 +0000 (19:21 -0700)]
CRM-16373 - CRM_Admin_Form_Setting_Search - Don't save through ConfigSetting::add()

9 years agoCRM-16373 - CRM_Admin_Form_Setting_Date - Don't save through ConfigSetting::add()
Tim Otten [Tue, 8 Sep 2015 01:48:15 +0000 (18:48 -0700)]
CRM-16373 - CRM_Admin_Form_Setting_Date - Don't save through ConfigSetting::add()

9 years agoCRM-16373 - CRM_Admin_Form_Setting_Misc - Don't save through ConfigSetting::add()
Tim Otten [Tue, 8 Sep 2015 01:30:23 +0000 (18:30 -0700)]
CRM-16373 - CRM_Admin_Form_Setting_Misc - Don't save through ConfigSetting::add()

9 years agoCRM-16373 - Migrate Map/Geocode settings
Tim Otten [Tue, 8 Sep 2015 01:09:25 +0000 (18:09 -0700)]
CRM-16373 - Migrate Map/Geocode settings

9 years agoCRM-16373 - Localization - Save through settings instead of domain
Tim Otten [Sun, 6 Sep 2015 01:01:18 +0000 (18:01 -0700)]
CRM-16373 - Localization - Save through settings instead of domain

9 years agoConfigSetting::fixParams - Remove legacy handling for countryLimit, provinceLimit...
Tim Otten [Mon, 7 Sep 2015 23:54:56 +0000 (16:54 -0700)]
ConfigSetting::fixParams - Remove legacy handling for countryLimit, provinceLimit, defaultContactCountry

This appears to be migration logic for handling a change in the format of
select config fields.  The migration logic appears to originate before v3.0.
Since we're only supporting upgrades from v4.0+, there's no point in keeping
it.

9 years agoCRM_Core_BAO_ConfigSetting::formatParams - Remove silly function
Tim Otten [Mon, 7 Sep 2015 23:39:23 +0000 (16:39 -0700)]
CRM_Core_BAO_ConfigSetting::formatParams - Remove silly function

This function is basically just array_merge().

In theory, there's a side-effect where NULL values in `$values` are unset,
but neither use-case seems to make any use of `$values` afterward, and that
smells like an accidental side-effect anyway.

9 years agoCRM-16373 - Mailer settings - Remove reliance on CRM_Core_BAO_ConfigSetting::create
Tim Otten [Sat, 5 Sep 2015 19:23:13 +0000 (12:23 -0700)]
CRM-16373 - Mailer settings - Remove reliance on CRM_Core_BAO_ConfigSetting::create

9 years agoCRM-16373, CRM-14349 - Config - Disintermediate localeCustomStrings
Tim Otten [Fri, 28 Aug 2015 02:29:24 +0000 (19:29 -0700)]
CRM-16373, CRM-14349 - Config - Disintermediate localeCustomStrings

localeCustomStrings has a pretty w.e.i.r.d. lifecycle (involving table `civicrm_word_replacements`
and column `civicrm_domain.locale_cusotm_Strings`).  This commit does not unweird it, but the
weirdness no longer involves special-case logic on `CRM_Core_Config*` -- all the weirdness is
concentrated in `CRM_Core_BAO_WordReplacements` and `CRM_Admin_Form_WordReplacements`.

9 years agoCRM-16373 - Simplify loading of enableComponents
Tim Otten [Thu, 27 Aug 2015 23:03:54 +0000 (16:03 -0700)]
CRM-16373 - Simplify loading of enableComponents

9 years agoCRM_Core_BAO_Setting::dao() - Don't filter on group, but do save a blank group.
Tim Otten [Thu, 27 Aug 2015 23:01:08 +0000 (16:01 -0700)]
CRM_Core_BAO_Setting::dao() - Don't filter on group, but do save a blank group.

9 years agoCRM-16373 - Save URLs and paths through settings instead of domain
Tim Otten [Sun, 23 Aug 2015 17:03:44 +0000 (10:03 -0700)]
CRM-16373 - Save URLs and paths through settings instead of domain

9 years agocivicrm_api3_setting_getvalue - Skip $config. Use settings.
Tim Otten [Sun, 23 Aug 2015 22:46:41 +0000 (15:46 -0700)]
civicrm_api3_setting_getvalue - Skip $config. Use settings.

9 years ago(Directory,Url).setting.php - Tweaks
Tim Otten [Sun, 23 Aug 2015 17:01:38 +0000 (10:01 -0700)]
(Directory,Url).setting.php - Tweaks

9 years agoCRM_Core_BAO_Preferences - Remove unused file/class/functions
Tim Otten [Sun, 23 Aug 2015 16:05:55 +0000 (09:05 -0700)]
CRM_Core_BAO_Preferences - Remove unused file/class/functions

9 years agoCRM-16373 - CRM_Core_Config_Defaults - Split setValues() into pieces
Tim Otten [Sun, 23 Aug 2015 15:58:33 +0000 (08:58 -0700)]
CRM-16373 - CRM_Core_Config_Defaults - Split setValues() into pieces

The major pieces:
 * `userSystem->getDefaultFileStorage`
 * `userSystem->getCiviSourceStorage`
 * `getCustomFileUploadDir`, `getCustomPhpPathDir`, `getImageUploadDir`, etc

9 years agoCRM_Utils_Geocode - Read settings instead of config
Tim Otten [Sun, 23 Aug 2015 15:58:01 +0000 (08:58 -0700)]
CRM_Utils_Geocode - Read settings instead of config

9 years agoCRM-16373 - SettingsBag - Add getUrl/getPath/setUrl/setPath
Tim Otten [Sun, 23 Aug 2015 09:43:12 +0000 (02:43 -0700)]
CRM-16373 - SettingsBag - Add getUrl/getPath/setUrl/setPath

9 years agoCRM-16373 - CRM_Core_Config - Simplify initialization, esp `templateCompileDir`
Tim Otten [Sun, 23 Aug 2015 08:38:35 +0000 (01:38 -0700)]
CRM-16373 - CRM_Core_Config - Simplify initialization, esp `templateCompileDir`

Generally, this commit removes some silly 1-line functions, misplaed
functions, duplicated steps, obvious comments, and expired comments.

There is a change in `templateCompileDir`.

The `templateCompileDir` had two different intialization blocks (in
different places), which likely arose from variations in the code-paths used
for memcache systems.  Both routines append a locale and create the dir.

This is redundant, and it unnecessarily forces us to resolve the locale
early during initialization.  But honestly we don't need to append the
locale until much later (when/if Smarty is first used).

There are a few oddballs who use `$config->templateCompileDir` and they may
see a slight change (working with the real templateCompileDir rather than
the locale subdir):

 * The cleanup. If this code causes a change, it will be an improvement:
   instead of cleaning the Smarty cache for one locale, it'll clean the
   entire Smarty cache for all locales.
 * Random temp files. The temp files seem to be transactional in nature
   (tied to the specific invocatoin) and not to the locale.

9 years agoCRM-16373 - Config - Migrate `userFrameworkUsersTableName` to settings
Tim Otten [Sat, 22 Aug 2015 11:29:06 +0000 (04:29 -0700)]
CRM-16373 - Config - Migrate `userFrameworkUsersTableName` to settings

There was some code to initialize this field on Joomla and WordPress, but it
appears to be pointless -- the value is only used within the Drupal UF.
More generally, this is a good thing - we should use CMS API's rather than
peeking into their schema.

9 years agoCRM-16373 - Config - Remove `userFrameworkVersion`
Tim Otten [Sat, 22 Aug 2015 10:42:07 +0000 (03:42 -0700)]
CRM-16373 - Config - Remove `userFrameworkVersion`

This is only very rarely used -- seems silly to look it up on every page
request and to cache it config object.

9 years agoCRM-16373 - Config - Remove `smartyDir`, `pluginsDir`, and `sqlDir`
Tim Otten [Sat, 22 Aug 2015 10:21:14 +0000 (03:21 -0700)]
CRM-16373 - Config - Remove `smartyDir`, `pluginsDir`, and `sqlDir`

9 years agoCRM-16373 - Config - Remove `componentRegistry`
Tim Otten [Sat, 22 Aug 2015 10:10:04 +0000 (03:10 -0700)]
CRM-16373 - Config - Remove `componentRegistry`

9 years agoCRM-16373 - CRM_*_Config - Remove unused component config stuff
Tim Otten [Sat, 15 Aug 2015 11:53:59 +0000 (04:53 -0700)]
CRM-16373 - CRM_*_Config - Remove unused component config stuff

This code seems to generate default value for domain.config_backend.
However, the only one which defined any defaults was CiviMail, and that's
now moved over to `settings/`.

9 years agoCRM-16373 - settings - Declare mailer settings
Tim Otten [Sat, 15 Aug 2015 11:45:54 +0000 (04:45 -0700)]
CRM-16373 - settings - Declare mailer settings

Conflicts:
settings/Mailing.setting.php

9 years agoCRM-16373 - Config - Remove `enableComponentIDs`
Tim Otten [Sat, 22 Aug 2015 09:45:39 +0000 (02:45 -0700)]
CRM-16373 - Config - Remove `enableComponentIDs`

Note: `enableComponents` is heavily used, but `enableComponentIDs` is only
used once.  Generally, it's much easier to write tests based on names
(`enableComponents`) than IDs (`enableComponentIDs`).

9 years agoCRM-13244 - Civi\Core\Container - Allow hooks to modify container. Cache it.
Tim Otten [Thu, 23 Jul 2015 02:00:31 +0000 (19:00 -0700)]
CRM-13244 - Civi\Core\Container - Allow hooks to modify container. Cache it.

Conflicts:
composer.json

9 years agoCRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters. Fix...
Tim Otten [Sat, 22 Aug 2015 08:46:25 +0000 (01:46 -0700)]
CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters. Fix dedupe_email_default conflict.

For `dedupe_email_default`, the default values in `getItem()` and in
`settings/` disagree.  The default in `settings/` seems better IMHO.

9 years agoCRM-11743 - Civi::log() - Add short hand for logging
Tim Otten [Fri, 21 Aug 2015 06:05:18 +0000 (23:05 -0700)]
CRM-11743 - Civi::log() - Add short hand for logging

9 years agochecksum_timeout - Use consistent naming
Tim Otten [Thu, 20 Aug 2015 11:14:04 +0000 (04:14 -0700)]
checksum_timeout - Use consistent naming

This was a weird one:

 * The admin form rendered HTML element "checksumTimeout" but saved setting "checksum_timeout", which required workarounds.
 * The runtime code read the setting as "checksum_timeout".
 * The metadata defined setting "checksumTimeout". `prefetch` is enabled, but there's no `config_key` or `legacy_key`.

I believe this means that the runtime and admin form worked (because they
agreed that the name was "checksum_timeout"), but the Setting API would not
work (because it used "checksumTimeout").

This revision standardizes on "checksum_timeout" on the theory that
"checksum_timeout" was the actual value used at runtime. This means:

 * If you had configured the form and had it working correctly, it should
   still work correctly.
 * If you had a script to set "checksumTimeout" via API, then it wasn't
   working before, and it's still not working now.

9 years agoCRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters
Tim Otten [Fri, 21 Aug 2015 02:55:37 +0000 (19:55 -0700)]
CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters

9 years agoCRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters
Tim Otten [Thu, 20 Aug 2015 10:51:39 +0000 (03:51 -0700)]
CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters

9 years agoCRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters
Tim Otten [Thu, 20 Aug 2015 07:08:45 +0000 (00:08 -0700)]
CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters

9 years agoCivi::settings() - Add short hand for accessing domain settings
Tim Otten [Wed, 19 Aug 2015 13:27:43 +0000 (06:27 -0700)]
Civi::settings() - Add short hand for accessing domain settings

9 years ago\Civi::cache() - Add shorthand for accessing cache.
Tim Otten [Wed, 19 Aug 2015 13:26:57 +0000 (06:26 -0700)]
\Civi::cache() - Add shorthand for accessing cache.

9 years agoCRM_Utils_Cache_Interface - Add missing "implements"
Tim Otten [Wed, 19 Aug 2015 09:07:49 +0000 (02:07 -0700)]
CRM_Utils_Cache_Interface - Add missing "implements"

9 years ago\Civi - Use facade instead of Civi\Core\Container::singleton()
Tim Otten [Wed, 19 Aug 2015 06:19:27 +0000 (23:19 -0700)]
\Civi - Use facade instead of Civi\Core\Container::singleton()

9 years ago\Civi - Add facade accessing system services
Tim Otten [Wed, 19 Aug 2015 06:14:27 +0000 (23:14 -0700)]
\Civi - Add facade accessing system services

9 years agoMerge pull request #6753 from davecivicrm/CRM-17223
Dave Greenberg [Thu, 17 Sep 2015 17:13:33 +0000 (10:13 -0700)]
Merge pull request #6753 from davecivicrm/CRM-17223

CRM-17223 - fix for cvv2 failure.

9 years agoMerge pull request #6739 from jitendrapurohit/CRM-17205
Eileen McNaughton [Thu, 17 Sep 2015 03:09:55 +0000 (15:09 +1200)]
Merge pull request #6739 from jitendrapurohit/CRM-17205

CRM-17205 -- Fix for broken Free event registration

9 years agoMerge pull request #6728 from eileenmcnaughton/CRM-14232-add-setting-for-default...
Eileen McNaughton [Thu, 17 Sep 2015 02:16:54 +0000 (14:16 +1200)]
Merge pull request #6728 from eileenmcnaughton/CRM-14232-add-setting-for-default-lang

CRM-14232 add setting for default contact language.

9 years agoMerge pull request #6754 from colemanw/CRM-16555
colemanw [Wed, 16 Sep 2015 12:44:55 +0000 (08:44 -0400)]
Merge pull request #6754 from colemanw/CRM-16555

CRM-16555 - Fix double-processors on backend credit card event form

9 years agoCRM-14232 add setting for default contact language.
eileenmcnaugton [Fri, 11 Sep 2015 07:21:23 +0000 (19:21 +1200)]
CRM-14232 add setting for default contact language.

If a contact is created & the preferred_language is not set this
setting can be used to manipulate the default.

Tests!

Conflicts:
settings/Localization.setting.php

CRM-14232 adjust options for default contact language

To reflect bgm suggestions  - add current language & remove long-list of countries

CRM-14232 contact default language setting: don't use null as it has special handling

9 years agoCRM-16555 - Fix double-processors on backend credit card event form
Coleman Watts [Wed, 16 Sep 2015 01:46:46 +0000 (21:46 -0400)]
CRM-16555 - Fix double-processors on backend credit card event form

9 years agoComment fix
Coleman Watts [Tue, 15 Sep 2015 21:17:17 +0000 (17:17 -0400)]
Comment fix

9 years agoCRM-17223 - fix for cvv2 failure.
Dave Greenberg [Tue, 15 Sep 2015 19:04:59 +0000 (12:04 -0700)]
CRM-17223 - fix for cvv2 failure.

----------------------------------------
* CRM-17223: PayJunction CVV Transactions Fail
  https://issues.civicrm.org/jira/browse/CRM-17223

9 years agoMerge pull request #6738 from eileenmcnaughton/CRM-17075
colemanw [Tue, 15 Sep 2015 15:25:01 +0000 (11:25 -0400)]
Merge pull request #6738 from eileenmcnaughton/CRM-17075

CRM-17075 convert membership_type_id field to entity_reference field in search

9 years agoMerge pull request #6698 from jitendrapurohit/CRM-17169
Monish Deb [Tue, 15 Sep 2015 06:53:09 +0000 (12:23 +0530)]
Merge pull request #6698 from jitendrapurohit/CRM-17169

CRM-17169 - Inconsistent Soft Credit Reporting

9 years agoMerge pull request #6748 from davidjosephhayes/master
Kurund Jalmi [Tue, 15 Sep 2015 06:45:15 +0000 (12:15 +0530)]
Merge pull request #6748 from davidjosephhayes/master

Running the fetch_activities cli task stops with a fatal error when t…

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22
Kurund Jalmi [Tue, 15 Sep 2015 06:22:41 +0000 (11:52 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22

Conflicts:
CRM/Admin/Form/Setting/Localization.php
CRM/Event/BAO/Query.php
CRM/Export/BAO/Export.php
CRM/Financial/Page/AJAX.php
templates/CRM/Event/Form/Registration/Register.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php

9 years agoMerge pull request #6727 from eileenmcnaughton/comments
Eileen McNaughton [Tue, 15 Sep 2015 01:25:45 +0000 (13:25 +1200)]
Merge pull request #6727 from eileenmcnaughton/comments

comment fixes

9 years agoCRM-17075 - Open entityRef automatically
colemanw [Tue, 15 Sep 2015 01:24:45 +0000 (21:24 -0400)]
CRM-17075 - Open entityRef automatically

9 years agoMerge pull request #6741 from eileenmcnaughton/comments-formatting
Eileen McNaughton [Tue, 15 Sep 2015 01:22:15 +0000 (13:22 +1200)]
Merge pull request #6741 from eileenmcnaughton/comments-formatting

Comments formatting

9 years agoremove whitespace at end of line
David Hayes [Mon, 14 Sep 2015 21:11:39 +0000 (16:11 -0500)]
remove whitespace at end of line

9 years agofix formatting
David Hayes [Mon, 14 Sep 2015 20:29:50 +0000 (15:29 -0500)]
fix formatting

9 years agoMerge pull request #6745 from monishdeb/testFailures-master
Monish Deb [Mon, 14 Sep 2015 18:47:27 +0000 (00:17 +0530)]
Merge pull request #6745 from monishdeb/testFailures-master

CRM-16941 test failure fix

9 years agoMerge pull request #6735 from davecivicrm/CRM-17207
Dave Greenberg [Mon, 14 Sep 2015 16:48:04 +0000 (09:48 -0700)]
Merge pull request #6735 from davecivicrm/CRM-17207

CRM-17207 - Use mailto link on contact summary when outbound email is…

9 years agoMerge pull request #6744 from seamuslee001/CRM-16584
Dave Greenberg [Mon, 14 Sep 2015 16:32:09 +0000 (09:32 -0700)]
Merge pull request #6744 from seamuslee001/CRM-16584

CRM-16584 Remove line causing fatal error

9 years agoCRM-16941 test failure fix
monishdeb [Mon, 14 Sep 2015 11:51:39 +0000 (17:21 +0530)]
CRM-16941 test failure fix

----------------------------------------
* CRM-16941: Search Form and api.Get fixes for Contact
  https://issues.civicrm.org/jira/browse/CRM-16941

9 years agosql changes
jitendrapurohit [Mon, 14 Sep 2015 11:26:21 +0000 (16:56 +0530)]
sql changes

9 years agoCRM-17169 - Inconsistent Soft Credit Reporting
jitendrapurohit [Mon, 7 Sep 2015 12:43:50 +0000 (18:13 +0530)]
CRM-17169 - Inconsistent Soft Credit Reporting

9 years agoCRM-16584 Remove line causing fatal error
Seamus Lee [Mon, 14 Sep 2015 10:30:33 +0000 (10:30 +0000)]
CRM-16584 Remove line causing fatal error

9 years agoCRM-17075 switch membership_type_id to use entity reference
eileenmcnaugton [Mon, 14 Sep 2015 00:55:24 +0000 (12:55 +1200)]
CRM-17075 switch membership_type_id to use entity reference

This commit also adds generic handling for changing select fields to
entity reference fields with tests to ensure previous smart group
behaviour is respected by handling within the convertFormValues function.

This reverts advanced search domain filtering to ?4.4? 4.5? behaviour which does not assume only that domain's memberships should be searched on.

It make be that domain filtering + allowing an override makes most sense. I did think the pseudoconstant & getoptions use the same
mechanism, but it seems they don't. Really they should both allow the same behaviour & override

9 years agoCRM-17075 add test to lock in membership_type_id returned for all domains
eileenmcnaugton [Mon, 14 Sep 2015 00:49:12 +0000 (12:49 +1200)]
CRM-17075 add test to lock in membership_type_id returned for all domains

Until such time as a hook allows overriding of the domain assumptions we should not limit this by domain in advanced search
(which leverages the getoptions via use of an entity reference field

9 years agofixes to comments & remove unused vars
eileenmcnaugton [Mon, 14 Sep 2015 00:12:16 +0000 (12:12 +1200)]
fixes to comments & remove unused vars

comment fixes

9 years agominor test formatting tidy ups
eileenmcnaugton [Sun, 13 Sep 2015 23:47:49 +0000 (11:47 +1200)]
minor test formatting tidy ups

9 years agoMerge pull request #6697 from eileenmcnaughton/CRM-17116-custom-date-search-fields
Eileen McNaughton [Mon, 14 Sep 2015 08:59:26 +0000 (20:59 +1200)]
Merge pull request #6697 from eileenmcnaughton/CRM-17116-custom-date-search-fields

Crm 17116 custom date search fields

9 years agoCRM-17205 -- Fix for broken Free event registration
jitendrapurohit [Mon, 14 Sep 2015 07:20:20 +0000 (12:50 +0530)]
CRM-17205 -- Fix for broken Free event registration

9 years agoRunning the fetch_activities cli task stops with a fatal error when the incomming...
David Hayes [Sun, 13 Sep 2015 23:03:30 +0000 (18:03 -0500)]
Running the fetch_activities cli task stops with a fatal error when the incomming mail parser is unable to determine the ezcMailDeliveryStatus. The fetch_activities task will continue to download and attempt to parse the offending email, dying every time. This prevents other mails from being downloaded and parsed.

Error Message: "No clue about the ezcMailDeliveryStatus"

This patch catches that error, prints it, marks the offending email ignored, and allows activities processing to continue.

9 years agoMerge pull request #6734 from colemanw/CRM-17186
colemanw [Sun, 13 Sep 2015 19:09:34 +0000 (15:09 -0400)]
Merge pull request #6734 from colemanw/CRM-17186

CRM-17186 - Add ts tags & normalize strings for paypal button

9 years agoMerge pull request #6737 from eileenmcnaughton/test
Eileen McNaughton [Sun, 13 Sep 2015 14:56:59 +0000 (02:56 +1200)]
Merge pull request #6737 from eileenmcnaughton/test

fix date format in test

9 years agofix date format in test
eileenmcnaugton [Sun, 13 Sep 2015 14:56:18 +0000 (02:56 +1200)]
fix date format in test

9 years agoCRM-17207 - Use mailto link on contact summary when outbound email is disabled.
Dave Greenberg [Sat, 12 Sep 2015 00:24:26 +0000 (17:24 -0700)]
CRM-17207 - Use mailto link on contact summary when outbound email is disabled.

----------------------------------------
* CRM-17207: Use mailto link on contact summary emails if outbound email is disabled
  https://issues.civicrm.org/jira/browse/CRM-17207

9 years agoMerge pull request #6711 from pradpnayak/CRM-16904
Dave Greenberg [Fri, 11 Sep 2015 20:39:13 +0000 (13:39 -0700)]
Merge pull request #6711 from pradpnayak/CRM-16904

CRM-16904, updated 4th parameter to use base url

9 years agoMerge pull request #6638 from pradpnayak/CRM-16542-PaypalExp
Dave Greenberg [Fri, 11 Sep 2015 20:34:13 +0000 (13:34 -0700)]
Merge pull request #6638 from pradpnayak/CRM-16542-PaypalExp

--CRM-16542, fixed code for form rule for Paypal Express

9 years agoCRM-17186 - Add ts tags & normalize strings for paypal button
Coleman Watts [Fri, 11 Sep 2015 20:27:44 +0000 (16:27 -0400)]
CRM-17186 - Add ts tags & normalize strings for paypal button

9 years agoMerge pull request #6607 from guanhuan/update-event-templates
colemanw [Fri, 11 Sep 2015 20:12:04 +0000 (16:12 -0400)]
Merge pull request #6607 from guanhuan/update-event-templates

Add crm-public-form-item class to event forms

9 years agoMerge pull request #6731 from pradpnayak/CRM-17208
Dave Greenberg [Fri, 11 Sep 2015 19:19:42 +0000 (12:19 -0700)]
Merge pull request #6731 from pradpnayak/CRM-17208

CRM-17208, moved $params before pre hook so that it can be altered in…

9 years agoMerge pull request #6730 from monishdeb/migrate-onBehalf-master
Dave Greenberg [Fri, 11 Sep 2015 19:12:52 +0000 (12:12 -0700)]
Merge pull request #6730 from monishdeb/migrate-onBehalf-master

CRM-16941 fix - Search Form and api.Get fixes for Contact

9 years agoMerge pull request #6729 from jitendrapurohit/apitestfix
Monish Deb [Fri, 11 Sep 2015 18:51:28 +0000 (00:21 +0530)]
Merge pull request #6729 from jitendrapurohit/apitestfix

Test fix for CRM-13160