civicrm-core.git
7 years agoCRM-20858: Call moveContactBelongings Only Once
Camilo Rodriguez [Mon, 21 Aug 2017 16:12:00 +0000 (16:12 +0000)]
CRM-20858: Call moveContactBelongings Only Once

moveContactBelongings() was bing called twice, first to move selected related
tables, and the second to move all other tables that reference contacts table.

Refactored moveContactBelongings() method so that it can be called only once,
by calculating in one go the tables that have to be taken into account when
merging, according to what has been selected to move.  Basically, it searches
for all tables related to the contact, removes related tables, and then
includes only those related tables selected to be merged.

7 years agoCRM-20858: Fix Failing Test on Custom Field Merge
Camilo Rodriguez [Wed, 9 Aug 2017 17:28:54 +0000 (17:28 +0000)]
CRM-20858: Fix Failing Test on Custom Field Merge

Test for merging custom fields with is_view flag on was failing. This was
happening because the same field was being used on prior tests, setting the
is_view flag at the start of the failing test. Fixed by creating a new custom
field with the is_view flag set as 1, and using that field on the test.

7 years agoCRM-20858: Fix Style Warnings for Upper Case Constants
Camilo Rodriguez [Wed, 9 Aug 2017 14:46:01 +0000 (14:46 +0000)]
CRM-20858: Fix Style Warnings for Upper Case Constants

7 years agoCRM-20858: Add Documentation Block for customRecordExists
Camilo Rodriguez [Wed, 9 Aug 2017 14:21:45 +0000 (14:21 +0000)]
CRM-20858: Add Documentation Block for customRecordExists

7 years agoCRM-20858: Fix Merging of Unselected Custom Fields and Refactor Code
Camilo Rodriguez [Wed, 9 Aug 2017 14:10:02 +0000 (14:10 +0000)]
CRM-20858: Fix Merging of Unselected Custom Fields and Refactor Code

When a Custom Group had more than one custom field and only some of those
fields were selected to be merged, all the fields in the custom group were
merged. This happened exclusively on contacts that had no record on the
custom group's table.

Fixed this by inserting a record on the custom group table before updating
references from source contact to target contact, this way, all values in the
custom group will start empty and only submitted values will get assigned.

Also refactored the solution to make it easier to read and used more descriptive
variable and function names.

7 years agoCRM-20858: Add Failing Tests to Verify Merging of Custom Fields
Camilo Rodriguez [Tue, 8 Aug 2017 21:45:48 +0000 (21:45 +0000)]
CRM-20858: Add Failing Tests to Verify Merging of Custom Fields

If a contact that has values stored in a custom group table is merged into a
contact that doesn't have a record in that table, all values in the source
target will be merged into the target contact, even if those values were
not explicity selected to the merge operation.

The merging operation updates all database references from the source contact
to the target contact on all tables. When the target contact has a record on
a custom group table, this update will fail, since the table's configuration
enforces the entity_id (the reference to the contacts table) to be unique.
However, when the target contact has no record on that custom group table, the
source contact does have a record and the merge is performed, the original
record will be updated to reference the target contact, and hence inherit ALL
values of the source contact, even if none of the values were selected to be
merged.

Added two tests, the first one to verify that merging a contact with a record
on a custom group table does not merge its values into a target contact with
no record in the custom group table; the second one to check that if only some
fields of a custom group table are selected to be merged, only those values
are copied, leaving all others unset.

7 years agoAll [] arrays replaced by array()
Eaiman Shoshi [Fri, 28 Jul 2017 10:40:56 +0000 (16:40 +0600)]
All [] arrays replaced by array()

7 years agoIndentation fixed
Eaiman Shoshi [Fri, 28 Jul 2017 10:29:56 +0000 (16:29 +0600)]
Indentation fixed

PhpStorm's tabs are now fixed to spaces.

7 years agoUpdate Merger.php
Eaiman Shoshi [Fri, 14 Jul 2017 20:11:09 +0000 (02:11 +0600)]
Update Merger.php

1. I think we'll need some more error-handling. The code should probably throw an exception if any of those API calls fail?
-Done

2. There are two calls to 'moveContactBelongings' - won't the first call be affected by the additional code you've added that 'ignores' changes in they're not in the array?
- Handled

