civicrm-core.git
7 years agoMerge pull request #10768 from JMAConsulting/CRM-20947
Eileen McNaughton [Wed, 26 Jul 2017 11:53:56 +0000 (23:53 +1200)]
Merge pull request #10768 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error for deprecated function

7 years agoCRM-20947, fixed notice error for deprecated function
Pradeep Nayak [Tue, 25 Jul 2017 21:02:58 +0000 (02:32 +0530)]
CRM-20947, fixed notice error for deprecated function

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoCRM-20947, fixed notice error for deprecated function
Pradeep Nayak [Tue, 25 Jul 2017 21:00:04 +0000 (02:30 +0530)]
CRM-20947, fixed notice error for deprecated function

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoMerge pull request #10764 from civicrm/4.7.23-rc
Eileen McNaughton [Tue, 25 Jul 2017 20:46:34 +0000 (08:46 +1200)]
Merge pull request #10764 from civicrm/4.7.23-rc

4.7.23 rc

7 years agoMerge pull request #10750 from JMAConsulting/CRM-20947
Eileen McNaughton [Tue, 25 Jul 2017 20:36:09 +0000 (08:36 +1200)]
Merge pull request #10750 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error for deprecated function on new Bulk ent…

7 years agoMerge pull request #10762 from seanmadsen/premium-images
Eileen McNaughton [Tue, 25 Jul 2017 20:29:08 +0000 (08:29 +1200)]
Merge pull request #10762 from seanmadsen/premium-images

Fix placement of call to simplifyURL() function

7 years agoMerge pull request #10742 from eileenmcnaughton/dead
Eileen McNaughton [Tue, 25 Jul 2017 20:28:05 +0000 (08:28 +1200)]
Merge pull request #10742 from eileenmcnaughton/dead

CRM-20953 Importing contacts with deceased_date not setting is_deceased

7 years agoMerge pull request #10752 from seamuslee001/CRM-20961
Eileen McNaughton [Tue, 25 Jul 2017 20:16:16 +0000 (08:16 +1200)]
Merge pull request #10752 from seamuslee001/CRM-20961

CRM-20961 Fix issue where test on php7.1 was reporting that a non num…

7 years agoMerge pull request #10761 from monishdeb/CRM-20821_CRM-20938
Monish Deb [Tue, 25 Jul 2017 18:43:31 +0000 (00:13 +0530)]
Merge pull request #10761 from monishdeb/CRM-20821_CRM-20938

CRM-20821 & CRM-20938 : minor fix

7 years agoFix placement of call to simplifyURL() function
Sean Madsen [Tue, 25 Jul 2017 18:25:35 +0000 (12:25 -0600)]
Fix placement of call to simplifyURL() function

Before this commit, the URL simplification was performed within the
$params array used as the *default* values, so these values got
over-written by the submitted values with array_merge().

This is a follow-up to changes made in #10720 bb80d2f

7 years agoCRM-20821 & CRM-20938 : minor fix
deb.monish [Tue, 25 Jul 2017 18:02:46 +0000 (23:32 +0530)]
CRM-20821 & CRM-20938 : minor fix

7 years agoMerge pull request #10751 from seamuslee001/CRM-20960
Monish Deb [Tue, 25 Jul 2017 11:41:40 +0000 (17:11 +0530)]
Merge pull request #10751 from seamuslee001/CRM-20960

CRM-20960 Upgrade dompdf to 0.8 for php7.1 compatability

7 years agoMerge pull request #10747 from samuelsov/CRM-20954
Monish Deb [Tue, 25 Jul 2017 11:34:55 +0000 (17:04 +0530)]
Merge pull request #10747 from samuelsov/CRM-20954

CRM-20954 Fixing localized financial status problems

7 years agoCRM-20961 Fix issue where test on php7.1 was reporting that a non numeric was being...
Seamus Lee [Tue, 25 Jul 2017 07:29:40 +0000 (17:29 +1000)]
CRM-20961 Fix issue where test on php7.1 was reporting that a non numeric was being passed

