civicrm-core.git
10 years agoCRM-14798 - crmCaseType - Set default values of "Reference" fields
totten@civicrm.org [Thu, 26 Jun 2014 06:23:36 +0000 (23:23 -0700)]
CRM-14798 - crmCaseType - Set default values of "Reference" fields

10 years agoCRM-14798 - crmCaseType "Reference" fields - Disable for "Open Case". Require for...
totten@civicrm.org [Thu, 26 Jun 2014 06:22:19 +0000 (23:22 -0700)]
CRM-14798 - crmCaseType "Reference" fields - Disable for "Open Case". Require for others.

10 years agoMerge pull request #3564 from totten/master-idx-err
Tim Otten [Thu, 26 Jun 2014 01:04:06 +0000 (18:04 -0700)]
Merge pull request #3564 from totten/master-idx-err

CRM_Core_InnoDBIndexer - Fix (logged) drush error when doing clean install on MySQL <5.6.

10 years agoCRM_Core_InnoDBIndexer - Fix (logged) drush error when doing clean install on MySQL...
totten@civicrm.org [Thu, 26 Jun 2014 00:37:08 +0000 (17:37 -0700)]
CRM_Core_InnoDBIndexer - Fix (logged) drush error when doing clean install on MySQL <5.6.

10 years agoMerge pull request #3539 from totten/master-tx-api
Kurund Jalmi [Wed, 25 Jun 2014 21:00:50 +0000 (02:30 +0530)]
Merge pull request #3539 from totten/master-tx-api