7 years agoFix for jira issue CRM-20858
Eaiman Shoshi [Thu, 13 Jul 2017 21:06:34 +0000 (03:06 +0600)]
Fix for jira issue CRM-20858

This PR is for jira issue https://issues.civicrm.org/jira/browse/CRM-20858

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 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 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 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

7 years agoCRM-20833: Change api4 entity namespace again
mickadoo [Mon, 10 Jul 2017 16:28:45 +0000 (17:28 +0100)]
CRM-20833: Change api4 entity namespace again

7 years agoCRM-20509: CiviReport: ACL limits in WHERE were too restrictive.
Allen Shaw [Mon, 10 Jul 2017 16:21:10 +0000 (11:21 -0500)]
CRM-20509: CiviReport: ACL limits in WHERE were too restrictive.

7 years agoMerge pull request #10588 from JMAConsulting/CRM-20793
colemanw [Mon, 10 Jul 2017 15:04:38 +0000 (11:04 -0400)]
Merge pull request #10588 from JMAConsulting/CRM-20793

[ready for core team review] CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting

7 years agoMerge pull request #10068 from agh1/crm-20351
colemanw [Mon, 10 Jul 2017 15:02:13 +0000 (11:02 -0400)]
Merge pull request #10068 from agh1/crm-20351

CRM-20351 Multiple pages repeat stuff in the page run() method, invoking hooks multiple times

7 years agoCRM-20834 - Drupal user not created via Profile due to missing email field
Jitendra Purohit [Mon, 10 Jul 2017 12:46:43 +0000 (18:16 +0530)]
CRM-20834 - Drupal user not created via Profile due to missing email field

7 years agoMerge pull request #10622 from seamuslee001/smtp_socket_fix
Tim Otten [Sat, 8 Jul 2017 23:25:53 +0000 (16:25 -0700)]
Merge pull request #10622 from seamuslee001/smtp_socket_fix

Put back _ in socket and socket_options to refer correctly to staic v…

7 years agoPut back _ in socket and socket_options to refer correctly to staic variables
Seamus Lee [Fri, 7 Jul 2017 21:25:07 +0000 (21:25 +0000)]
Put back _ in socket and socket_options to refer correctly to staic variables

7 years agoMerge pull request #10625 from mickadoo/CRM-20833-update-api4-entity-namespace
colemanw [Sat, 8 Jul 2017 01:10:27 +0000 (21:10 -0400)]
Merge pull request #10625 from mickadoo/CRM-20833-update-api4-entity-namespace

CRM-20833: Change APIv4 Entity Namespace

7 years agoMerge remote-tracking branch 'origin/4.7.22-rc'
Tim Otten [Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)]
Merge remote-tracking branch 'origin/4.7.22-rc'

7 years agoCRM-20829 Uppercase NULL for style
Margaret Epps [Thu, 6 Jul 2017 23:43:50 +0000 (19:43 -0400)]
CRM-20829 Uppercase NULL for style

7 years agoCRM-20829 Set port to null on default to avoid failing requirements
Margaret Epps [Thu, 6 Jul 2017 21:00:26 +0000 (17:00 -0400)]
CRM-20829 Set port to null on default to avoid failing requirements

7 years agoMerge pull request #10624 from totten/master-4723
Tim Otten [Sat, 8 Jul 2017 00:33:30 +0000 (17:33 -0700)]
Merge pull request #10624 from totten/master-4723

Rename v4.7.22 to v4.7.23

7 years agoCRM-20833: Change api4 entity namespace
mickadoo [Sat, 8 Jul 2017 00:00:11 +0000 (01:00 +0100)]
CRM-20833: Change api4 entity namespace

7 years agoRename v4.7.22 to v4.7.23 (continued)
CiviCRM [Fri, 7 Jul 2017 23:45:06 +0000 (23:45 +0000)]
Rename v4.7.22 to v4.7.23 (continued)

7 years agoRename v4.7.22 to v4.7.23
CiviCRM [Fri, 7 Jul 2017 23:19:33 +0000 (23:19 +0000)]
Rename v4.7.22 to v4.7.23

There seems to be a consensus for issuing a quick patch to `4.7.21` as `4.7.22`. This means that `master` needs
to be renumbered as `4.7.23`.