7 years agoCRM-20960 Upgrade dompdf to 0.8 for php7.1 compatability
Seamus Lee [Tue, 25 Jul 2017 05:03:24 +0000 (15:03 +1000)]
CRM-20960 Upgrade dompdf to 0.8 for php7.1 compatability

7 years agoCRM-20947, fixed notice error for deprecated function on new Bulk entry Batch
Pradeep Nayak [Tue, 25 Jul 2017 02:52:45 +0000 (08:22 +0530)]
CRM-20947, fixed notice error for deprecated function on new Bulk entry Batch

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoMerge pull request #10720 from seanmadsen/CRM-20821_CRM-20938
colemanw [Tue, 25 Jul 2017 01:57:13 +0000 (21:57 -0400)]
Merge pull request #10720 from seanmadsen/CRM-20821_CRM-20938

CRM-20821 & CRM-20938 - fix bugs in managing premium product images

7 years agoMerge pull request #10723 from seamuslee001/CRM-20945
colemanw [Tue, 25 Jul 2017 01:52:27 +0000 (21:52 -0400)]
Merge pull request #10723 from seamuslee001/CRM-20945

CRM-20945 Remove underline on active pager step

7 years agoMerge pull request #10743 from JMAConsulting/CRM-20947
Eileen McNaughton [Tue, 25 Jul 2017 01:35:14 +0000 (13:35 +1200)]
Merge pull request #10743 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error for deprecated function on Bulk entry B…

7 years agoMake the button a bit more prominiant
Seamus Lee [Mon, 24 Jul 2017 21:50:44 +0000 (07:50 +1000)]
Make the button a bit more prominiant

7 years agoMerge pull request #10748 from seamuslee001/CRM-20943-2
Monish Deb [Mon, 24 Jul 2017 21:17:34 +0000 (02:47 +0530)]
Merge pull request #10748 from seamuslee001/CRM-20943-2

CRM-20943 Fix subsequent issue found by Monish and Steven

7 years agoCRM-20954 Initiate paid status id only once
Samuel Vanhove [Mon, 24 Jul 2017 21:17:26 +0000 (17:17 -0400)]
CRM-20954 Initiate paid status id only once

7 years agoCRM-20943 Fix subsequent issue found by Monish and Steven
Seamus Lee [Mon, 24 Jul 2017 21:14:07 +0000 (07:14 +1000)]
CRM-20943 Fix subsequent issue found by Monish and Steven

7 years agoMerge pull request #10686 from totten/master-sql
Monish Deb [Mon, 24 Jul 2017 20:52:45 +0000 (02:22 +0530)]
Merge pull request #10686 from totten/master-sql

CRM_Utils_SQL_Select - Allow fluent query execution

7 years agoCRM-20954 Fixing localized finantial status problems
Samuel Vanhove [Mon, 24 Jul 2017 20:19:57 +0000 (16:19 -0400)]
CRM-20954 Fixing localized finantial status problems

7 years agoMerge pull request #10653 from JKingsnorth/CRM-20863
Monish Deb [Mon, 24 Jul 2017 14:44:31 +0000 (20:14 +0530)]
Merge pull request #10653 from JKingsnorth/CRM-20863

CRM-20863 Improve report list ordering

7 years agoCRM-20947, fixed notice error for deprecated function on Bulk entry Batch listing...
Pradeep Nayak [Mon, 24 Jul 2017 13:59:02 +0000 (19:29 +0530)]
CRM-20947, fixed notice error for deprecated function on Bulk entry Batch listing page

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoCRM-20953 Importing contacts with deceased_date not setting is_deceased
eileen [Mon, 24 Jul 2017 13:25:01 +0000 (01:25 +1200)]
CRM-20953 Importing contacts with deceased_date not setting is_deceased

