civicrm-core.git
6 years agoApi4 - Update entity directory
Coleman Watts [Wed, 24 Jan 2018 16:13:02 +0000 (11:13 -0500)]
Api4 - Update entity directory

6 years agoMerge pull request #11163 from mickadoo/CRM-21334-fire-hooks-on-contact-image-deletion
Eileen McNaughton [Tue, 23 Jan 2018 22:06:42 +0000 (11:06 +1300)]
Merge pull request #11163 from mickadoo/CRM-21334-fire-hooks-on-contact-image-deletion

CRM-21334: Fire hooks on Contact Image Deletion

6 years agoMerge pull request #11579 from jmcclelland/CRM-21701
Eileen McNaughton [Tue, 23 Jan 2018 21:52:55 +0000 (10:52 +1300)]
Merge pull request #11579 from jmcclelland/CRM-21701

CRM-21701 - ensure street addresses are parsed

6 years agoMerge pull request #11574 from eileenmcnaughton/test_fixes
Eileen McNaughton [Tue, 23 Jan 2018 20:31:14 +0000 (09:31 +1300)]
Merge pull request #11574 from eileenmcnaughton/test_fixes

Test fixes, towards CRM-17647

6 years agoCRM-21701 - ensure street addresses are parsed
Jamie McClelland [Tue, 23 Jan 2018 15:03:17 +0000 (10:03 -0500)]
CRM-21701 - ensure street addresses are parsed

Even if USPS street parsing is disabled.

6 years agoMerge pull request #11577 from eileenmcnaughton/format_amount
colemanw [Tue, 23 Jan 2018 14:54:30 +0000 (09:54 -0500)]
Merge pull request #11577 from eileenmcnaughton/format_amount

CRM-21698 Format amount

6 years agoCRM-21698 move formatting to processor class.
eileen [Tue, 23 Jan 2018 08:54:43 +0000 (21:54 +1300)]
CRM-21698 move formatting to processor class.

This moves the fix for CRM-16460 to the processor class, providing a helper function.

The fix put number formatting deep into the BAO - when they don't work right
(depending on presence of money_format function I think) negative amounts
become 0

6 years agoTest fixes, towards CRM-17647
eileen [Tue, 23 Jan 2018 05:21:51 +0000 (18:21 +1300)]
Test fixes, towards CRM-17647

Test fixes towards never calling Contribution::Create without skipCleanMoney

6 years agoMerge pull request #11572 from civicrm/4.7.30-rc
Eileen McNaughton [Mon, 22 Jan 2018 22:49:17 +0000 (11:49 +1300)]
Merge pull request #11572 from civicrm/4.7.30-rc

4.7.30 rc to master

6 years agoMerge pull request #11548 from eileenmcnaughton/money_rc
Eileen McNaughton [Mon, 22 Jan 2018 22:48:35 +0000 (11:48 +1300)]
Merge pull request #11548 from eileenmcnaughton/money_rc

CRM-17647 fix for submitting payment with thousand separator

6 years agoMerge pull request #11568 from eileenmcnaughton/CRM-21071
colemanw [Mon, 22 Jan 2018 22:08:17 +0000 (17:08 -0500)]
Merge pull request #11568 from eileenmcnaughton/CRM-21071

CRM-21071 - Fix event location saving

6 years agoMerge pull request #11525 from eileenmcnaughton/deprecated
Monish Deb [Mon, 22 Jan 2018 06:34:36 +0000 (12:04 +0530)]
Merge pull request #11525 from eileenmcnaughton/deprecated

CRM-21660 Remove use of deprecated function on mapping_type

6 years agoCRM-21071 fix form to hold id before callling (nasty) block:create
eileen [Mon, 22 Jan 2018 04:30:31 +0000 (17:30 +1300)]
CRM-21071 fix form to hold id before callling (nasty) block:create

6 years agoCRM-21071 - Simplify event location form to not use ajax
Coleman Watts [Wed, 27 Sep 2017 23:11:08 +0000 (19:11 -0400)]
CRM-21071 - Simplify event location form to not use ajax

This form does not do anything dynamic so ajax was unnecessarily complex.

