civicrm-core.git
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 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 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 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

7 years agoMerge pull request #10675 from JMAConsulting/CRM-20848
Eileen McNaughton [Sun, 16 Jul 2017 21:49:35 +0000 (09:49 +1200)]
Merge pull request #10675 from JMAConsulting/CRM-20848

CRM-20848: Upgrade to 4.7.19 sets price_field to inactive if default Financial Types are disabled

7 years agoCRM-20848: Upgrade to 4.7.19 sets price_field to inactive if default Financial Types...
deb.monish [Sun, 16 Jul 2017 18:48:32 +0000 (00:18 +0530)]
CRM-20848: Upgrade to 4.7.19 sets price_field to inactive if default Financial Types are disabled

7 years agoMerge pull request #10599 from eileenmcnaughton/api_no_id
Eileen McNaughton [Sat, 15 Jul 2017 20:42:57 +0000 (08:42 +1200)]
Merge pull request #10599 from eileenmcnaughton/api_no_id

CRM-20847 Support custom api with composite primary keys

7 years agoCRM-19017 : Load default params for fragment query object.
Jitendra Purohit [Thu, 13 Jul 2017 14:30:27 +0000 (20:00 +0530)]
CRM-19017 : Load default params for fragment query object.

7 years agoMerge pull request #10669 from seamuslee001/clear_all_messages
Eileen McNaughton [Sat, 15 Jul 2017 04:54:43 +0000 (16:54 +1200)]
Merge pull request #10669 from seamuslee001/clear_all_messages

Clear all Messages when running clearMessages by default

7 years agoClear all Messages when running clearMessages by default
Seamus Lee [Sat, 15 Jul 2017 00:42:17 +0000 (10:42 +1000)]
Clear all Messages when running clearMessages by default

7 years agoMerge pull request #10667 from mlutfy/master-crm20803-1
Tim Otten [Fri, 14 Jul 2017 20:05:11 +0000 (13:05 -0700)]
Merge pull request #10667 from mlutfy/master-crm20803-1

CRM-20803: Enable Farsi/Persian, Serbian and Ukranian.

7 years agoCRM-20876 - ensure honor block variable is passed to template
Jamie McClelland [Fri, 14 Jul 2017 19:14:14 +0000 (15:14 -0400)]
CRM-20876 - ensure honor block variable is passed to template

Otherwise, it's not on the receipt.

7 years agoCRM-20803: Enable Farsi/Persian, Serbian and Ukranian.
Mathieu Lutfy [Fri, 14 Jul 2017 16:58:01 +0000 (12:58 -0400)]
CRM-20803: Enable Farsi/Persian, Serbian and Ukranian.

7 years agoMerge pull request #10463 from JMAConsulting/CRM-20677
colemanw [Fri, 14 Jul 2017 15:46:13 +0000 (11:46 -0400)]
Merge pull request #10463 from JMAConsulting/CRM-20677

[ready for core team review] CRM-20677, used generalized function to retrieve financial account id

7 years agoMerge pull request #10646 from JMAConsulting/deferred
colemanw [Fri, 14 Jul 2017 15:43:18 +0000 (11:43 -0400)]
Merge pull request #10646 from JMAConsulting/deferred

[ready for core team review] CRM-20857: fixed Deferred Report for sql_mode=only_full_group_by

7 years agoMerge pull request #10659 from totten/master-crmuiselect
colemanw [Fri, 14 Jul 2017 05:50:34 +0000 (01:50 -0400)]
Merge pull request #10659 from totten/master-crmuiselect

CRM-20871 - crmUiSelect - UI should stay in sync with model

7 years agoAllow payment processor field to use the Password QuickForm Field type
Seamus Lee [Thu, 13 Jul 2017 02:39:41 +0000 (02:39 +0000)]
Allow payment processor field to use the Password QuickForm Field type

7 years agoCRM-20871 - crmUiSelect - UI should stay in sync with model
Tim Otten [Fri, 14 Jul 2017 02:46:58 +0000 (19:46 -0700)]
CRM-20871 - crmUiSelect - UI should stay in sync with model