7 years agoadditional fix
deb.monish [Mon, 24 Jul 2017 12:09:52 +0000 (17:39 +0530)]
additional fix

7 years agoMerge pull request #10732 from JMAConsulting/CRM-20947
Eileen McNaughton [Mon, 24 Jul 2017 12:55:55 +0000 (00:55 +1200)]
Merge pull request #10732 from JMAConsulting/CRM-20947

CRM-20947, fixed warning for deprecated function while generating inv…

7 years agoMerge pull request #10739 from civicrm/4.7.23-rc
Eileen McNaughton [Mon, 24 Jul 2017 12:45:59 +0000 (00:45 +1200)]
Merge pull request #10739 from civicrm/4.7.23-rc

4.7.23 rc merge to master

7 years agoDon't use array dereferencing (for PHP 5.3 compat)
Sean Madsen [Fri, 21 Jul 2017 19:13:31 +0000 (13:13 -0600)]
Don't use array dereferencing (for PHP 5.3 compat)

7 years agoCRM-20938 - Maintain aspect ratio in resizeImage()
Sean Madsen [Fri, 21 Jul 2017 17:01:39 +0000 (11:01 -0600)]
CRM-20938 - Maintain aspect ratio in resizeImage()

Make CRM_Utils_File::resizeImage() preserve image aspect ratio by
default.

7 years agoCRM-20821 - Use smarter logic to adjust img URL
Sean Madsen [Fri, 21 Jul 2017 16:53:16 +0000 (10:53 -0600)]
CRM-20821 - Use smarter logic to adjust img URL

This change is the crux of CRM-20821.

Before this change, editing a premium product would automatically
break the image URL. After this change, premium products can be edited
while retaining the image URL. Functionality is preserved which changes
the URL to a local URL when possible.

This commit adds two new Utils functions (along with tests) to handle
the logic of changing a supplied URL to a local URL.

7 years agoCRM-20821 - Improve ManagePremiums formRule()
Sean Madsen [Fri, 21 Jul 2017 16:43:49 +0000 (10:43 -0600)]
CRM-20821 - Improve ManagePremiums formRule()

- Improve CRM_Contribute_Form_ManagePremiums::formRule()
- Require an image file, if "upload" is chosen
- Remove the commented-out code for a rule which required images to be
  within a certain size
- Minor refactoring to improve code clarity

7 years agoCRM-20821 - Refactor ManagePremiums postProcess()
Sean Madsen [Fri, 21 Jul 2017 16:41:37 +0000 (10:41 -0600)]
CRM-20821 - Refactor ManagePremiums postProcess()

- Refactor CRM_Contribute_Form_ManagePremiums::postProcess()
- No major changes to functionality
- Eliminate deeply nested code (addressing "FIXME" comment)
- Split code into multiple functions
- Add more comments

7 years agoCRM-20821 - Refactor PremiumProduct BAO add()
Sean Madsen [Fri, 21 Jul 2017 16:31:12 +0000 (10:31 -0600)]
CRM-20821 - Refactor PremiumProduct BAO add()

- Refactor CRM_Contribute_BAO_ManagePremiums::add
- Don't change any functionality
- Improve docblock
- Use a $defaults array

7 years agoCRM-20821 - Refactor resizeImage()
Sean Madsen [Fri, 21 Jul 2017 16:25:29 +0000 (10:25 -0600)]
CRM-20821 - Refactor resizeImage()

- Clean up CRM_Utils_File::resizeImage()
- No major functionality changes
- Better docblock
- Better error handling
- Better variable names

7 years agoCRM-20821 - Move resizeImage() to Utils class
Sean Madsen [Fri, 21 Jul 2017 16:15:58 +0000 (10:15 -0600)]
CRM-20821 - Move resizeImage() to Utils class

- Move resizeImage() from CRM_Contribute_Form_ManagePremiums to
  CRM_Utils_File
- Make it public static
- Don't change anything about how it works

