civicrm-core.git
6 years agoCRM-21087: Payment popup goes weird if you click 'adjust payment amount'
Jitendra Purohit [Mon, 21 Aug 2017 11:51:46 +0000 (17:21 +0530)]
CRM-21087: Payment popup goes weird if you click 'adjust payment amount'

6 years agoMerge pull request #10873 from civicrm/4.7.24-rc
Tim Otten [Fri, 18 Aug 2017 21:05:45 +0000 (14:05 -0700)]
Merge pull request #10873 from civicrm/4.7.24-rc

4.7.24 rc

6 years agoMerge pull request #10875 from civicrm/4.7.23-rc
Tim Otten [Fri, 18 Aug 2017 21:03:32 +0000 (14:03 -0700)]
Merge pull request #10875 from civicrm/4.7.23-rc

Bring 4.7.23 Release notes into 4.7.24

6 years agoMerge pull request #10870 from mattwire/CRM-21077_outbound_mail_warning
Tim Otten [Fri, 18 Aug 2017 04:59:04 +0000 (21:59 -0700)]
Merge pull request #10870 from mattwire/CRM-21077_outbound_mail_warning

CRM-21077 Add warning when CIVICRM_MAIL_LOG is set and you are testing outbound…

6 years agoMerge pull request #10872 from seamuslee001/CRM-20941-rc
Eileen McNaughton [Fri, 18 Aug 2017 03:09:26 +0000 (23:09 -0400)]
Merge pull request #10872 from seamuslee001/CRM-20941-rc

CRM-20941 Port changes to push minimum version of PHP to 5.6 with new message for php 5.3 and php5.4

6 years agoCRM-20941 Add in Link to blog post on bumping PHP Version
Seamus Lee [Wed, 16 Aug 2017 21:04:09 +0000 (07:04 +1000)]
CRM-20941 Add in Link to blog post on bumping PHP Version

6 years agoCRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to...
Seamus Lee [Sat, 12 Aug 2017 23:34:15 +0000 (09:34 +1000)]
CRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to 5.4 and 5.3 and alter Status Check message accordingly

6 years agoAdd warning when CIVICRM_MAIL_LOG is set and you are testing outbound mail settings
Matthew Wire [Thu, 17 Aug 2017 18:37:42 +0000 (19:37 +0100)]
Add warning when CIVICRM_MAIL_LOG is set and you are testing outbound mail settings

6 years agoMerge pull request #10842 from totten/master-case-rev
colemanw [Thu, 17 Aug 2017 15:55:12 +0000 (11:55 -0400)]
Merge pull request #10842 from totten/master-case-rev

CRM-21052 - Activity API - Allow opt-out of CiviCase activity history

6 years agoCRM-21052 - api_v3_CaseTest - Update more tests to be explicit about revision-history
Tim Otten [Thu, 17 Aug 2017 04:53:13 +0000 (21:53 -0700)]
CRM-21052 - api_v3_CaseTest - Update more tests to be explicit about revision-history

6 years agoMerge pull request #10851 from seamuslee001/CRM-20941
Eileen McNaughton [Wed, 16 Aug 2017 23:42:54 +0000 (19:42 -0400)]
Merge pull request #10851 from seamuslee001/CRM-20941

CRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade message…

6 years agoCRM-20941 Add in Link to blog post on bumping PHP Version
Seamus Lee [Wed, 16 Aug 2017 21:04:09 +0000 (07:04 +1000)]
CRM-20941 Add in Link to blog post on bumping PHP Version

6 years agoCRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to...
Seamus Lee [Sat, 12 Aug 2017 23:34:15 +0000 (09:34 +1000)]
CRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to 5.4 and 5.3 and alter Status Check message accordingly

6 years agoMerge pull request #10861 from eileenmcnaughton/bgm
colemanw [Wed, 16 Aug 2017 20:52:08 +0000 (16:52 -0400)]
Merge pull request #10861 from eileenmcnaughton/bgm

CRM-17281 Pledge payments: fix rounding bug with miscalculation for multiple payments against a pledge