6 years agoMerge pull request #11566 from eileenmcnaughton/typo
Eileen McNaughton [Mon, 22 Jan 2018 03:21:25 +0000 (16:21 +1300)]
Merge pull request #11566 from eileenmcnaughton/typo

Fix typo (very recent)

6 years agoFix typo (very recent)
eileen [Mon, 22 Jan 2018 03:10:52 +0000 (16:10 +1300)]
Fix typo (very recent)

6 years agoMerge pull request #11561 from mattwire/CRM-21688_fontawesome_membership_autorenew
colemanw [Sun, 21 Jan 2018 22:39:05 +0000 (17:39 -0500)]
Merge pull request #11561 from mattwire/CRM-21688_fontawesome_membership_autorenew

CRM-21688 Use fontawesome check for membership auto-renew status

6 years agoMerge pull request #11424 from mattwire/CRM-21573_disable_contact_email_receiptfrom
Eileen McNaughton [Sun, 21 Jan 2018 22:38:39 +0000 (11:38 +1300)]
Merge pull request #11424 from mattwire/CRM-21573_disable_contact_email_receiptfrom

CRM-21573 Allow to disable sending of email from activity source contact email for receipt

6 years agoMerge pull request #11398 from yashodha/CRM-21540
Eileen McNaughton [Sun, 21 Jan 2018 22:30:04 +0000 (11:30 +1300)]
Merge pull request #11398 from yashodha/CRM-21540

CRM-21540 - Add support for auto-complete fields in the batch entry f…

6 years agoMerge pull request #11486 from jitendrapurohit/CRM-21622fix
Eileen McNaughton [Sun, 21 Jan 2018 22:18:53 +0000 (11:18 +1300)]
Merge pull request #11486 from jitendrapurohit/CRM-21622fix

CRM-21623 - Smart Group Relative Date not saving for some fields in A…

6 years agoMerge pull request #11557 from JKingsnorth/CRM-21683
Eileen McNaughton [Sun, 21 Jan 2018 21:57:38 +0000 (10:57 +1300)]
Merge pull request #11557 from JKingsnorth/CRM-21683

CRM-21683 Standardise filter in mailing summary report

6 years agoMerge pull request #11536 from mattwire/CRM-21671_abstract_core_task
Eileen McNaughton [Sun, 21 Jan 2018 21:31:43 +0000 (10:31 +1300)]
Merge pull request #11536 from mattwire/CRM-21671_abstract_core_task

CRM-21671 abstract core task

6 years agoUse fontawesome check for membership auto-renew status and add exclamation for auto...
Matthew Wire [Sat, 20 Jan 2018 03:56:33 +0000 (10:56 +0700)]
Use fontawesome check for membership auto-renew status and add exclamation for auto-renew but error (eg. subscription cancelled).

6 years agoMerge pull request #11052 from totten/master-dm-iats
Tim Otten [Sat, 20 Jan 2018 23:49:00 +0000 (15:49 -0800)]
Merge pull request #11052 from totten/master-dm-iats

EXT-56 - Add com.iatspayments.civicrm to tarballs

6 years agoMerge pull request #11372 from ejegg/apiFixAddress
colemanw [Fri, 19 Jan 2018 21:28:01 +0000 (16:28 -0500)]
Merge pull request #11372 from ejegg/apiFixAddress

Add API parameter for fix_address

6 years agoMerge pull request #11559 from mountev/4.7-contact-subtype-prevents-inclusion-in...
colemanw [Fri, 19 Jan 2018 21:24:54 +0000 (16:24 -0500)]
Merge pull request #11559 from mountev/4.7-contact-subtype-prevents-inclusion-in-profile

CRM-21684 contact subtype fields prevent inclusion in profile/receipt…

6 years agoMerge pull request #10485 from lcdservices/CRM-20707
Eileen McNaughton [Fri, 19 Jan 2018 20:38:01 +0000 (09:38 +1300)]
Merge pull request #10485 from lcdservices/CRM-20707

CRM-20707 include start/end dates when updating membership

6 years agoCRM-21684 contact subtype fields prevent inclusion in profile/receipt email
Mountev [Fri, 19 Jan 2018 18:37:41 +0000 (18:37 +0000)]
CRM-21684 contact subtype fields prevent inclusion in profile/receipt email