7 years agoMerge pull request #10736 from eileenmcnaughton/reg
Monish Deb [Mon, 24 Jul 2017 11:37:47 +0000 (17:07 +0530)]
Merge pull request #10736 from eileenmcnaughton/reg

CRM-20950 Prt 2 Contact import mapping to wrong location type

7 years agoCRM-20950 Prt 2 Contact import mapping to wrong location type
eileen [Mon, 24 Jul 2017 10:19:00 +0000 (22:19 +1200)]
CRM-20950 Prt 2 Contact import mapping to wrong location type

7 years agoMerge pull request #10735 from eileenmcnaughton/reg
Eileen McNaughton [Mon, 24 Jul 2017 09:58:54 +0000 (21:58 +1200)]
Merge pull request #10735 from eileenmcnaughton/reg

CRM-20950 Contact import mapping to wrong location type

7 years agoCRM-20950 Contact import mapping to wrong location type
eileen [Mon, 24 Jul 2017 09:56:43 +0000 (21:56 +1200)]
CRM-20950 Contact import mapping to wrong location type

7 years agoCRM-20947, fixed warning for deprecated function while generating invoice
Pradeep Nayak [Mon, 24 Jul 2017 02:20:26 +0000 (07:50 +0530)]
CRM-20947, fixed warning for deprecated function while generating invoice

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoMerge pull request #10664 from jitendrapurohit/CRM-20875
Eileen McNaughton [Mon, 24 Jul 2017 00:27:31 +0000 (12:27 +1200)]
Merge pull request #10664 from jitendrapurohit/CRM-20875

CRM-20875 - Fix membership import to avoid notice error to be thrown

7 years agoMerge pull request #10727 from JMAConsulting/CRM-20947
Eileen McNaughton [Sun, 23 Jul 2017 22:36:33 +0000 (10:36 +1200)]
Merge pull request #10727 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error deprecated CRM_Core_OptionGroup::getLabel

7 years agoMerge pull request #10724 from seamuslee001/CRM-19941
Eileen McNaughton [Sun, 23 Jul 2017 22:25:21 +0000 (10:25 +1200)]
Merge pull request #10724 from seamuslee001/CRM-19941

CRM-19941 CRM-20943 Fix issue in PHP7.1 using  is non object mode in …

7 years agoCRM-20947, ficed notice error deprecated CRM_Core_OptionGroup::getLabel
Pradeep Nayak [Sun, 23 Jul 2017 10:15:45 +0000 (15:45 +0530)]
CRM-20947, ficed notice error deprecated CRM_Core_OptionGroup::getLabel

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoMerge pull request #10722 from seamuslee001/CRM-20944
Eileen McNaughton [Sun, 23 Jul 2017 04:51:19 +0000 (16:51 +1200)]
Merge pull request #10722 from seamuslee001/CRM-20944

CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in…

7 years agoCRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in ActivityLinks.php
Seamus Lee [Sat, 22 Jul 2017 22:18:55 +0000 (22:18 +0000)]
CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in ActivityLinks.php

7 years agoCRM-20945 Remove underline on active pager step
Seamus Lee [Sat, 22 Jul 2017 22:48:14 +0000 (22:48 +0000)]
CRM-20945 Remove underline on active pager step

7 years agoCRM-19941 CRM-20943 Fix issue in PHP7.1 using is non object mode in AtoZ Pager
Seamus Lee [Sat, 22 Jul 2017 22:43:24 +0000 (22:43 +0000)]
CRM-19941 CRM-20943 Fix issue in PHP7.1 using  is non object mode in AtoZ Pager

7 years agoMerge pull request #10715 from totten/master-jdebug
Tim Otten [Sat, 22 Jul 2017 18:04:10 +0000 (11:04 -0700)]
Merge pull request #10715 from totten/master-jdebug

CRM-19575 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG

7 years agoMerge pull request #10710 from jitendrapurohit/participantfix
Monish Deb [Fri, 21 Jul 2017 12:28:24 +0000 (17:58 +0530)]
Merge pull request #10710 from jitendrapurohit/participantfix

CRM-17236 - Custom dates fields displayed as (01/01/1970) in Events confirmation receipt

7 years agoFix participant mails
Jitendra Purohit [Thu, 20 Jul 2017 10:42:08 +0000 (16:12 +0530)]
Fix participant mails

7 years agoMerge pull request #10704 from eileenmcnaughton/admin_form
Monish Deb [Fri, 21 Jul 2017 11:02:34 +0000 (16:32 +0530)]
Merge pull request #10704 from eileenmcnaughton/admin_form

CRM-20923 refactor tpl to be based on metadata not hard-coding

7 years agostyle fix
deb.monish [Fri, 21 Jul 2017 09:15:34 +0000 (14:45 +0530)]
style fix

7 years agoMerge pull request #10676 from fuzionnz/CRM-20884-remove_net_smtp_readme_symlink
Eileen McNaughton [Fri, 21 Jul 2017 09:01:26 +0000 (21:01 +1200)]
Merge pull request #10676 from fuzionnz/CRM-20884-remove_net_smtp_readme_symlink

Remove broken symlink from vendor/pear/net_smtp

7 years agoMerge pull request #10668 from jmcclelland/CRM-20876
Eileen McNaughton [Fri, 21 Jul 2017 08:59:42 +0000 (20:59 +1200)]
Merge pull request #10668 from jmcclelland/CRM-20876

CRM-20876 - ensure honor block variable is passed to template

7 years agoMerge pull request #10713 from mfb/CRM-20931
Eileen McNaughton [Fri, 21 Jul 2017 08:52:56 +0000 (20:52 +1200)]
Merge pull request #10713 from mfb/CRM-20931

CRM-20931 - Allow contact custom fields to be added to Contribution Detail report

7 years agoMerge pull request #10714 from totten/master-gitignore
Eileen McNaughton [Fri, 21 Jul 2017 02:56:31 +0000 (14:56 +1200)]
Merge pull request #10714 from totten/master-gitignore

(NFC) gitignore - Remove obsolete entries

7 years agoCRM-20932 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG
Tim Otten [Fri, 21 Jul 2017 02:53:38 +0000 (19:53 -0700)]
CRM-20932 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG

Background
==========

When running `cv en <extname>` on Joomla, there are repeated warnings, "Use
of undefined constant JDEBUG", and each includes a backtrace.  This is hard
to read.

The bug appears to affect backend scripts; it's discussed with a solution in:

https://github.com/joomla/joomla-cms/issues/11512#issuecomment-244937966

Before
======

`CRM_Utils_System_Joomla::loadBootStrap()` loads various config files.
However, these may or may not set `JDEBUG`.

After
=====

`CRM_Utils_System_Joomla::loadBootStrap()` defensively sets `JDEBUG` if no
other part of the bootstrap has done so.

7 years agoMerge pull request #10711 from colemanw/CRM-20929
Eileen McNaughton [Fri, 21 Jul 2017 02:46:13 +0000 (14:46 +1200)]
Merge pull request #10711 from colemanw/CRM-20929

CRM-20929 - Convey css classes to main page title from Angular

7 years agoCRM-20929 - Simply add crm-page-title class
Coleman Watts [Fri, 21 Jul 2017 01:43:58 +0000 (21:43 -0400)]
CRM-20929 - Simply add crm-page-title class

7 years ago(NFC) gitignore - Remove obsolete entries
Tim Otten [Fri, 21 Jul 2017 00:59:40 +0000 (17:59 -0700)]
(NFC) gitignore - Remove obsolete entries

The `packages` directory is actually a separate git repo, with its own copy
of `.gitignore`.

These rules have no effect in there.

The `packages` directory is ignored as a whole with one entry in
`gitignore`.