CRM-14657, CRM-14486 - TransactionSubscriber - Respect $params['is_transactional']

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42
kurund [Wed, 25 Jun 2014 18:25:13 +0000 (23:55 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42

Conflicts:
CRM/Profile/Form/Edit.php
templates/CRM/Event/Form/Registration/Register.tpl
xml/schema/Core/MappingField.xml

10 years agoUpdate version to 4.5.alpha3
CiviCRM [Wed, 25 Jun 2014 15:16:06 +0000 (08:16 -0700)]
Update version to 4.5.alpha3

10 years agoMerge pull request #3510 from jitendrapurohit/CRM-12789
Monish Deb [Wed, 25 Jun 2014 14:34:56 +0000 (20:04 +0530)]
Merge pull request #3510 from jitendrapurohit/CRM-12789

CRM-12789

10 years agoMerge pull request #3563 from monishdeb/upgrade-fix
Monish Deb [Wed, 25 Jun 2014 13:35:38 +0000 (19:05 +0530)]
Merge pull request #3563 from monishdeb/upgrade-fix

4.5alpha2 upgrade fixes

10 years ago4.5alpha2 upgrade fixes
monishdeb [Wed, 25 Jun 2014 13:34:10 +0000 (19:04 +0530)]
4.5alpha2 upgrade fixes

10 years agoMerge pull request #3545 from jitendrapurohit/CRM-14567
Monish Deb [Wed, 25 Jun 2014 09:55:03 +0000 (15:25 +0530)]
Merge pull request #3545 from jitendrapurohit/CRM-14567

CRM-14567

10 years agoMerge pull request #3556 from divya-jose/HR-363
Yashodha Chaku [Wed, 25 Jun 2014 09:11:39 +0000 (14:41 +0530)]
Merge pull request #3556 from divya-jose/HR-363

HR-363 url modification to show report instance on dashboard

10 years agoMerge pull request #3544 from monishdeb/CRM-14830
Dave Greenberg [Tue, 24 Jun 2014 22:23:34 +0000 (15:23 -0700)]
Merge pull request #3544 from monishdeb/CRM-14830

CRM-14830 fix - Links to add CC and BCC are hidden in Send an Email task

10 years agoMerge pull request #3562 from davecivicrm/CRM-14905
Dave Greenberg [Tue, 24 Jun 2014 21:18:47 +0000 (14:18 -0700)]
Merge pull request #3562 from davecivicrm/CRM-14905

CRM-14905 - also fix contribution delete status.

10 years agoCRM-14905 - also fix contribution delete status.
Dave Greenberg [Tue, 24 Jun 2014 21:17:36 +0000 (14:17 -0700)]
CRM-14905 - also fix contribution delete status.

----------------------------------------
* CRM-14905:
  https://issues.civicrm.org/jira/browse/CRM-14905

10 years agoMerge pull request #3548 from wellebee/CRM-14905
Dave Greenberg [Tue, 24 Jun 2014 21:12:40 +0000 (14:12 -0700)]
Merge pull request #3548 from wellebee/CRM-14905

CRM-14905 - Fixed and made consistent a few calls to CRM_Core_Session::setStatus().

10 years agoMerge pull request #3560 from monishdeb/CRM-14893-fix
Monish Deb [Tue, 24 Jun 2014 18:26:41 +0000 (23:56 +0530)]
Merge pull request #3560 from monishdeb/CRM-14893-fix

CRM-14893 fix - "partials" directory should be included in tar-balls

10 years agoCRM-14893 fix - "partials" directory should be included in tar-balls
monishdeb [Tue, 24 Jun 2014 18:25:24 +0000 (23:55 +0530)]
CRM-14893 fix - "partials" directory should be included in tar-balls

https://issues.civicrm.org/jira/browse/CRM-14893

10 years agoMerge pull request #3559 from davecivicrm/CRM-14908
Dave Greenberg [Tue, 24 Jun 2014 17:58:07 +0000 (10:58 -0700)]
Merge pull request #3559 from davecivicrm/CRM-14908

CRM-14908 - Do not hide payment options just because a $0 price option i...

10 years agoCRM-14908 - Do not hide payment options just because a $0 price option is selected...
Dave Greenberg [Tue, 24 Jun 2014 17:56:49 +0000 (10:56 -0700)]
CRM-14908 - Do not hide payment options just because a $0 price option is selected if total is != $0.

----------------------------------------
* CRM-14908:
  https://issues.civicrm.org/jira/browse/CRM-14908

10 years agoCRM-12789
jitendrapurohit [Tue, 24 Jun 2014 13:07:20 +0000 (18:37 +0530)]
CRM-12789

10 years agoCRM-12789
CiviCRM [Tue, 17 Jun 2014 14:19:56 +0000 (19:49 +0530)]
CRM-12789

10 years agoHR-363 url modification to show report instance on dashboard
Divya Jose [Tue, 24 Jun 2014 10:15:00 +0000 (15:45 +0530)]
HR-363 url modification to show report instance on dashboard

10 years agoMerge pull request #3555 from totten/4.4-14856-regr
Tim Otten [Tue, 24 Jun 2014 03:35:44 +0000 (20:35 -0700)]
Merge pull request #3555 from totten/4.4-14856-regr

CRM-14856 - Fix regressions in Drupal-Profile integration

10 years agoCRM-14856 - CRM_Profile_Form - Restore behavior of add_to_group_id when there are...
Tim Otten [Tue, 24 Jun 2014 03:14:09 +0000 (20:14 -0700)]
CRM-14856 - CRM_Profile_Form - Restore behavior of add_to_group_id when there are multiple profiles

The behavior is to scan a combined list of UFFields, see if each UFField's
parent UFGroup has "add_to_group", and use it if found.  If multiple
UFGroups define "add_to_group", then the value of the last UFField wins.

I don't see this as good behavior -- just compatible behavior.

10 years agoCRM-14856 - Fix regression with Drupal-Profile integration
Tim Otten [Tue, 24 Jun 2014 02:59:06 +0000 (19:59 -0700)]
CRM-14856 - Fix regression with Drupal-Profile integration

10 years agoMerge pull request #3553 from eileenmcnaughton/4.4
Tim Otten [Tue, 24 Jun 2014 01:47:07 +0000 (18:47 -0700)]
Merge pull request #3553 from eileenmcnaughton/4.4

CRM-14903 fix REGEX to RLIKE

10 years agoCRM-14903 fix REGEX to RLIKE
Eileen McNaughton [Tue, 24 Jun 2014 01:44:28 +0000 (13:44 +1200)]
CRM-14903 fix REGEX to RLIKE

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12
Tim Otten [Tue, 24 Jun 2014 01:41:37 +0000 (18:41 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12

Conflicts:
distmaker/dists/drupal6_php5.sh
distmaker/dists/drupal_php5.sh
distmaker/dists/drupal_sk_php5.sh
distmaker/dists/joomla_php5.sh
distmaker/dists/l10n.sh
distmaker/dists/wordpress_php5.sh
xml/schema/Core/MappingField.xml

10 years agoMerge pull request #3540 from totten/4.4-distmaker
Tim Otten [Tue, 24 Jun 2014 01:23:01 +0000 (18:23 -0700)]
Merge pull request #3540 from totten/4.4-distmaker

distmaker cleanup

10 years agoMerge pull request #3543 from eileenmcnaughton/CRM-14850
Eileen McNaughton [Mon, 23 Jun 2014 23:26:07 +0000 (11:26 +1200)]
Merge pull request #3543 from eileenmcnaughton/CRM-14850

CRM-14850 - some settings transition to setting from config

10 years agoMerge pull request #3551 from davecivicrm/CRM-14894
Dave Greenberg [Mon, 23 Jun 2014 22:49:20 +0000 (15:49 -0700)]
Merge pull request #3551 from davecivicrm/CRM-14894

Crm 14894

10 years agoCRM-14894 - Modify line_item unique index in schema line_item.xml to fix fatal for...
Dave Greenberg [Mon, 23 Jun 2014 22:48:55 +0000 (15:48 -0700)]
CRM-14894 - Modify line_item unique index in schema line_item.xml to fix fatal for membership renewals.

----------------------------------------
* CRM-14894:
  https://issues.civicrm.org/jira/browse/CRM-14894

10 years agoCRM-14894 - Modify line_item unique index in schema line_item.xml to fix fatal for...
Dave Greenberg [Mon, 23 Jun 2014 22:47:28 +0000 (15:47 -0700)]
CRM-14894 - Modify line_item unique index in schema line_item.xml to fix fatal for membership renewals.

----------------------------------------
* CRM-14894:
  https://issues.civicrm.org/jira/browse/CRM-14894

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-14-48-29
Tim Otten [Mon, 23 Jun 2014 22:12:52 +0000 (15:12 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-14-48-29

Conflicts:
CRM/Core/Invoke.php
CRM/Profile/Form.php
CRM/Profile/Form/Edit.php
api/v3/utils.php

10 years agoMerge pull request #3546 from eileenmcnaughton/4.4
Dave Greenberg [Mon, 23 Jun 2014 21:50:57 +0000 (14:50 -0700)]
Merge pull request #3546 from eileenmcnaughton/4.4

CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed o...

10 years agoMerge pull request #3550 from davecivicrm/CRM-14897
Dave Greenberg [Mon, 23 Jun 2014 21:11:48 +0000 (14:11 -0700)]
Merge pull request #3550 from davecivicrm/CRM-14897

CRM-14897 - fix adminGroup for Cleanup Caches so it appears properly in ...

10 years agoCRM-14897 - fix adminGroup for Cleanup Caches so it appears properly in admin console.
Dave Greenberg [Mon, 23 Jun 2014 21:11:03 +0000 (14:11 -0700)]
CRM-14897 - fix adminGroup for Cleanup Caches so it appears properly in admin console.

----------------------------------------
* CRM-14897:
  https://issues.civicrm.org/jira/browse/CRM-14897

10 years agoMerge pull request #3549 from davecivicrm/CRM-14906
Dave Greenberg [Mon, 23 Jun 2014 20:31:35 +0000 (13:31 -0700)]
Merge pull request #3549 from davecivicrm/CRM-14906

CRM-14906 - notice fix on IS (NOT) EMPTY searches.

10 years agoCRM-14906 - notice fix on IS (NOT) EMPTY searches.
Dave Greenberg [Mon, 23 Jun 2014 20:30:50 +0000 (13:30 -0700)]
CRM-14906 - notice fix on IS (NOT) EMPTY searches.

----------------------------------------
* CRM-14906:
  https://issues.civicrm.org/jira/browse/CRM-14906

10 years agoFixed and made consistent a few calls to CRM_Core_Session::setStatus().
Keith Morgan [Mon, 23 Jun 2014 20:18:56 +0000 (15:18 -0500)]
Fixed and made consistent a few calls to CRM_Core_Session::setStatus().

10 years agoMerge pull request #3547 from lcdservices/CRM-14904
Dave Greenberg [Mon, 23 Jun 2014 19:23:22 +0000 (12:23 -0700)]
Merge pull request #3547 from lcdservices/CRM-14904

CRM-14904 retain subtype when saving org from contact dashboard form

10 years agoCRM-14904 retain subtype when saving org from contact dashboard form
Brian Shaughnessy [Mon, 23 Jun 2014 17:38:00 +0000 (13:38 -0400)]
CRM-14904 retain subtype when saving org from contact dashboard form

10 years agoCRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators
Eileen McNaughton [Mon, 23 Jun 2014 13:54:18 +0000 (01:54 +1200)]
CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators

10 years agoCRM-14567
jitendrapurohit [Mon, 23 Jun 2014 11:24:48 +0000 (16:54 +0530)]
CRM-14567

10 years agoCRM-14830 fix - Links to add CC and BCC are hidden in Send an Email task
monishdeb [Mon, 23 Jun 2014 10:36:38 +0000 (16:06 +0530)]
CRM-14830 fix - Links to add CC and BCC are hidden in Send an Email task

https://issues.civicrm.org/jira/browse/CRM-14830

10 years agoMerge pull request #3525 from yashodha/CRM-14670
Yashodha Chaku [Mon, 23 Jun 2014 06:34:38 +0000 (12:04 +0530)]
Merge pull request #3525 from yashodha/CRM-14670

CRM-14670: include target contact counter for mass mailings

10 years agoMerge pull request #3454 from kenwest/CRM-14815
Monish Deb [Mon, 23 Jun 2014 06:20:06 +0000 (11:50 +0530)]
Merge pull request #3454 from kenwest/CRM-14815

CRM-14815 subscriptionURL() doesn't add checksum when called from CLI

10 years agoCRM-14850 more copy & paste protection
Eileen McNaughton [Mon, 23 Jun 2014 01:10:48 +0000 (13:10 +1200)]
CRM-14850 more copy & paste protection

10 years agoCRM-14850 transform checksumTimeout to setting
Eileen McNaughton [Mon, 23 Jun 2014 01:05:38 +0000 (13:05 +1200)]
CRM-14850 transform checksumTimeout to setting

10 years agoCRM-14850 add comment as to why change was backed out
Eileen McNaughton [Mon, 23 Jun 2014 00:58:09 +0000 (12:58 +1200)]
CRM-14850 add comment as to why change was backed out

10 years agoRevert "CRM-14850 update use of ufLogging to not call ->is_drupal"
Eileen McNaughton [Mon, 23 Jun 2014 00:55:56 +0000 (12:55 +1200)]
Revert "CRM-14850 update use of ufLogging to not call ->is_drupal"

This reverts commit ac056893bd4a6816bc6c8b262cd0f30f87c5cad3.

10 years agoCRM-14850 remove config only - a grep shows this only being accessed via settings
Eileen McNaughton [Mon, 23 Jun 2014 00:39:21 +0000 (12:39 +1200)]
CRM-14850 remove config only - a grep shows this only being accessed via settings

10 years agoCRM-14850 copy & paste protection
Eileen McNaughton [Mon, 23 Jun 2014 00:18:56 +0000 (12:18 +1200)]
CRM-14850 copy & paste protection

10 years agoCRM-14850 secondDegreeRelPermissions seems to have been added as config_only - this...
Eileen McNaughton [Sun, 22 Jun 2014 23:45:31 +0000 (11:45 +1200)]
CRM-14850 secondDegreeRelPermissions seems to have been added as config_only - this is deprecated & should not happen. Removing references to try to discourage

10 years agoCRM-14850 add code comments to clarify that checking the CMS is not the recommended...
Eileen McNaughton [Sun, 22 Jun 2014 23:43:45 +0000 (11:43 +1200)]
CRM-14850 add code comments to clarify that checking the CMS is not the recommended approach

10 years agoCRM-14850 update use of ufLogging to not call ->is_drupal
Eileen McNaughton [Sun, 22 Jun 2014 23:39:37 +0000 (11:39 +1200)]
CRM-14850 update use of ufLogging to not call ->is_drupal

10 years agoCRM-14850 update tpl file to reflect change in field name for enable setting
Eileen McNaughton [Sun, 22 Jun 2014 23:37:23 +0000 (11:37 +1200)]
CRM-14850 update tpl file to reflect change in field name for enable setting

10 years agoCRM-14850 tidy up ufLogging by declaring the capability on the class
Eileen McNaughton [Sun, 22 Jun 2014 23:36:07 +0000 (11:36 +1200)]
CRM-14850 tidy up ufLogging by declaring the capability on the class

10 years agoCRM-14850 fix admin form to support change from config to setting
Eileen McNaughton [Sun, 22 Jun 2014 23:35:02 +0000 (11:35 +1200)]
CRM-14850 fix admin form to support change from config to setting

10 years agoCRM-14850 fix metadata on setting
Eileen McNaughton [Sun, 22 Jun 2014 23:33:13 +0000 (11:33 +1200)]
CRM-14850 fix metadata on setting

10 years agoCRM-14850 convert debug config items to settings
Eileen McNaughton [Sun, 22 Jun 2014 23:31:07 +0000 (11:31 +1200)]
CRM-14850 convert debug config items to settings

10 years agoMerge pull request #3541 from crusonweb/patch-2
Eileen McNaughton [Sun, 22 Jun 2014 22:28:27 +0000 (10:28 +1200)]
Merge pull request #3541 from crusonweb/patch-2

Update 4.5.alpha2.mysql.tpl

10 years agoUpdate 4.5.alpha2.mysql.tpl
Dan Cruson [Sun, 22 Jun 2014 22:21:33 +0000 (18:21 -0400)]
Update 4.5.alpha2.mysql.tpl

CRM-14843 Correct the update query to use name instead of id as id could be different in other installs.

10 years agodistmaker - Fix the *.info filter and apply it to all Drupal builds
totten@civicrm.org [Sat, 21 Jun 2014 13:53:42 +0000 (06:53 -0700)]
distmaker - Fix the *.info filter and apply it to all Drupal builds

10 years agodistmaker - Allow running individual builds without switching branches
totten@civicrm.org [Sat, 21 Jun 2014 13:22:52 +0000 (06:22 -0700)]
distmaker - Allow running individual builds without switching branches

One of the more annoying things with distmaker is that it switches all the
branches, which means that you need to commit everything before building.
This is necessary for building D6 & D7 in the same script, but makes it
harder to work on changes to builds.

With this patch, one can directly call the "dists/*.sh" files to trigger a
build, and it muck with git.  All the git checkouts are now specified in the
distmaker.sh

10 years agodistmaker - dm_install_wordpress - Should allow building on "wp-demo" (untested)
totten@civicrm.org [Sat, 21 Jun 2014 12:58:41 +0000 (05:58 -0700)]
distmaker - dm_install_wordpress - Should allow building on "wp-demo" (untested)

10 years agodistmaker - Demindfuckify joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 12:31:20 +0000 (05:31 -0700)]
distmaker - Demindfuckify joomla_php5.sh

10 years agodistmaker - Reduce noise in joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 12:05:11 +0000 (05:05 -0700)]
distmaker - Reduce noise in joomla_php5.sh

10 years agodistmaker - Extract function dm_reset_dirs(). Reduce noise.
totten@civicrm.org [Sat, 21 Jun 2014 11:58:14 +0000 (04:58 -0700)]
distmaker - Extract function dm_reset_dirs(). Reduce noise.

10 years agodistmaker - Simplify l10n.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:46:55 +0000 (04:46 -0700)]
distmaker - Simplify l10n.sh

10 years agodistmaker - Reduce noise in dists/*.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:42:10 +0000 (04:42 -0700)]
distmaker - Reduce noise in dists/*.sh

Conflicts:
distmaker/dists/l10n.sh

10 years agodistmaker - Extract function dm_install_wordpress()
totten@civicrm.org [Sat, 21 Jun 2014 11:36:29 +0000 (04:36 -0700)]
distmaker - Extract function dm_install_wordpress()

10 years agodistmaker - Reduce noise in dists/*.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:25:17 +0000 (04:25 -0700)]
distmaker - Reduce noise in dists/*.sh

10 years agodistmaker - Remove dead code. Shift comments.
totten@civicrm.org [Sat, 21 Jun 2014 11:15:00 +0000 (04:15 -0700)]
distmaker - Remove dead code. Shift comments.

10 years agodistmaker - Extract function dm_install_l10n()
totten@civicrm.org [Sat, 21 Jun 2014 11:10:55 +0000 (04:10 -0700)]
distmaker - Extract function dm_install_l10n()

10 years agodistmaker - DRY common.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:10:31 +0000 (04:10 -0700)]
distmaker - DRY common.sh

10 years agodistmaker - Extract function dm_install_joomla()
totten@civicrm.org [Sat, 21 Jun 2014 10:57:47 +0000 (03:57 -0700)]
distmaker - Extract function dm_install_joomla()

10 years agodistmaker - Extract function dm_generate_version()
totten@civicrm.org [Sat, 21 Jun 2014 10:41:52 +0000 (03:41 -0700)]
distmaker - Extract function dm_generate_version()

10 years agodistmaker - Extract functions dm_install_drupal() and dm_install_drupal_info()
totten@civicrm.org [Sat, 21 Jun 2014 10:33:10 +0000 (03:33 -0700)]
distmaker - Extract functions dm_install_drupal() and dm_install_drupal_info()

10 years agodistmaker - Extract function dm_install_packages()
totten@civicrm.org [Sat, 21 Jun 2014 10:23:37 +0000 (03:23 -0700)]
distmaker - Extract function dm_install_packages()

10 years agodistmaker - Extract function dm_install_core()
totten@civicrm.org [Sat, 21 Jun 2014 10:13:24 +0000 (03:13 -0700)]
distmaker - Extract function dm_install_core()

Conflicts:
distmaker/dists/drupal6_php5.sh
distmaker/dists/drupal_php5.sh
distmaker/dists/drupal_sk_php5.sh
distmaker/dists/joomla_php5.sh
distmaker/dists/wordpress_php5.sh

10 years agodistmaker - Auto-create DM_GENFILESDIR, DM_TARGETDIR, $DM_TMPDIR
totten@civicrm.org [Sat, 21 Jun 2014 09:26:45 +0000 (02:26 -0700)]
distmaker - Auto-create DM_GENFILESDIR, DM_TARGETDIR, $DM_TMPDIR

10 years agoCRM-14657, CRM-14486 - TransactionSubscriber - Respect $params['is_transactional']
Tim Otten [Sat, 21 Jun 2014 04:09:14 +0000 (21:09 -0700)]
CRM-14657, CRM-14486 - TransactionSubscriber - Respect $params['is_transactional']

10 years agoCRM_Utils_StringTest - Add test for strtobool
Tim Otten [Sat, 21 Jun 2014 04:08:50 +0000 (21:08 -0700)]
CRM_Utils_StringTest - Add test for strtobool

10 years agoCRM_Utils_StringTest - Autoformat
Tim Otten [Sat, 21 Jun 2014 04:02:14 +0000 (21:02 -0700)]
CRM_Utils_StringTest - Autoformat

10 years agoCRM_Utils_RuleTest - Autoformat
Tim Otten [Sat, 21 Jun 2014 03:50:02 +0000 (20:50 -0700)]
CRM_Utils_RuleTest - Autoformat

10 years agoMerge pull request #3536 from totten/4.4-12856
Tim Otten [Sat, 21 Jun 2014 01:41:46 +0000 (18:41 -0700)]
Merge pull request #3536 from totten/4.4-12856

CRM-12856 - Cleanup

10 years agoMerge pull request #3537 from davecivicrm/CRM-14861
Dave Greenberg [Sat, 21 Jun 2014 00:56:21 +0000 (17:56 -0700)]
Merge pull request #3537 from davecivicrm/CRM-14861

CRM-14861 - Add order by to getLineItems function so that line-items in ...

10 years agoCRM-14861 - Add order by to getLineItems function so that line-items in participant...
Dave Greenberg [Sat, 21 Jun 2014 00:55:10 +0000 (17:55 -0700)]
CRM-14861 - Add order by to getLineItems function so that line-items in participant, membership and contribution view pages as well as receipt emails are ordered by price field and price field value weight.

----------------------------------------
* CRM-14861:
  https://issues.civicrm.org/jira/browse/CRM-14861

10 years agoCRM-12856 - CRM_Core_Lock - Quieter logs
Tim Otten [Sat, 21 Jun 2014 00:19:17 +0000 (17:19 -0700)]
CRM-12856 - CRM_Core_Lock - Quieter logs

The log is very noisy (adding several log lines on most page requests). This
might be useful for debugging lock issues, but that's a developer task, so
we'll only do it if CIVICRM_LOCK_DEBUG is defined.

10 years agoCRM-12856 - CRM_Core_Lock - Autoformat
Tim Otten [Fri, 20 Jun 2014 23:57:04 +0000 (16:57 -0700)]
CRM-12856 - CRM_Core_Lock - Autoformat

10 years agoMerge pull request #3535 from davecivicrm/CRM-14896
Dave Greenberg [Fri, 20 Jun 2014 23:30:57 +0000 (16:30 -0700)]
Merge pull request #3535 from davecivicrm/CRM-14896

CRM-14896 - remove obsolete markup from AdditionalParticipant.tpl

10 years agoCRM-14896 - remove obsolete markup from AdditionalParticipant.tpl
Dave Greenberg [Fri, 20 Jun 2014 23:29:33 +0000 (16:29 -0700)]
CRM-14896 - remove obsolete markup from AdditionalParticipant.tpl

----------------------------------------
* CRM-14896:
  https://issues.civicrm.org/jira/browse/CRM-14896

10 years agoMerge pull request #3534 from davecivicrm/CRM-14895
Dave Greenberg [Fri, 20 Jun 2014 23:21:45 +0000 (16:21 -0700)]
Merge pull request #3534 from davecivicrm/CRM-14895

CRM-14895 - Do not load Schedule Reminders form in pop-up to prevent scr...

10 years agoCRM-14895 - Do not load Schedule Reminders form in pop-up to prevent scrollbar jumpin...
Dave Greenberg [Fri, 20 Jun 2014 23:20:45 +0000 (16:20 -0700)]
CRM-14895 - Do not load Schedule Reminders form in pop-up to prevent scrollbar jumping and weird behavior in token inserts.

----------------------------------------
* CRM-14895:
  https://issues.civicrm.org/jira/browse/CRM-14895

10 years agoMerge pull request #3531 from pradpnayak/CRM-14645
Dave Greenberg [Fri, 20 Jun 2014 21:41:23 +0000 (14:41 -0700)]
Merge pull request #3531 from pradpnayak/CRM-14645

-- CRM-14645, Added form rule to check if contact has Cancelled membersh...

10 years agoMerge pull request #3528 from eileenmcnaughton/api-sync
Eileen McNaughton [Fri, 20 Jun 2014 21:39:24 +0000 (09:39 +1200)]
Merge pull request #3528 from eileenmcnaughton/api-sync

syncronise 4.5 api behaviour with 4.4 to provide more consistent extensi...

10 years agoMerge pull request #3527 from davecivicrm/CRM-14734
Dave Greenberg [Fri, 20 Jun 2014 18:42:13 +0000 (11:42 -0700)]
Merge pull request #3527 from davecivicrm/CRM-14734

Crm 14734 - fix notices for anonymous contact viewing a mailing

10 years agoCRM-14734 - allow $details[0][0] for possible hook usage.
Dave Greenberg [Fri, 20 Jun 2014 18:39:52 +0000 (11:39 -0700)]
CRM-14734 - allow $details[0][0] for possible hook usage.

----------------------------------------
* CRM-14734:
  https://issues.civicrm.org/jira/browse/CRM-14734