6 years agoMerge pull request #9410 from jmcclelland/CRM-19664
Eileen McNaughton [Wed, 16 Aug 2017 20:45:18 +0000 (16:45 -0400)]
Merge pull request #9410 from jmcclelland/CRM-19664

CRM-19664 - continue with import even if one row has extid match

6 years agoMerge pull request #10862 from twomice/CRM-21058_pcp_report_event_filter
Eileen McNaughton [Wed, 16 Aug 2017 19:50:09 +0000 (15:50 -0400)]
Merge pull request #10862 from twomice/CRM-21058_pcp_report_event_filter

Fix CRM-21058: Add support for events to Personal Campaign Page Report.

6 years agoMerge pull request #10822 from amsharma9/master
Eileen McNaughton [Wed, 16 Aug 2017 16:01:58 +0000 (12:01 -0400)]
Merge pull request #10822 from amsharma9/master

Changes to Membership Renewal for issue CRM-20571

6 years agoCRM-21052 - CRM_Upgrade - If site is using activity revisions, continue doing so...
Tim Otten [Wed, 16 Aug 2017 04:30:24 +0000 (21:30 -0700)]
CRM-21052 - CRM_Upgrade - If site is using activity revisions, continue doing so by default. Otherwise, don't.

6 years agoCRM-21052 - Activity.create API - Abide by setting `civicaseActivityRevisions`
Tim Otten [Tue, 8 Aug 2017 22:53:42 +0000 (15:53 -0700)]
CRM-21052 - Activity.create API - Abide by setting `civicaseActivityRevisions`

6 years agoCRM-21052 - CRM_Admin_Form_Setting_Case - Display setting `civicaseActivityRevisions`
Tim Otten [Tue, 8 Aug 2017 22:53:03 +0000 (15:53 -0700)]
CRM-21052 - CRM_Admin_Form_Setting_Case - Display setting `civicaseActivityRevisions`

6 years agoCRM-21052 - Case.setting.php - Define new setting `civicaseActivityRevisions`
Tim Otten [Tue, 8 Aug 2017 22:52:38 +0000 (15:52 -0700)]
CRM-21052 - Case.setting.php - Define new setting `civicaseActivityRevisions`

6 years agoCRM-21052 - templates/CRM/Admin/Form/Setting/Case.tpl - Style cleanup
Tim Otten [Tue, 8 Aug 2017 22:47:28 +0000 (15:47 -0700)]
CRM-21052 - templates/CRM/Admin/Form/Setting/Case.tpl - Style cleanup

6 years agoMerge pull request #10858 from seamuslee001/move_module_data_php
Tim Otten [Wed, 16 Aug 2017 04:47:36 +0000 (21:47 -0700)]
Merge pull request #10858 from seamuslee001/move_module_data_php

CRM-20927 Migrate Upgrade code from mysql.tpl to PHP for saftey and s…

6 years agoAlter task step message as per comment from Tim
Seamus Lee [Mon, 14 Aug 2017 22:20:40 +0000 (08:20 +1000)]
Alter task step message as per comment from Tim

6 years agoCRM-20927 Migrate Upgrade code from mysql.tpl to PHP for saftey and stability
Seamus Lee [Mon, 14 Aug 2017 21:03:08 +0000 (07:03 +1000)]
CRM-20927 Migrate Upgrade code from mysql.tpl to PHP for saftey and stability

6 years agoRename var oldestPledgePayment to nextInstallmentdue.
eileen [Tue, 15 Aug 2017 20:11:33 +0000 (16:11 -0400)]
Rename var oldestPledgePayment  to  nextInstallmentdue.

I'm having serious serious issues reading this code. Renaming the variable is a step towards making sense of
it.  actually refers to the next pledge payment installment that is unpaid,
matching from the oldest

6 years agoCleanup for CRM-17821. Minor tidy ups to help me read the code
eileen [Tue, 15 Aug 2017 19:42:00 +0000 (15:42 -0400)]
Cleanup for CRM-17821. Minor tidy ups to help me read the code