7 years agoCRM-20923 refactor tpl to be based on metadata not hard-coding
eileen [Thu, 20 Jul 2017 01:02:15 +0000 (13:02 +1200)]
CRM-20923 refactor tpl to be based on metadata not hard-coding

Change-Id: Iee2a7aa9fa93c5d20b95f3dbc45ec2f3cf7a216b

7 years agoCRM-20931 - Allow contact custom fields to be added to Contribution Detail report
mark burdett [Thu, 20 Jul 2017 20:32:50 +0000 (13:32 -0700)]
CRM-20931 - Allow contact custom fields to be added to Contribution Detail report

As a bonus also add nickname column to the report :)

7 years agoMerge pull request #10430 from JMAConsulting/IIDA-144
colemanw [Thu, 20 Jul 2017 16:38:17 +0000 (12:38 -0400)]
Merge pull request #10430 from JMAConsulting/IIDA-144

CRM-20648, fixed validation to allow participant to register if their…

7 years agoMerge pull request #10706 from totten/master-regen-finact
colemanw [Thu, 20 Jul 2017 14:23:19 +0000 (10:23 -0400)]
Merge pull request #10706 from totten/master-regen-finact

regen.sh - Fix stale function call in sql/GenerateData.php

7 years agoCRM-20929 - Convey css classes to main page title from Angular
Coleman Watts [Thu, 20 Jul 2017 13:58:36 +0000 (09:58 -0400)]
CRM-20929 - Convey css classes to main page title from Angular

7 years agoCRM-20648 Applied check exclusively to cancelled status
Edsel [Thu, 20 Jul 2017 12:59:42 +0000 (18:29 +0530)]
CRM-20648 Applied check exclusively to cancelled status

----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
  https://issues.civicrm.org/jira/browse/CRM-20648

7 years agoCRM-20648, fixed validation to allow participant to register if their previous regist...
Pradeep Nayak [Mon, 29 May 2017 08:48:19 +0000 (14:18 +0530)]
CRM-20648, fixed validation to allow participant to register if their previous registration is cancelled

----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
  https://issues.civicrm.org/jira/browse/CRM-20648

7 years agoregen.sh - Fix stale function call in sql/GenerateData.php
Tim Otten [Thu, 20 Jul 2017 05:33:47 +0000 (22:33 -0700)]
regen.sh - Fix stale function call in sql/GenerateData.php