The `crmUiSelect` defines the function `$render()` -- whenever the model
changes, it should update execute `$render()` to update the UI.  But it doesn't.

This issue is discussed more in https://stackoverflow.com/questions/21084088/why-ngmodels-render-is-not-called-when-the-model-changes-in-angularjs

== Before ==

The `$render()` function for directive `crm-ui-select` is not called because the `select`
directive overrides it.

== After ==

The `$render()` function for directive `crm-ui-select` is called, even if
used on a `select` element.

== Acceptance Criteria ==

 * The test page in https://github.com/totten/org.example.angpage (`civicrm/a/#/play`)
   keeps elements synchronized.
 * Existing screens which use `crm-ui-select` continue to work.

7 years agoMerge pull request #10618 from colemanw/CRM-20830
colemanw [Thu, 13 Jul 2017 22:04:06 +0000 (18:04 -0400)]
Merge pull request #10618 from colemanw/CRM-20830

CRM-20830 - Improve handling of overdue activities

7 years agoMerge pull request #10656 from JMAConsulting/fatalerror
colemanw [Thu, 13 Jul 2017 21:57:30 +0000 (17:57 -0400)]
Merge pull request #10656 from JMAConsulting/fatalerror

 [ready for core team to review]CRM-20867, fixed fatal error

7 years agoCRM-20867, fixed fatal error
Pradeep Nayak [Thu, 13 Jul 2017 18:55:28 +0000 (00:25 +0530)]
CRM-20867, fixed fatal error

----------------------------------------
* CRM-20867: Class not found
  https://issues.civicrm.org/jira/browse/CRM-20867

7 years agoCode cleanup
Coleman Watts [Thu, 13 Jul 2017 14:49:30 +0000 (10:49 -0400)]
Code cleanup

7 years agoCRM-20830 - Trinary activity status types
Coleman Watts [Fri, 7 Jul 2017 18:40:42 +0000 (14:40 -0400)]
CRM-20830 - Trinary activity status types

7 years agoCRM-20830 - Improve handling of overdue activities
Coleman Watts [Fri, 7 Jul 2017 02:33:06 +0000 (22:33 -0400)]
CRM-20830 - Improve handling of overdue activities

7 years agoMerge pull request #10586 from colemanw/CRM-20794
colemanw [Thu, 13 Jul 2017 14:11:53 +0000 (10:11 -0400)]
Merge pull request #10586 from colemanw/CRM-20794

CRM-20794 - Colors for case status

7 years agoCRM-20860 Add in ability to create field type of password from metadata
Seamus Lee [Thu, 13 Jul 2017 02:34:57 +0000 (02:34 +0000)]
CRM-20860 Add in ability to create field type of password from metadata

7 years agoCRM-20857, fixed report for sql_mode=only_full_group_by
Pradeep Nayak [Wed, 12 Jul 2017 14:03:52 +0000 (19:33 +0530)]
CRM-20857, fixed report for sql_mode=only_full_group_by

----------------------------------------
* CRM-20857: Deferred Revenue report -  DB Error: unknown error
  https://issues.civicrm.org/jira/browse/CRM-20857

fixed style

7 years agoMerge pull request #9784 from monishdeb/CRM-19702
colemanw [Tue, 11 Jul 2017 22:08:18 +0000 (18:08 -0400)]
Merge pull request #9784 from monishdeb/CRM-19702

CRM-19702: Fatal error when merging contact records with custom file fields

7 years agoMerge pull request #10637 from mickadoo/CRM-20849-allow-duplicate-psr4-prefix
Tim Otten [Tue, 11 Jul 2017 21:57:04 +0000 (14:57 -0700)]
Merge pull request #10637 from mickadoo/CRM-20849-allow-duplicate-psr4-prefix

CRM-20849: Allow duplicate PSR-4 prefixes