7 years agoSet version to 4.7.22
CiviCRM [Fri, 7 Jul 2017 23:07:35 +0000 (23:07 +0000)]
Set version to 4.7.22

7 years agofix test failures
deb.monish [Thu, 4 May 2017 17:54:43 +0000 (23:24 +0530)]
fix test failures

7 years agoCRM-20351 ACL: Don't repeat stuff in the page run() method
Andrew Hunt [Tue, 28 Mar 2017 19:37:36 +0000 (15:37 -0400)]
CRM-20351 ACL: Don't repeat stuff in the page run() method

7 years agoadditional fixes on QA
deb.monish [Mon, 5 Jun 2017 19:31:22 +0000 (01:01 +0530)]
additional fixes on QA

7 years agoCRM-20652: Generalise changeFeeSelection function to be used for any entity other
deb.monish [Mon, 29 May 2017 15:46:47 +0000 (21:16 +0530)]
CRM-20652: Generalise changeFeeSelection function to be used for any entity other

7 years agoCRM-20321: Changing membership type should change related contribution
deb.monish [Wed, 17 May 2017 13:09:32 +0000 (18:39 +0530)]
CRM-20321: Changing membership type should change related contribution

7 years agoMerge pull request #10621 from agh1/fix-bgm
Tim Otten [Fri, 7 Jul 2017 19:50:41 +0000 (12:50 -0700)]
Merge pull request #10621 from agh1/fix-bgm

Release notes: Mathieu primary affiliation still Coop SymbioTIC

7 years agoRelease notes: Mathieu primary affiliation still Coop SymbioTIC
Andrew Hunt [Fri, 7 Jul 2017 17:22:04 +0000 (13:22 -0400)]
Release notes: Mathieu primary affiliation still Coop SymbioTIC

7 years agoMerge pull request #10619 from francescbassas/patch-11
Monish Deb [Fri, 7 Jul 2017 12:12:15 +0000 (17:42 +0530)]
Merge pull request #10619 from francescbassas/patch-11

Misspelling

7 years agoMerge pull request #10613 from jitendrapurohit/CRM-20823
Monish Deb [Fri, 7 Jul 2017 11:54:06 +0000 (17:24 +0530)]
Merge pull request #10613 from jitendrapurohit/CRM-20823

CRM-20823 : Price Set field with an Expiry Date still being required …

7 years agoMerge pull request #10535 from jitendrapurohit/CRM-20752
Monish Deb [Fri, 7 Jul 2017 11:43:59 +0000 (17:13 +0530)]
Merge pull request #10535 from jitendrapurohit/CRM-20752

CRM-20752: Editing a Cancelled Pledge updates the status of it to Pen…

7 years agoMerge pull request #10565 from eileenmcnaughton/extract
Monish Deb [Fri, 7 Jul 2017 11:28:17 +0000 (16:58 +0530)]
Merge pull request #10565 from eileenmcnaughton/extract

CRM-20759, add ability to import to 'Primary' address add unit testing, move deprecated function into calling class

7 years agoMisspelling
francescbassas [Fri, 7 Jul 2017 09:23:33 +0000 (11:23 +0200)]
Misspelling

7 years agoMerge pull request #10609 from totten/master-case-settings
colemanw [Fri, 7 Jul 2017 02:09:32 +0000 (22:09 -0400)]
Merge pull request #10609 from totten/master-case-settings

CRM-20816 - Expose CiviCase settings through "Settings" framework

7 years agoCRM-20816 - Rename civicaseAllowMultipleCaseClients to civicaseAllowMultipleClients
Tim Otten [Fri, 7 Jul 2017 00:15:04 +0000 (17:15 -0700)]
CRM-20816 - Rename civicaseAllowMultipleCaseClients to civicaseAllowMultipleClients

The second instance of the word "case" seems redundant.  Nip it in the bud.

7 years agoCRM-20816 - XMLProcessor - Consolidate implementation of setting-lookup
Tim Otten [Fri, 7 Jul 2017 00:11:58 +0000 (17:11 -0700)]
CRM-20816 - XMLProcessor - Consolidate implementation of setting-lookup

7 years agoCRM-20816 - Rename `auto` to `default`
Tim Otten [Thu, 6 Jul 2017 23:51:44 +0000 (16:51 -0700)]
CRM-20816 - Rename `auto` to `default`