In [#10463](https://github.com/civicrm/civicrm-core/pull/10463), the
function signature of `getInstrumentFinancialAccount()` changed slightly -- in that
the parameter became mandatory.

Grepping for other calls to `getInstrumentFinancialAccount()` shows that one of the unit-tests
works with example input `4`, so this does the same.

Before
======

Running "regen.sh" fails -- because `getInstrumentFinancialAccount` is called without a parameter.

After
=====

Running "regen.sh" completes -- because `getInstrumentFinancialAccount` is called with `4`.

Acceptance Prompts
==================

 * The example data produced by `regen.sh` should contain suitable/similar values for financial records.
 * Determine whether `4` is a suitable value.

7 years agoMerge pull request #10682 from JMAConsulting/CRM-20890
colemanw [Thu, 20 Jul 2017 03:06:27 +0000 (23:06 -0400)]
Merge pull request #10682 from JMAConsulting/CRM-20890

CRM-20890: Move recieve_date between Contribution status and Revenue Recognition date in Contribution backoffice form

7 years agoMerge pull request #10660 from seamuslee001/CRM-20860-processor
Eileen McNaughton [Thu, 20 Jul 2017 01:49:45 +0000 (13:49 +1200)]
Merge pull request #10660 from seamuslee001/CRM-20860-processor

CRM-20860 Allow payment processor field to use the Password QuickForm Field type

7 years agoCRM_Utils_SQL_SelectTest - Split into smaller test functions
Tim Otten [Thu, 20 Jul 2017 00:38:08 +0000 (17:38 -0700)]
CRM_Utils_SQL_SelectTest - Split into smaller test functions

7 years agoCRM_Utils_SQL_Select::execute() - Improve docblock
Tim Otten [Thu, 20 Jul 2017 00:34:15 +0000 (17:34 -0700)]
CRM_Utils_SQL_Select::execute() - Improve docblock

7 years agoSet version to 4.7.24
CiviCRM [Wed, 19 Jul 2017 16:44:50 +0000 (16:44 +0000)]
Set version to 4.7.24

7 years agoMerge pull request #10683 from jitendrapurohit/CRM-20770
Monish Deb [Wed, 19 Jul 2017 13:00:26 +0000 (18:30 +0530)]
Merge pull request #10683 from jitendrapurohit/CRM-20770

CRM-20891 : Separate membership pay later contribution sets the membe…

7 years agoadd test
Jitendra Purohit [Wed, 19 Jul 2017 11:57:11 +0000 (17:27 +0530)]
add test

7 years agoMerge pull request #10697 from seamuslee001/4.7.22-rc
Eileen McNaughton [Wed, 19 Jul 2017 00:23:15 +0000 (12:23 +1200)]
Merge pull request #10697 from seamuslee001/4.7.22-rc

4.7.22 rc

7 years agoAdd 4.7.22 to release-notes.md
Tim Otten [Wed, 12 Jul 2017 05:03:00 +0000 (22:03 -0700)]
Add 4.7.22 to release-notes.md

7 years agoAdd release notes for 4.7.22
Tim Otten [Wed, 12 Jul 2017 04:29:05 +0000 (21:29 -0700)]
Add release notes for 4.7.22

7 years agoCRM-20600 - Upgrader - Display warning if asset-caching is likely to fail
Tim Otten [Wed, 12 Jul 2017 02:51:41 +0000 (19:51 -0700)]
CRM-20600 - Upgrader - Display warning if asset-caching is likely to fail

After releasing v4.7.21, there were several inquiries about sites in which
Angular pages failed to load.  In cases diagnosed so far, this has been a
result of inconsistent configurations or overzealous HTTP restrictions
applied to the `imageUploadDir`.

Ordinarily, we would address this kind of thing with a status check.
Unfortunately, the problem breaks that "Status" page...  so we have to
display a bit sooner.

7 years agoMerge pull request #10690 from JMAConsulting/CRM-20902
colemanw [Tue, 18 Jul 2017 14:48:55 +0000 (10:48 -0400)]
Merge pull request #10690 from JMAConsulting/CRM-20902

[ready for review] CRM-20902 Fixed mailing opened query count for pie chart

7 years agoMerge pull request #10689 from JMAConsulting/CRM-20901
colemanw [Tue, 18 Jul 2017 13:13:37 +0000 (09:13 -0400)]
Merge pull request #10689 from JMAConsulting/CRM-20901

[ready for core team to review]CRM-20901, Added submit credit card membership link

7 years agoMerge pull request #10652 from jitendrapurohit/CRM-19017
Monish Deb [Tue, 18 Jul 2017 11:58:30 +0000 (17:28 +0530)]
Merge pull request #10652 from jitendrapurohit/CRM-19017

CRM-19017 : Load default params for fragment query object and fix db error.

7 years agoCRM-20902 Fixed mailing opened query count for pie chart
Edsel [Tue, 18 Jul 2017 06:40:20 +0000 (12:10 +0530)]
CRM-20902 Fixed mailing opened query count for pie chart

----------------------------------------
* CRM-20902: DB Syntax error on Mailing Opened Report
  https://issues.civicrm.org/jira/browse/CRM-20902

7 years agoCRM-20901, Added submit credit card membership link
Pradeep Nayak [Mon, 17 Jul 2017 17:43:38 +0000 (23:13 +0530)]
CRM-20901, Added submit credit card membership link

----------------------------------------
* CRM-20901: Add submit credit card membership link on membership form
  https://issues.civicrm.org/jira/browse/CRM-20901

7 years agoCRM_Utils_SQL_Select - Allow fluent query execution
Tim Otten [Mon, 17 Jul 2017 23:17:04 +0000 (16:17 -0700)]
CRM_Utils_SQL_Select - Allow fluent query execution

When I first wrote `CRM_Utils_SQL_Select`, I was a bit dogmatic about
loose-coupling and wanted the class to be entirely independent of the SQL
runtime. But this is a bit annoying in usage and training.

Before
======

To build and execute query, you had to pass the rendered SQL to the execute
function, eg

```php
$select = CRM_Utils_SQL_Select::from('mytable')
  ->select('...')
$dao = CRM_Core_DAO::executeQuery($select->toSQL());
while ($dao->fetch()) { ... }
```

After
=====

You can use more fluent style:

```php
$dao = CRM_Utils_SQL_Select::from('mytable')
  ->select('...')
  ->execute();
while ($dao->fetch()) { ... }
```

And you can chain with other DAO functions like `fetchAll()` or
`fetchValue()`.

```php
$records = CRM_Utils_SQL_Select::from('mytable')
  ->select('...')
  ->execute()
  ->fetchAll();
```

7 years agoMerge pull request #10649 from seamuslee001/CRM-20860
Eileen McNaughton [Mon, 17 Jul 2017 20:15:30 +0000 (08:15 +1200)]
Merge pull request #10649 from seamuslee001/CRM-20860

CRM-20860 Add in ability to create field type of password from metadata

7 years agoCRM-20770 : Separate membership pay later contribution sets the membership to Completed
Jitendra Purohit [Mon, 17 Jul 2017 13:57:47 +0000 (19:27 +0530)]
CRM-20770 : Separate membership pay later contribution sets the membership to Completed

7 years agoCRM-20890: Move recieve_date between Contribution status and Revenue Recognition...
deb.monish [Mon, 17 Jul 2017 13:06:45 +0000 (18:36 +0530)]
CRM-20890: Move recieve_date between Contribution status and Revenue Recognition date in Contribution backoffice form

7 years agoMerge pull request #10627 from eileenmcnaughton/sett
Monish Deb [Mon, 17 Jul 2017 11:26:19 +0000 (16:56 +0530)]
Merge pull request #10627 from eileenmcnaughton/sett

CRM-20837 Make setting bug more explicit

7 years agoMerge pull request #10662 from seamuslee001/CRM-20873
Monish Deb [Mon, 17 Jul 2017 11:06:48 +0000 (16:36 +0530)]
Merge pull request #10662 from seamuslee001/CRM-20873

CRM-20873 : Fix issue where getTree try to load is_public field before it is added in upgrade

7 years agoMinor fix
Seamus Lee [Fri, 14 Jul 2017 08:23:26 +0000 (18:23 +1000)]
Minor fix

7 years agoCRM-20873 FIx issue where getTree trys to load is_public field before it is added...
Seamus Lee [Fri, 14 Jul 2017 08:21:22 +0000 (18:21 +1000)]
CRM-20873 FIx issue where getTree trys to load is_public field before it is added in upgrade

7 years agoMerge pull request #10537 from PalanteJon/20754
Monish Deb [Mon, 17 Jul 2017 08:23:59 +0000 (13:53 +0530)]
Merge pull request #10537 from PalanteJon/20754

CRM-20754 - Clear memory leak in CSV CLI import

7 years agoUse the freeResult DAO method
Jon goldberg [Mon, 17 Jul 2017 04:50:42 +0000 (00:50 -0400)]
Use the freeResult DAO method

7 years agoRemove vendor/pear/net_smtp/README.rst also.
Chris Burgess [Sun, 16 Jul 2017 22:21:13 +0000 (10:21 +1200)]
Remove vendor/pear/net_smtp/README.rst also.

CRM-20884