6 years agoMerge pull request #11555 from mattwire/CRM-21511_recur_on_membership_detail_fix
colemanw [Fri, 19 Jan 2018 14:08:32 +0000 (09:08 -0500)]
Merge pull request #11555 from mattwire/CRM-21511_recur_on_membership_detail_fix

CRM-21511 Fix template variable for contribution_recur_id

6 years agoCRM-21683 Standardise filter in mailing summary report
JKingsnorth [Fri, 19 Jan 2018 10:43:05 +0000 (10:43 +0000)]
CRM-21683 Standardise filter in mailing summary report

6 years agoFix template variable for contribution_recur_id
Matthew Wire [Fri, 19 Jan 2018 05:36:58 +0000 (12:36 +0700)]
Fix template variable for contribution_recur_id

6 years agoCRM-20707 include start/end dates when updating membership
Brian Shaughnessy [Fri, 19 Jan 2018 03:49:28 +0000 (22:49 -0500)]
CRM-20707 include start/end dates when updating membership

6 years agoFix docblock type definitions
Matthew Wire [Fri, 19 Jan 2018 03:21:14 +0000 (10:21 +0700)]
Fix docblock type definitions

6 years agoConvert Event to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:04:15 +0000 (16:04 +0700)]
Convert Event to use core Task class

6 years agoAdd abstract core Task class
Matthew Wire [Tue, 2 Jan 2018 09:00:40 +0000 (16:00 +0700)]
Add abstract core Task class

6 years agoCRM-17647 membership form fix for thousand processing error.
eileen [Thu, 18 Jan 2018 22:09:10 +0000 (11:09 +1300)]
CRM-17647 membership form fix for thousand processing error.

6 years agoMerge pull request #11554 from eileenmcnaughton/test_fin
Eileen McNaughton [Fri, 19 Jan 2018 02:48:42 +0000 (15:48 +1300)]
Merge pull request #11554 from eileenmcnaughton/test_fin

CRM-17647 test fixes to avoid calling Contribution::create without sk…

6 years agoCRM-17647 fix for submitting payment with thousand separator
eileen [Wed, 17 Jan 2018 22:56:05 +0000 (11:56 +1300)]
CRM-17647 fix for submitting payment with thousand separator

6 years agoCRM-17647 test fixes to avoid calling Contribution::create without skipCleanMoney
eileen [Fri, 19 Jan 2018 00:15:34 +0000 (13:15 +1300)]
CRM-17647 test fixes to avoid calling Contribution::create without skipCleanMoney

6 years agoMerge pull request #11553 from civicrm/4.7.30-rc
Eileen McNaughton [Fri, 19 Jan 2018 00:13:58 +0000 (13:13 +1300)]
Merge pull request #11553 from civicrm/4.7.30-rc

4.7.30 rc merge to master

6 years agoMerge pull request #11549 from eileenmcnaughton/batch_currency
colemanw [Fri, 19 Jan 2018 00:05:26 +0000 (19:05 -0500)]
Merge pull request #11549 from eileenmcnaughton/batch_currency

CRM-17647 fix for currency on batch entry

6 years agoMerge pull request #11365 from mattwire/CRM-21511_recur_on_membership_detail
colemanw [Thu, 18 Jan 2018 23:27:48 +0000 (18:27 -0500)]
Merge pull request #11365 from mattwire/CRM-21511_recur_on_membership_detail

CRM-21511 Add recurring contribution link to membership and contribution detail

6 years agoMerge pull request #11526 from eileenmcnaughton/export_fix_activity
colemanw [Thu, 18 Jan 2018 22:33:23 +0000 (17:33 -0500)]
Merge pull request #11526 from eileenmcnaughton/export_fix_activity

CRM-14834 - fix activity export when relationship in export fields

6 years agoMerge pull request #11552 from seamuslee001/activity_unit_test_failures_4_7_30
Eileen McNaughton [Thu, 18 Jan 2018 21:51:02 +0000 (10:51 +1300)]
Merge pull request #11552 from seamuslee001/activity_unit_test_failures_4_7_30

Fix Activity Unit Test failure

6 years agoadditional fixes
deb.monish [Thu, 4 Jan 2018 18:54:20 +0000 (00:24 +0530)]
additional fixes