7 years agoMerge pull request #10616 from civicrm/4.7.21-rc
Tim Otten [Thu, 6 Jul 2017 22:42:43 +0000 (15:42 -0700)]
Merge pull request #10616 from civicrm/4.7.21-rc

4.7.21 rc

7 years agoMerge pull request #10551 from jitendrapurohit/CRM-20633
Monish Deb [Thu, 6 Jul 2017 20:00:36 +0000 (01:30 +0530)]
Merge pull request #10551 from jitendrapurohit/CRM-20633

CRM-20633 : custom field set displayed twice on register event Partic…

7 years agoMerge pull request #10578 from eileenmcnaughton/deprecated
Monish Deb [Thu, 6 Jul 2017 19:44:14 +0000 (01:14 +0530)]
Merge pull request #10578 from eileenmcnaughton/deprecated

CRM-20786 Move deprecated utils functions to the import classes

7 years agoMerge pull request #10580 from eileenmcnaughton/deprecated3
Monish Deb [Thu, 6 Jul 2017 19:31:48 +0000 (01:01 +0530)]
Merge pull request #10580 from eileenmcnaughton/deprecated3

CRM-20786 stop calling deprecated function, that does not do anything…

7 years agoCRM-20828 Remove limit 1 to saved mappings selection
Margaret Epps [Thu, 6 Jul 2017 16:17:58 +0000 (12:17 -0400)]
CRM-20828 Remove limit 1 to saved mappings selection

7 years agoMerge pull request #10607 from JMAConsulting/CRM-20773
Monish Deb [Thu, 6 Jul 2017 12:35:00 +0000 (18:05 +0530)]
Merge pull request #10607 from JMAConsulting/CRM-20773

CRM-20773: Contribution tab shows Receive Date twice instead of ThankYou date

7 years agoCRM-20823 : Price Set field with an Expiry Date still being required after being...
Jitendra Purohit [Thu, 6 Jul 2017 10:15:54 +0000 (15:45 +0530)]
CRM-20823 : Price Set field with an Expiry Date still being required after being expired

7 years agoMerge pull request #10587 from JMAConsulting/isPayment
Monish Deb [Thu, 6 Jul 2017 11:39:06 +0000 (17:09 +0530)]
Merge pull request #10587 from JMAConsulting/isPayment

CRM-20797, fixed sql to use is_payment = 1 to get payments

7 years agoMerge pull request #10611 from totten/4.7.21-rc-notes
Tim Otten [Thu, 6 Jul 2017 02:46:44 +0000 (19:46 -0700)]
Merge pull request #10611 from totten/4.7.21-rc-notes

Release notes - Multiple updates for v4.7.21

7 years agorelease-notes/4.7.21 - Fix references to subordinate PRs
Tim Otten [Thu, 6 Jul 2017 01:48:15 +0000 (18:48 -0700)]
release-notes/4.7.21 - Fix references to subordinate PRs

7 years agorelease-notes/4.7.21 - Add section for security advisories
Tim Otten [Thu, 6 Jul 2017 01:55:20 +0000 (18:55 -0700)]
release-notes/4.7.21 - Add section for security advisories

7 years agoMerge pull request #10610 from agh1/4.7.21-releasenotes
Tim Otten [Thu, 6 Jul 2017 01:44:52 +0000 (18:44 -0700)]
Merge pull request #10610 from agh1/4.7.21-releasenotes

4.7.21 release notes

7 years ago4.7.21 release notes: updated contributors
Andrew Hunt [Wed, 5 Jul 2017 07:56:56 +0000 (03:56 -0400)]
4.7.21 release notes: updated contributors

7 years ago4.7.21 release notes: bulk of notes
Andrew Hunt [Wed, 5 Jul 2017 07:26:28 +0000 (03:26 -0400)]
4.7.21 release notes: bulk of notes

7 years agoraw from script
Andrew Hunt [Tue, 4 Jul 2017 22:57:26 +0000 (18:57 -0400)]
raw from script

7 years agoCRM-20816 - Add more help text
Tim Otten [Tue, 4 Jul 2017 22:48:15 +0000 (15:48 -0700)]
CRM-20816 - Add more help text