6 years agoCleanup for CRM-17821. Minor tidy ups to help me read the code
eileen [Tue, 15 Aug 2017 19:42:00 +0000 (15:42 -0400)]
Cleanup for CRM-17821. Minor tidy ups to help me read the code

6 years agoCRM-17281: Pledge payments: fix rounding bug with miscalculation for multiple payment...
Mathieu Lutfy [Tue, 15 Aug 2017 19:14:07 +0000 (15:14 -0400)]
CRM-17281: Pledge payments: fix rounding bug with miscalculation for multiple payments against a pledge.

6 years agoCRM-17281 Pledge payments : fix bug with miscalculation when assigning pledge payments.
Mathieu Lutfy [Tue, 15 Aug 2017 18:54:18 +0000 (14:54 -0400)]
CRM-17281 Pledge payments : fix bug with miscalculation when assigning pledge payments.

This PR fixes a bug where payments are miscalculated with weird results. If a payment
changes the amount of future payments in such a way as to make an irregular amount
e.g 10 is split over 3 payments, the payment amount needs to be recorded as .33 not
.333333, assuming a currency with 2 decimal places. This commit
ensures the rounding takes place & is locked in by the accompanying unit test.

Note that we discussed this & agreed to use a function as a placeholder for the number
of decimal places.

6 years agoFix CRM-21058: Add support for events to Personal Campaign Page Report.
Allen Shaw [Tue, 15 Aug 2017 19:26:05 +0000 (14:26 -0500)]
Fix CRM-21058: Add support for events to Personal Campaign Page Report.

6 years agoNFC minor code simplification on comparing pledge status
eileen [Tue, 15 Aug 2017 18:21:53 +0000 (14:21 -0400)]
NFC minor code simplification on comparing pledge status

6 years agoCRM-17281: BAO test for pledge payments where the amount is greater than the usual...
Mathieu Lutfy [Thu, 9 Jun 2016 18:39:55 +0000 (18:39 +0000)]
CRM-17281: BAO test for pledge payments where the amount is greater than the usual installment amount.

6 years agoMerge pull request #10854 from agileware/patch-2
Eileen McNaughton [Tue, 15 Aug 2017 14:56:49 +0000 (10:56 -0400)]
Merge pull request #10854 from agileware/patch-2

CRM-21061 - Change report_id from 64 to 512 to match civicrm_option_v…

6 years agoMerge pull request #10855 from JKingsnorth/patch-7
Eileen McNaughton [Tue, 15 Aug 2017 14:55:56 +0000 (10:55 -0400)]
Merge pull request #10855 from JKingsnorth/patch-7

[NFC] Simplify method of getting logged in contact ID

6 years agoMerge pull request #1 from seamuslee001/agileware-patch-2
Agileware [Mon, 14 Aug 2017 20:28:03 +0000 (06:28 +1000)]
Merge pull request #1 from seamuslee001/agileware-patch-2

Regenerate DAOs and Upgrade step to fix current installs

6 years agoMerge pull request #10728 from mattwire/CRM-18082_civicase-api-custom-data
colemanw [Mon, 14 Aug 2017 17:11:08 +0000 (13:11 -0400)]
Merge pull request #10728 from mattwire/CRM-18082_civicase-api-custom-data

CRM-18082 - Allow case API create to work with custom data

6 years ago[NFC] Simplify method of getting logged in contact ID
John Kingsnorth [Mon, 14 Aug 2017 13:38:31 +0000 (14:38 +0100)]
[NFC] Simplify method of getting logged in contact ID

Use the existing utility function getLoggedInContactID, rather than loading the session and then calling get->userID.

6 years agoRegenerate DAOs and Upgrade step to fix current installs
Seamus Lee [Mon, 14 Aug 2017 09:10:54 +0000 (19:10 +1000)]
Regenerate DAOs and Upgrade step to fix current installs

6 years agoCRM-21061 - Change report_id from 64 to 512 to match civicrm_option_value
Agileware [Mon, 14 Aug 2017 07:38:17 +0000 (17:38 +1000)]
CRM-21061 - Change report_id from 64 to 512 to match civicrm_option_value