6 years agoMerge pull request #11142 from JMAConsulting/CRM-21260
Mathieu Lu [Thu, 18 Jan 2018 15:08:17 +0000 (10:08 -0500)]
Merge pull request #11142 from JMAConsulting/CRM-21260

CRM-21260: CiviMail compose UI very slow to initialize, CRM-21316: Refactor getRecipients fn

6 years agoMerge pull request #11543 from eileenmcnaughton/api_std
colemanw [Thu, 18 Jan 2018 14:56:19 +0000 (09:56 -0500)]
Merge pull request #11543 from eileenmcnaughton/api_std

Minor api tidy up.

6 years agoMerge pull request #11547 from eileenmcnaughton/safe_money
Eileen McNaughton [Thu, 18 Jan 2018 09:33:57 +0000 (22:33 +1300)]
Merge pull request #11547 from eileenmcnaughton/safe_money

CRM-17647 test fixes towards ensuring we never rely on the BAO to cle…

6 years agoCRM-17647 fix for currency on batch entry
eileen [Thu, 18 Jan 2018 09:30:55 +0000 (22:30 +1300)]
CRM-17647 fix for currency on batch entry

6 years agoMinor api tidy up.
eileen [Thu, 18 Jan 2018 05:23:02 +0000 (18:23 +1300)]
Minor api tidy up.

It is recommended practice to pass the entity to the api. This minor fix up supports that

6 years agoMerge pull request #11545 from eileenmcnaughton/test_fix
Eileen McNaughton [Thu, 18 Jan 2018 08:06:44 +0000 (21:06 +1300)]
Merge pull request #11545 from eileenmcnaughton/test_fix

Fix mock test data for PaymentProcessor object.

6 years agoCRM-17647 test fixes towards ensuring we never rely on the BAO to clean money.
eileen [Thu, 18 Jan 2018 06:58:05 +0000 (19:58 +1300)]
CRM-17647 test fixes towards ensuring we never rely on the BAO to clean money.

We need to deprecate out BAO cleaning of money. Test fixes ensure we use the (safe) api rather than BAO::create - no functional change

6 years agoFix mock test data for PaymentProcessor object.
eileen [Thu, 18 Jan 2018 05:54:21 +0000 (18:54 +1300)]
Fix mock test data for PaymentProcessor object.

This only affects unit tests. When dummy data is generated for a PaymentProcessor it will be more
usable

6 years agoMerge pull request #11541 from eileenmcnaughton/safe_money
Eileen McNaughton [Thu, 18 Jan 2018 05:03:39 +0000 (18:03 +1300)]
Merge pull request #11541 from eileenmcnaughton/safe_money

CRM-17647 improve testing on the thousand separator.

6 years agoCRM-17647 improve testing on the thousand separator.
eileen [Thu, 18 Jan 2018 02:30:28 +0000 (15:30 +1300)]
CRM-17647 improve testing on the thousand separator.

As part of fixing thousand separator issues we can use the deprecated flag to identify when the
BAO_Contribution::create is called without skip_clean_money as we want to move all cleaning to
close to submit. First, however, we need to stop calling that function directly in the test suite
(or only call with skip_clean_money if we are specifically testing it).

Am checking how jenkins likes this format (which was no good on 5.3) & will change others if cheerful

6 years agoMerge pull request #11521 from JMAConsulting/CRM-21656
Eileen McNaughton [Thu, 18 Jan 2018 01:22:13 +0000 (14:22 +1300)]
Merge pull request #11521 from JMAConsulting/CRM-21656

CRM-21656: Backend Membership with Priceset applies taxes twice to line_item

6 years agoMerge pull request #11538 from eileenmcnaughton/regress
Eileen McNaughton [Thu, 18 Jan 2018 00:19:00 +0000 (13:19 +1300)]
Merge pull request #11538 from eileenmcnaughton/regress

CRM-21672 fix intra-rc regression, fatal when deleting participants

6 years agoMerge pull request #11534 from GinkgoFJG/CRM-21667-timezone
Mark Hanna [Thu, 18 Jan 2018 00:12:27 +0000 (18:12 -0600)]
Merge pull request #11534 from GinkgoFJG/CRM-21667-timezone

CRM-21667: Fixed timezone handoff from Drupal6.