7 years agoCRM-20816 - CiviCase `Settings.xml` - Add deprecation notices
Tim Otten [Tue, 4 Jul 2017 22:34:32 +0000 (15:34 -0700)]
CRM-20816 - CiviCase `Settings.xml` - Add deprecation notices

7 years agoCRM-20816 - CiviCase - Settings framework takes precedence over "Settings.xml"
Tim Otten [Tue, 4 Jul 2017 22:17:54 +0000 (15:17 -0700)]
CRM-20816 - CiviCase - Settings framework takes precedence over "Settings.xml"

CiviCase was originally developed before the creation of the "Settings"
framework (aka `$civicrm_settings`, `Settings API`, `civicrm_settings`,
`*.setting.php`).  At the time, it stored some settings in a special file
named "Settings.xml".

Today, this file is an anomaly which supports fewer dataflows.

With this revision:
 * For backward compatibility, the default setting is `auto`, which reads
   the setting from XML.
 * For maximum compliance with the Settings framework, the
   value from `Civi::settings()->get()` takes precedence (if defined).

7 years agoCRM-20816 - Add `civicrm/admin/setting/case` to navbar
Tim Otten [Tue, 4 Jul 2017 22:08:54 +0000 (15:08 -0700)]
CRM-20816 - Add `civicrm/admin/setting/case` to navbar

7 years agoCRM-20816 - Implement new screen `civicrm/admin/setting/case`
Tim Otten [Tue, 4 Jul 2017 21:52:33 +0000 (14:52 -0700)]
CRM-20816 - Implement new screen `civicrm/admin/setting/case`

7 years agoCRM-20816 - Case.setting.php - Define settings for CiviCase
Tim Otten [Tue, 4 Jul 2017 21:29:43 +0000 (14:29 -0700)]
CRM-20816 - Case.setting.php - Define settings for CiviCase

7 years agoCRM-20759 enable Primary as an import location type.
eileen [Tue, 27 Jun 2017 02:23:50 +0000 (14:23 +1200)]
CRM-20759 enable Primary as an import location type.

This goes to the default location type if the contact has no primary, or overwrites primary,
in keeping with profile behaviour

7 years agoMerge pull request #10606 from jitendrapurohit/CRM-20812
Eileen McNaughton [Tue, 4 Jul 2017 21:24:46 +0000 (09:24 +1200)]
Merge pull request #10606 from jitendrapurohit/CRM-20812

CRM-20812 : Notice on live contribution when only pay later is selected

7 years agoMerge pull request #10603 from JMAConsulting/CRM-20640
Eileen McNaughton [Tue, 4 Jul 2017 21:20:30 +0000 (09:20 +1200)]
Merge pull request #10603 from JMAConsulting/CRM-20640

CRM-20640: Added unit test for the fix

7 years agoCRM-20773: Contribution tab shows Receive Date twice instead of Thank You date
deb.monish [Tue, 4 Jul 2017 17:38:40 +0000 (23:08 +0530)]
CRM-20773: Contribution tab shows Receive Date twice instead of Thank You date

7 years agoMerge pull request #10594 from eileenmcnaughton/extract2
Monish Deb [Tue, 4 Jul 2017 13:08:34 +0000 (18:38 +0530)]
Merge pull request #10594 from eileenmcnaughton/extract2

[NFC] Add unit test towards CRM-20759

7 years agoCRM-20812 : Notice on live contribution when only pay later is selected
Jitendra Purohit [Tue, 4 Jul 2017 11:35:40 +0000 (17:05 +0530)]
CRM-20812 : Notice on live contribution when only pay later is selected

7 years agoCRM-20809 : Create .gitignore file to ignore extensions cache files
Jitendra Purohit [Tue, 4 Jul 2017 09:11:31 +0000 (14:41 +0530)]
CRM-20809 : Create .gitignore file to ignore extensions cache files

7 years agoCRM-20640: Added unit test for the fix
deb.monish [Tue, 4 Jul 2017 08:28:53 +0000 (13:58 +0530)]
CRM-20640: Added unit test for the fix

7 years agoCRM-20805 : Fatal Error when adding new membership type on a contribution page
Jitendra Purohit [Mon, 3 Jul 2017 10:56:37 +0000 (16:26 +0530)]
CRM-20805 : Fatal Error when adding new membership type on a contribution page