7 years agoCRM-20851 php notice (#10639)
Matthew Wire [Tue, 11 Jul 2017 20:45:20 +0000 (21:45 +0100)]
CRM-20851 php notice (#10639)

 Fix php notice when is_primary is not set

7 years agoCRM-19702: Fatal error when merging contact records with custom file fields
deb.monish [Sat, 4 Feb 2017 06:11:24 +0000 (11:41 +0530)]
CRM-19702: Fatal error when merging contact records with custom file fields

7 years agoMerge pull request #10638 from mattwire/CRM-20772_statusbounce
Eileen McNaughton [Tue, 11 Jul 2017 20:23:24 +0000 (08:23 +1200)]
Merge pull request #10638 from mattwire/CRM-20772_statusbounce

CRM-20850 Replace fatal with statusBounce

7 years agoMerge pull request #10604 from jitendrapurohit/CRM-20809
Eileen McNaughton [Tue, 11 Jul 2017 20:19:57 +0000 (08:19 +1200)]
Merge pull request #10604 from jitendrapurohit/CRM-20809

CRM-20809 : Modify extension cache file to get created in uploads directory

7 years agoMerge pull request #10642 from civicrm/revert-10370-CRM-20321
colemanw [Tue, 11 Jul 2017 17:01:47 +0000 (13:01 -0400)]
Merge pull request #10642 from civicrm/revert-10370-CRM-20321

Revert "CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity"

7 years agoRevert "CRM-20321, CRM-20652 : Changing membership type should change related contrib...
colemanw [Tue, 11 Jul 2017 16:33:04 +0000 (12:33 -0400)]
Revert "CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity"

7 years agomodify fix to place cache dir in upload dir
Jitendra Purohit [Thu, 6 Jul 2017 10:37:39 +0000 (16:07 +0530)]
modify fix to place cache dir in upload dir

7 years agotest failure fixes
deb.monish [Tue, 4 Jul 2017 11:38:00 +0000 (17:08 +0530)]
test failure fixes

7 years agoCRM-20677, updated getInstrumentFinancialAccount() to use api
Pradeep Nayak [Sat, 3 Jun 2017 01:12:43 +0000 (06:42 +0530)]
CRM-20677, updated getInstrumentFinancialAccount() to use api

----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
  https://issues.civicrm.org/jira/browse/CRM-20677

CRM-20677. more changes

----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
  https://issues.civicrm.org/jira/browse/CRM-20677

7 years agoCRM-20677, used generalized function to retrieve financial account id
Pradeep Nayak [Sat, 3 Jun 2017 01:01:11 +0000 (06:31 +0530)]
CRM-20677, used generalized function to retrieve financial account id

----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
  https://issues.civicrm.org/jira/browse/CRM-20677

7 years agoMerge pull request #10431 from JMAConsulting/NoticeFixes-1
Monish Deb [Tue, 11 Jul 2017 11:52:13 +0000 (17:22 +0530)]
Merge pull request #10431 from JMAConsulting/NoticeFixes-1

[ready for core team to review] CRM-20649, Fixed notice error on form rule

7 years agoMerge pull request #10450 from JMAConsulting/CRM-20667
Monish Deb [Tue, 11 Jul 2017 11:37:16 +0000 (17:07 +0530)]
Merge pull request #10450 from JMAConsulting/CRM-20667

[ready for core team to review] CRM-20667, fixed addtional line creation when multiple membership is …

7 years agoReplace fatal with statusBounce
Matthew Wire [Tue, 11 Jul 2017 10:00:57 +0000 (11:00 +0100)]
Replace fatal with statusBounce

7 years agoCRM-20849: Use "addPsr4" instead of "setPsr4", which replaces existing PSR-4 prefixes...
mickadoo [Tue, 11 Jul 2017 09:40:28 +0000 (10:40 +0100)]
CRM-20849: Use "addPsr4" instead of "setPsr4", which replaces existing PSR-4 prefixes with the same name in the autoloader.

7 years agoMerge pull request #10370 from JMAConsulting/CRM-20321
Monish Deb [Tue, 11 Jul 2017 09:17:29 +0000 (14:47 +0530)]
Merge pull request #10370 from JMAConsulting/CRM-20321

CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity

7 years agoMerge pull request #10629 from jitendrapurohit/CRM-20834
Monish Deb [Tue, 11 Jul 2017 07:34:56 +0000 (13:04 +0530)]
Merge pull request #10629 from jitendrapurohit/CRM-20834

CRM-20834 - Drupal user not created via Profile due to missing email …

7 years agoMerge pull request #10635 from civicrm/4.7.22-rc
Eileen McNaughton [Tue, 11 Jul 2017 04:49:00 +0000 (16:49 +1200)]
Merge pull request #10635 from civicrm/4.7.22-rc

4.7.22 rc

7 years agoMerge pull request #10636 from jitendrapurohit/CRM-20834-rc
Eileen McNaughton [Tue, 11 Jul 2017 04:30:28 +0000 (16:30 +1200)]
Merge pull request #10636 from jitendrapurohit/CRM-20834-rc

CRM-20834 - Drupal user not created via Profile due to missing email

7 years agoCRM-20834 - Drupal user not created via Profile due to missing email
Jitendra Purohit [Tue, 11 Jul 2017 03:29:07 +0000 (08:59 +0530)]
CRM-20834 - Drupal user not created via Profile due to missing email

7 years agoCRM-20847 Support custom api with composite primary keys
eileen [Tue, 4 Jul 2017 03:05:15 +0000 (15:05 +1200)]
CRM-20847 Support custom api with composite primary keys

Do not add id if the field does not exist and add unit tests.

This adds a couple of checks in the api to not add the id field
Note that Grant is an example of an api which uses a uniqueName on
id & I checked manually that is still returned. SyntaxConformance
tests cover this a lot, but I still also added one check to the grant test.

7 years agoMerge pull request #10615 from mepps/CRM-20828
Eileen McNaughton [Mon, 10 Jul 2017 22:07:08 +0000 (10:07 +1200)]
Merge pull request #10615 from mepps/CRM-20828

CRM-20828 Remove limit 1 from saved mappings selection

7 years agoMerge pull request #10597 from jitendrapurohit/CRM-20805
Eileen McNaughton [Mon, 10 Jul 2017 22:05:27 +0000 (10:05 +1200)]
Merge pull request #10597 from jitendrapurohit/CRM-20805

CRM-20805 : Fatal Error when adding new membership type on a contribu…

7 years agoMerge pull request #10633 from colemanw/CRM-20842
Eileen McNaughton [Mon, 10 Jul 2017 22:01:55 +0000 (10:01 +1200)]
Merge pull request #10633 from colemanw/CRM-20842

CRM-20842 - Update api explorer page title

7 years agoMerge pull request #10634 from JMAConsulting/CRM-20673
Eileen McNaughton [Mon, 10 Jul 2017 21:41:56 +0000 (09:41 +1200)]
Merge pull request #10634 from JMAConsulting/CRM-20673

CRM-20673: maintain same tag order on both edit form and manage tag page

7 years agoCRM-20673: maintain same tag order on both edit form and manage tag page
deb.monish [Mon, 10 Jul 2017 20:16:10 +0000 (01:46 +0530)]
CRM-20673: maintain same tag order on both edit form and manage tag page

7 years agoMerge pull request #10626 from totten/4.7.22-port
Tim Otten [Mon, 10 Jul 2017 19:54:07 +0000 (12:54 -0700)]
Merge pull request #10626 from totten/4.7.22-port

CRM-20829 Set port to null on default to stop failing requirements

7 years agoMerge pull request #10631 from twomice/CRM-20509_contibution_report_note_is_null
colemanw [Mon, 10 Jul 2017 18:10:46 +0000 (14:10 -0400)]
Merge pull request #10631 from twomice/CRM-20509_contibution_report_note_is_null

CRM-20509: CiviReport: ACL limits in WHERE were too restrictive.

7 years agoCRM-20842 - Update api explorer page title
Coleman Watts [Mon, 10 Jul 2017 16:42:32 +0000 (12:42 -0400)]
CRM-20842 - Update api explorer page title

7 years agoMerge pull request #10632 from mickadoo/CRM-20833-update-api4-entity-namespace
colemanw [Mon, 10 Jul 2017 16:38:10 +0000 (12:38 -0400)]
Merge pull request #10632 from mickadoo/CRM-20833-update-api4-entity-namespace

CRM-20833: Change APIv4 Entity Namespace Again