6 years agoMerge pull request #11524 from eileenmcnaughton/search_test
colemanw [Wed, 17 Jan 2018 22:56:07 +0000 (17:56 -0500)]
Merge pull request #11524 from eileenmcnaughton/search_test

Add test for DB error on search add to group CRM-21159

6 years agoMerge pull request #11506 from tschuettler/CRM-21651
colemanw [Wed, 17 Jan 2018 22:53:27 +0000 (17:53 -0500)]
Merge pull request #11506 from tschuettler/CRM-21651

CRM-21651 - Activity_Email/SMS_Add - Fix loading failed when no conta…

6 years agoMerge pull request #11537 from francescbassas/patch-13
Eileen McNaughton [Wed, 17 Jan 2018 22:25:32 +0000 (11:25 +1300)]
Merge pull request #11537 from francescbassas/patch-13

CRM-21670 - Search of active relationships does not appear on Relatio…

6 years agoCRM-21672 fix intra-rc regression, fatal when deleting participants
eileen [Wed, 17 Jan 2018 22:17:56 +0000 (11:17 +1300)]
CRM-21672 fix intra-rc regression, fatal when deleting participants

Change-Id: Iccbd17d53f07a93c74ce46e9539d1768019a2532

6 years agoMerge pull request #11535 from mattwire/CRM-21669_emailsendnow_wording
Eileen McNaughton [Wed, 17 Jan 2018 21:04:23 +0000 (10:04 +1300)]
Merge pull request #11535 from mattwire/CRM-21669_emailsendnow_wording

CRM-21669 Consistent wording of Email - Send Now task

6 years agoMerge pull request #10951 from ErikHommel/master
Eileen McNaughton [Wed, 17 Jan 2018 20:49:01 +0000 (09:49 +1300)]
Merge pull request #10951 from ErikHommel/master

CRM-21155 - Hook batchItems does not change the csv export

6 years agoMerge pull request #11530 from jitendrapurohit/CRM-21323
Eileen McNaughton [Wed, 17 Jan 2018 20:44:24 +0000 (09:44 +1300)]
Merge pull request #11530 from jitendrapurohit/CRM-21323

CRM-21323 : Fix backend credit card payment processor selection

6 years agoCRM-21656: Backend Membership with Priceset applies taxes twice to line_item
deb.monish [Mon, 15 Jan 2018 12:41:57 +0000 (18:11 +0530)]
CRM-21656: Backend Membership with Priceset applies taxes twice to line_item

6 years agoCRM-21670 - Search of active relationships does not appear on Relationship Report
francescbassas [Wed, 17 Jan 2018 12:44:57 +0000 (13:44 +0100)]
CRM-21670 - Search of active relationships does not appear on Relationship Report

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

6 years agoConsistent wording of Email - Send Now task
Matthew Wire [Wed, 17 Jan 2018 12:23:02 +0000 (19:23 +0700)]
Consistent wording of Email - Send Now task

6 years agoAdd recurring contribution link to membership and contribution detail
Matthew Wire [Mon, 4 Dec 2017 11:32:25 +0000 (11:32 +0000)]
Add recurring contribution link to membership and contribution detail

6 years agoCRM-21667: Fixed timezone handoff from Drupal6.
Frank J. Gómez [Wed, 17 Jan 2018 00:34:54 +0000 (19:34 -0500)]
CRM-21667: Fixed timezone handoff from Drupal6.

6 years agoMerge pull request #11492 from eileenmcnaughton/search
Eileen McNaughton [Tue, 16 Jan 2018 23:37:07 +0000 (12:37 +1300)]
Merge pull request #11492 from eileenmcnaughton/search

CRM-21634 Standardise search fields as they relate to contacts

6 years agoCRM-21423 test that emails are exported for multiple types
eileen [Tue, 16 Jan 2018 06:39:15 +0000 (19:39 +1300)]
CRM-21423 test that emails are exported for multiple types

I was thinking this might fail but it is passing so let's lock it in
caller

6 years agoMerge pull request #11533 from sunnycs121/CRM-21664
Eileen McNaughton [Tue, 16 Jan 2018 23:23:51 +0000 (12:23 +1300)]
Merge pull request #11533 from sunnycs121/CRM-21664