Change civicrm_report_instance, report_id from 64 characters to 512 characters to match civicrm_option_value, value to avoid errors caused by truncating CiviCRM report name which are greater than 64 chars.

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

6 years agoMerge pull request #10716 from jitendrapurohit/CRM-20933
Eileen McNaughton [Sat, 12 Aug 2017 18:20:29 +0000 (14:20 -0400)]
Merge pull request #10716 from jitendrapurohit/CRM-20933

CRM-20933 - Updating Pay later event registration from backend produc…

6 years agoMerge pull request #10661 from jitendrapurohit/CRM-20507
Eileen McNaughton [Sat, 12 Aug 2017 18:18:42 +0000 (14:18 -0400)]
Merge pull request #10661 from jitendrapurohit/CRM-20507

CRM-20507 - Allow only public custom groups to display on participant receipts

6 years agoCRM-21054 - Fix is_create_activities param for fetch_activities job (#10846)
Jitendra Purohit [Sat, 12 Aug 2017 18:17:32 +0000 (23:47 +0530)]
CRM-21054 - Fix is_create_activities param for fetch_activities job (#10846)

* Fix is_create_activities param for fetch_activities

* set create activity to always be true

6 years agoMerge pull request #10694 from dsnopek/composer-library
Tim Otten [Sat, 12 Aug 2017 07:29:32 +0000 (00:29 -0700)]
Merge pull request #10694 from dsnopek/composer-library

CRM-17652 - Update composer and Symfony for Drupal 8

6 years agoMerge pull request #10825 from mattwire/tag_deprecated_comments
Eileen McNaughton [Fri, 11 Aug 2017 22:05:23 +0000 (18:05 -0400)]
Merge pull request #10825 from mattwire/tag_deprecated_comments

CRM-21036 NFC Change comments to tags so phpstorm picks up the deprecated functions

6 years agoMerge pull request #10828 from JMAConsulting/CRM-21039
Eileen McNaughton [Fri, 11 Aug 2017 22:03:37 +0000 (18:03 -0400)]
Merge pull request #10828 from JMAConsulting/CRM-21039

CRM-21039, Trying to add Asset account relationship throws validation error

6 years agoMerge pull request #10843 from agileware/patch-1
Eileen McNaughton [Fri, 11 Aug 2017 21:54:33 +0000 (17:54 -0400)]
Merge pull request #10843 from agileware/patch-1

Update CONTRIBUTORS.txt

6 years agoMerge pull request #10848 from lcdservices/CRM-21057
colemanw [Fri, 11 Aug 2017 13:51:04 +0000 (09:51 -0400)]
Merge pull request #10848 from lcdservices/CRM-21057

CRM-21057: pass limit to retrieve all mapping values

6 years agoMerge pull request #10845 from JMAConsulting/CRM-21055
colemanw [Fri, 11 Aug 2017 13:17:57 +0000 (09:17 -0400)]
Merge pull request #10845 from JMAConsulting/CRM-21055

CRM-21055,   Change the label of cancel button to close on Contribution form

6 years agoAvoid Hidden field and get join_date value in `formRule{}`
Amal [Fri, 11 Aug 2017 06:39:59 +0000 (12:09 +0530)]
Avoid Hidden field and get join_date value in `formRule{}`

6 years agoCRM-21057: pass limit to retrieve all mapping values
Brian Shaughnessy [Fri, 11 Aug 2017 02:23:40 +0000 (22:23 -0400)]
CRM-21057: pass limit to retrieve all mapping values

6 years agoRemove blank lines
Matthew Wire [Thu, 10 Aug 2017 20:37:58 +0000 (21:37 +0100)]
Remove blank lines

6 years agoUse CRM_Utils_Array:first() for robustness
Matthew Wire [Thu, 10 Aug 2017 20:33:12 +0000 (21:33 +0100)]
Use CRM_Utils_Array:first() for robustness

6 years agoMerge pull request #10836 from JMAConsulting/CRM-21047
colemanw [Thu, 10 Aug 2017 16:48:13 +0000 (12:48 -0400)]
Merge pull request #10836 from JMAConsulting/CRM-21047

CRM-21047, fixed JS error on new contribution form

6 years agoMerge pull request #10791 from JMAConsulting/CRM-20988
colemanw [Thu, 10 Aug 2017 16:47:06 +0000 (12:47 -0400)]
Merge pull request #10791 from JMAConsulting/CRM-20988

CRM-20988,Don't display option of Export, Delete etc to users who lack that permission

6 years agoCRM-21055, Changed label of cancel button
Pradeep Nayak [Wed, 9 Aug 2017 17:23:47 +0000 (22:53 +0530)]
CRM-21055, Changed label of cancel button

----------------------------------------
* CRM-21055: Change label of cancel button
  https://issues.civicrm.org/jira/browse/CRM-21055

6 years agoUpdate CONTRIBUTORS.txt
Agileware [Thu, 10 Aug 2017 03:13:14 +0000 (13:13 +1000)]
Update CONTRIBUTORS.txt

Include names of actual Agileware team members who have submitted PRs for CiviCRM 4.7 and 4.6

6 years agoMerge pull request #10840 from MegaphoneJon/contributor-update
Tim Otten [Wed, 9 Aug 2017 19:03:44 +0000 (12:03 -0700)]
Merge pull request #10840 from MegaphoneJon/contributor-update

Update Jon Goldberg in CONTRIBUTORS.txt

6 years agoUpdate Jon Goldberg in CONTRIBUTORS.txt
Jon goldberg [Wed, 9 Aug 2017 17:55:35 +0000 (13:55 -0400)]
Update Jon Goldberg in CONTRIBUTORS.txt

6 years agoMerge pull request #10394 from JMAConsulting/DonotExport
colemanw [Wed, 9 Aug 2017 13:59:31 +0000 (09:59 -0400)]
Merge pull request #10394 from JMAConsulting/DonotExport

CRM-20615 Export only those batches whose status is exported

6 years agoMerge pull request #10837 from civicrm/4.7.24-rc
Eileen McNaughton [Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)]
Merge pull request #10837 from civicrm/4.7.24-rc

4.7.24 rc

6 years agoMerge pull request #10814 from JMAConsulting/CRM-20610-3-rc
Eileen McNaughton [Wed, 9 Aug 2017 13:28:17 +0000 (09:28 -0400)]
Merge pull request #10814 from JMAConsulting/CRM-20610-3-rc

CRM-20610: Handle payment instrument change on Payment Edit form

6 years agoCRM-21047, fixed JS error
Pradeep Nayak [Wed, 9 Aug 2017 13:14:11 +0000 (18:44 +0530)]
CRM-21047, fixed JS error

----------------------------------------
* CRM-21047: TypeError: financialtypeIds is undefined, on contribution form
  https://issues.civicrm.org/jira/browse/CRM-21047

6 years agoMerge pull request #10833 from JMAConsulting/CRM-20800-rc
colemanw [Wed, 9 Aug 2017 13:03:15 +0000 (09:03 -0400)]
Merge pull request #10833 from JMAConsulting/CRM-20800-rc

CRM-20800 : User Cannot Cancel Recurring Payment With Paypal

6 years agoWe don't need to return custom data on create
Matthew Wire [Wed, 9 Aug 2017 08:32:54 +0000 (09:32 +0100)]
We don't need to return custom data on create

6 years agoCRM-20800 : User Cannot Cancel Recurring Payment With Paypal
deb.monish [Wed, 9 Aug 2017 07:57:31 +0000 (13:27 +0530)]
CRM-20800 : User Cannot Cancel Recurring Payment With Paypal

6 years agoMerge pull request #10793 from eileenmcnaughton/tpl
Monish Deb [Wed, 9 Aug 2017 06:54:10 +0000 (12:24 +0530)]
Merge pull request #10793 from eileenmcnaughton/tpl

CRM-20990 add contributionStatus to online template

6 years agoMerge pull request #10427 from mattwire/report_bounce_type
Eileen McNaughton [Wed, 9 Aug 2017 00:11:52 +0000 (12:11 +1200)]
Merge pull request #10427 from mattwire/report_bounce_type

CRM-20643 Fix invalid bounce type filter for bounce report

6 years agoMerge pull request #10824 from seamuslee001/CRM-21026
Eileen McNaughton [Wed, 9 Aug 2017 00:03:31 +0000 (12:03 +1200)]
Merge pull request #10824 from seamuslee001/CRM-21026

CRM-21026 fix issue with ContributionCount not including disabled fin…

6 years agoMerge pull request #10827 from mattwire/CRM-17157_support_multiple_decimalplaces_form...
Eileen McNaughton [Tue, 8 Aug 2017 23:51:12 +0000 (11:51 +1200)]
Merge pull request #10827 from mattwire/CRM-17157_support_multiple_decimalplaces_formrule_money

CRM-17157 support multiple decimalplaces formrule money

6 years agoRevert usage of dirname()'s 2nd argument to support PHP version used by Jenkins
David Snopek [Tue, 8 Aug 2017 21:08:17 +0000 (16:08 -0500)]
Revert usage of dirname()'s 2nd argument to support PHP version used by Jenkins

6 years agoMerge pull request #10817 from JMAConsulting/CRM-21005
colemanw [Tue, 8 Aug 2017 02:51:57 +0000 (22:51 -0400)]
Merge pull request #10817 from JMAConsulting/CRM-21005

CRM-21005, "Record Payment" dialogue lacks required field and is clunky

6 years agoMinor comment fixes and further reduction of passing by reference with changing to...
Seamus Lee [Mon, 7 Aug 2017 21:30:43 +0000 (07:30 +1000)]
Minor comment fixes and further reduction of passing by reference with changing to new wrapper functions

6 years agoDon't use ts for exceptions
Matthew Wire [Mon, 7 Aug 2017 15:20:08 +0000 (16:20 +0100)]
Don't use ts for exceptions

6 years agoUse 2nd argument of dirname() and add a comment explaining paths.
David Snopek [Mon, 7 Aug 2017 14:11:09 +0000 (09:11 -0500)]
Use 2nd argument of dirname() and add a comment explaining paths.

6 years agoMerge pull request #10818 from eileenmcnaughton/recur_date
Monish Deb [Mon, 7 Aug 2017 12:03:48 +0000 (17:33 +0530)]
Merge pull request #10818 from eileenmcnaughton/recur_date

CRM-21027 Fix next recurring payment not accurately calculated

6 years agoCRM-21039, Retrieve relationship using entity table
Pradeep Nayak [Mon, 7 Aug 2017 11:01:09 +0000 (16:31 +0530)]
CRM-21039, Retrieve relationship using entity table

----------------------------------------
* CRM-21039: Trying to add Asset account relationship throws validation error
  https://issues.civicrm.org/jira/browse/CRM-21039

fixed style warning

6 years agoAdd unit tests for case create api custom data
Matthew Wire [Mon, 7 Aug 2017 11:33:28 +0000 (12:33 +0100)]
Add unit tests for case create api custom data

6 years agocontact_id is optional when updating case, this change allows existing Case unit...
Matthew Wire [Mon, 7 Aug 2017 11:20:41 +0000 (12:20 +0100)]
contact_id is optional when updating case, this change allows existing Case unit tests to pass

6 years agoCheckstyle
Matthew Wire [Mon, 7 Aug 2017 11:08:25 +0000 (12:08 +0100)]
Checkstyle

6 years agoAdd unit test
Matthew Wire [Mon, 7 Aug 2017 10:56:14 +0000 (11:56 +0100)]
Add unit test

6 years agoSupport multiple decimal places in CRM_Utils_Rule::money for currencies such as bitco...
Matthew Wire [Mon, 7 Aug 2017 10:44:32 +0000 (11:44 +0100)]
Support multiple decimal places in CRM_Utils_Rule::money for currencies such as bitcoin, also helps towards CRM-20772 which requires higher precision decimals to be stored in the database to calculate tax inclusive amounts correctly

6 years agoStyle warning
Matthew Wire [Mon, 7 Aug 2017 10:34:16 +0000 (11:34 +0100)]
Style warning

6 years agoFix style warnings
Matthew Wire [Mon, 7 Aug 2017 10:31:22 +0000 (11:31 +0100)]
Fix style warnings

6 years agoAdd deprecated label to case update api function
Matthew Wire [Mon, 7 Aug 2017 10:24:50 +0000 (11:24 +0100)]
Add deprecated label to case update api function

6 years agoRefactor based on comments from @davialexandre
Matthew Wire [Mon, 7 Aug 2017 10:20:54 +0000 (11:20 +0100)]
Refactor based on comments from @davialexandre

6 years agoChange comments to tags so phpstorm picks up the deprecated functions
Matthew Wire [Mon, 7 Aug 2017 08:52:55 +0000 (09:52 +0100)]
Change comments to tags so phpstorm picks up the deprecated functions

6 years agoadditional fix
deb.monish [Mon, 7 Aug 2017 08:42:53 +0000 (14:12 +0530)]
additional fix

6 years agoCode updates as per Eileen
Seamus Lee [Mon, 7 Aug 2017 06:31:31 +0000 (16:31 +1000)]
Code updates as per Eileen

6 years agoAttempt to get rid of pasing by reference and change variable as needed
Seamus Lee [Mon, 7 Aug 2017 01:08:19 +0000 (11:08 +1000)]
Attempt to get rid of pasing by reference and change variable as needed

6 years agoCRM-21026 fix issue with ContributionCount not including disabled financialtypes
Seamus Lee [Sun, 6 Aug 2017 22:53:57 +0000 (08:53 +1000)]
CRM-21026 fix issue with ContributionCount not including disabled financialtypes

Fix references and move flushing of cache to all financialTypes for the safe side

6 years agoMerge pull request #10823 from mattwire/CRM-21031_financialtypedisplay
Eileen McNaughton [Sun, 6 Aug 2017 21:49:58 +0000 (09:49 +1200)]
Merge pull request #10823 from mattwire/CRM-21031_financialtypedisplay

CRM-21031 Fix for id instead of financialtype name

6 years agoFix for id instead of financialtype name
Matthew Wire [Sun, 6 Aug 2017 19:49:38 +0000 (20:49 +0100)]
Fix for id instead of financialtype name

6 years agoMerge pull request #10801 from JMAConsulting/CRM-13309
Eileen McNaughton [Sat, 5 Aug 2017 23:59:42 +0000 (11:59 +1200)]
Merge pull request #10801 from JMAConsulting/CRM-13309

CRM-13309: Participant Role on Event's Schedule Reminder form does not populate

6 years agotest build failure fix
deb.monish [Fri, 4 Aug 2017 17:40:03 +0000 (23:10 +0530)]
test build failure fix

6 years agoRemoved spaces
Amal [Sat, 5 Aug 2017 13:58:28 +0000 (19:28 +0530)]
Removed spaces

6 years agoChanges to Membership Renewal for issue CRM-20571
Amal [Sat, 5 Aug 2017 07:00:47 +0000 (12:30 +0530)]
Changes to Membership Renewal for issue CRM-20571

6 years agoMerge pull request #10812 from kainukempowerment/keikelboom-civicoop
Tim Otten [Fri, 4 Aug 2017 22:59:02 +0000 (15:59 -0700)]
Merge pull request #10812 from kainukempowerment/keikelboom-civicoop

Klaas Eikelboom (Kainuk Empowerment) is member of CiviCooP

6 years agoMerge pull request #10820 from JMAConsulting/CRM-21029
colemanw [Fri, 4 Aug 2017 22:00:39 +0000 (18:00 -0400)]
Merge pull request #10820 from JMAConsulting/CRM-21029

CRM-21029 - Report - Fix Activity Report SQL Syntax Error

6 years agoMerge pull request #10813 from JMAConsulting/CRM-21019
colemanw [Fri, 4 Aug 2017 20:37:50 +0000 (16:37 -0400)]
Merge pull request #10813 from JMAConsulting/CRM-21019

CRM-21019, Changed column labels on batch transaction listing page