CRM-21664 Modified--getting currencies from civicrm_currency table instead bein…

6 years agoMerge pull request #11510 from JMAConsulting/CRM-21613
colemanw [Tue, 16 Jan 2018 21:30:18 +0000 (16:30 -0500)]
Merge pull request #11510 from JMAConsulting/CRM-21613

CRM-21613:  'Manage Tag' page Improvements

6 years agoModified--getting currencies from civicrm_currency table instead being hard-coded...
Hassan Farooq [Tue, 16 Jan 2018 21:16:58 +0000 (16:16 -0500)]
Modified--getting currencies from civicrm_currency table instead being hard-coded. CRM-21664

6 years agoMerge pull request #11528 from mukeshcompucorp/fix-page-structure
colemanw [Tue, 16 Jan 2018 21:07:20 +0000 (16:07 -0500)]
Merge pull request #11528 from mukeshcompucorp/fix-page-structure

CRM-21663: Fix Campaign Search and result structure

6 years agoCRM-21323 : Fix backend credit card payment processor selection
Jitendra Purohit [Tue, 16 Jan 2018 13:48:59 +0000 (19:18 +0530)]
CRM-21323 : Fix backend credit card payment processor selection

6 years agoCRM-21663: Fix Campaign Search and result structure
Mukesh Ram [Tue, 16 Jan 2018 12:38:26 +0000 (18:08 +0530)]
CRM-21663: Fix Campaign Search and result structure

6 years agoMerge pull request #11523 from systopia/CRM-21444-take2
Monish Deb [Tue, 16 Jan 2018 11:49:50 +0000 (17:19 +0530)]
Merge pull request #11523 from systopia/CRM-21444-take2

fix CRM-21444: use contact_type name instead of label

6 years agofix CRM-21444: use contact_type name instead of label
systopia [Thu, 4 Jan 2018 13:39:43 +0000 (14:39 +0100)]
fix CRM-21444: use contact_type name instead of label

6 years agoMerge pull request #11508 from seamuslee001/CRM-21225-core
Eileen McNaughton [Tue, 16 Jan 2018 06:29:20 +0000 (19:29 +1300)]
Merge pull request #11508 from seamuslee001/CRM-21225-core

CRM-21225 Changes to UI to implement the frontend_title field to allo…

6 years agoadditional fixes
deb.monish [Tue, 16 Jan 2018 05:28:13 +0000 (10:58 +0530)]
additional fixes

6 years agoCRM-21613: Search issues on 'Manage Tag' page
deb.monish [Fri, 12 Jan 2018 10:50:05 +0000 (16:20 +0530)]
CRM-21613: Search issues on 'Manage Tag' page

6 years agoCRM-14834 - fix activity export when relationship in export fields
eileen [Tue, 16 Jan 2018 00:47:17 +0000 (13:47 +1300)]
CRM-14834 - fix activity export when relationship in export fields

6 years agoMerge pull request #10692 from jitendrapurohit/CRM-20904
Eileen McNaughton [Tue, 16 Jan 2018 02:14:09 +0000 (15:14 +1300)]
Merge pull request #10692 from jitendrapurohit/CRM-20904

CRM-20904 : joomla cron run - load all daos defined in extensions

6 years agoCRM-21587, Notice error for Grant date fields (#11497)
Pradeep Nayak [Tue, 16 Jan 2018 02:09:09 +0000 (02:09 +0000)]
CRM-21587, Notice error for Grant date fields (#11497)

* CRM-21587, fixed code to add formattype for date field

----------------------------------------
* CRM-21587: Notice error for grant date fields
  https://issues.civicrm.org/jira/browse/CRM-21587

* CRM-21587, removed cruft code

----------------------------------------
* CRM-21587: Notice error for grant date fields
  https://issues.civicrm.org/jira/browse/CRM-21587

* CRM-21587, generated DAO file

----------------------------------------
* CRM-21587: Notice error for grant date fields
  https://issues.civicrm.org/jira/browse/CRM-21587

* CRM-21587, removed cruft code

----------------------------------------
* CRM-21587: Notice error for grant date fields
  https://issues.civicrm.org/jira/browse/CRM-21587

* Standalone code contributor from now.

6 years agoCRM-15049: Fixed include/exclude search for parent groups (#10546)
ahmedg1986 [Tue, 16 Jan 2018 01:47:34 +0000 (07:17 +0530)]
CRM-15049: Fixed include/exclude search for parent groups (#10546)

* CRM-15049: Fixed include/exclude search for parent groups

* Fixed the style errors

* CRM-15049: update comment

6 years agoMerge pull request #11509 from mydropwizard/crm-21652
Eileen McNaughton [Tue, 16 Jan 2018 01:24:25 +0000 (14:24 +1300)]
Merge pull request #11509 from mydropwizard/crm-21652

CRM-21652: Without using 'finally' clause

6 years agoCRM-21634 Stdise search fields as they relate to contacts
eileen [Wed, 3 Jan 2018 21:01:46 +0000 (10:01 +1300)]
CRM-21634 Stdise search fields as they relate to contacts

6 years agoCRM-21660 Remove use of deprecated function on mapping_type
eileen [Mon, 15 Jan 2018 23:22:41 +0000 (12:22 +1300)]
CRM-21660 Remove use of deprecated function on mapping_type

6 years agoAdd test for DB error on search add to group CRM-21159
eileen [Mon, 15 Jan 2018 22:27:26 +0000 (11:27 +1300)]
Add test for DB error on search add to group CRM-21159

I've also removed an unused parameter & a couple of require_once calls

6 years agoMerge pull request #11422 from ajesamson/master
Eileen McNaughton [Mon, 15 Jan 2018 22:25:32 +0000 (11:25 +1300)]
Merge pull request #11422 from ajesamson/master

CRM-21159: Address fields cause DB errors when adding contacts to group from Search Builder

6 years agoMerge pull request #11390 from ejegg/bounceProcessing
colemanw [Mon, 15 Jan 2018 16:27:10 +0000 (11:27 -0500)]
Merge pull request #11390 from ejegg/bounceProcessing

CRM-21521: fix nested multipart handling in bounce processing

6 years agoMerge pull request #11183 from jmcclelland/CRM-18048
Monish Deb [Mon, 15 Jan 2018 13:40:05 +0000 (19:10 +0530)]
Merge pull request #11183 from jmcclelland/CRM-18048

CRM-18048: keep civicrm_value table names to a minimum length to avoid report errors

6 years agoMerge pull request #11459 from karthik-awebon/master
Eileen McNaughton [Mon, 15 Jan 2018 05:30:03 +0000 (18:30 +1300)]
Merge pull request #11459 from karthik-awebon/master

Fix for CRM-21485 - Tax not added when renewing membership in backend

6 years agoMerge pull request #11393 from jitendrapurohit/CRM-21533
Eileen McNaughton [Mon, 15 Jan 2018 03:27:04 +0000 (16:27 +1300)]
Merge pull request #11393 from jitendrapurohit/CRM-21533

CRM-21533 : Outbound setting reverts in non-production sites on execu…

6 years agoMerge pull request #11366 from mattwire/CRM-21512_remove_restriction_update_subscript...
Eileen McNaughton [Mon, 15 Jan 2018 03:21:18 +0000 (16:21 +1300)]
Merge pull request #11366 from mattwire/CRM-21512_remove_restriction_update_subscription_membership

CRM-21512 Remove restriction on 'Update Subscription' when a recurring contribu…

6 years agoMerge pull request #11504 from colemanw/CRM-17352
colemanw [Mon, 15 Jan 2018 02:50:23 +0000 (21:50 -0500)]
Merge pull request #11504 from colemanw/CRM-17352

CRM-17352 - Use Backbone.noConflict

6 years agoMerge pull request #11512 from pradpnayak/moveName
Eileen McNaughton [Mon, 15 Jan 2018 01:52:23 +0000 (14:52 +1300)]
Merge pull request #11512 from pradpnayak/moveName

Edit to contributor listing: Standalone code contributor from now.

6 years agoMerge pull request #11474 from cividesk/CRM-19107
Eileen McNaughton [Mon, 15 Jan 2018 01:33:08 +0000 (14:33 +1300)]
Merge pull request #11474 from cividesk/CRM-19107

CRM-19107 Fixed PayPal Express redirection issue.