colemanw [Wed, 23 Aug 2017 23:49:08 +0000 (19:49 -0400)]
Merge pull request #10893 from twomice/CRM-21099_canceled_refunded_label
Fix CRM-21099.
Eileen McNaughton [Wed, 23 Aug 2017 21:57:02 +0000 (09:57 +1200)]
Merge pull request #10718 from JMAConsulting/CRM-20936
CRM-20936: Hide statuses on backoffice contribution form
Eileen McNaughton [Wed, 23 Aug 2017 21:45:09 +0000 (09:45 +1200)]
Merge pull request #10628 from jitendrapurohit/CRM-20838
CRM-20838 - Add check for missing log tables on system status
Eileen McNaughton [Wed, 23 Aug 2017 21:43:23 +0000 (09:43 +1200)]
Merge pull request #10896 from civicrm/4.7.24-rc
4.7.24 rc
Eileen McNaughton [Wed, 23 Aug 2017 21:41:39 +0000 (09:41 +1200)]
Merge pull request #10895 from seamuslee001/CRM-21100-rc
CRM-21100 Hotfix to ensure that testGroup list is still the same as p…
Seamus Lee [Wed, 23 Aug 2017 20:46:34 +0000 (06:46 +1000)]
CRM-21100 Hotfix to ensure that testGroup list is still the same as previous, need to work on converting to AJAX list
Eileen McNaughton [Wed, 23 Aug 2017 20:28:38 +0000 (08:28 +1200)]
Merge pull request #10405 from agh1/crm-19612
CRM-19612 Fix temp table problems caused by union
colemanw [Wed, 23 Aug 2017 19:35:47 +0000 (15:35 -0400)]
Merge pull request #10891 from laryn/BackdropCSS2
CRM-21095: Alternate "more Civi-ish" approach to add Backdrop CSS
colemanw [Wed, 23 Aug 2017 19:34:31 +0000 (15:34 -0400)]
Merge pull request #10759 from davejenx/CRM-20966
CRM-20966: Do not create membership_payment record for inherited membership (when two memberships created in back end via price set).
colemanw [Wed, 23 Aug 2017 19:34:08 +0000 (15:34 -0400)]
Merge pull request #10745 from davejenx/CRM-20955
CRM-20955 - Allow contact's second membership to inherit when created…
Allen Shaw [Wed, 23 Aug 2017 18:25:46 +0000 (13:25 -0500)]
Fix CRM-21099.
laryn [Wed, 23 Aug 2017 14:29:17 +0000 (09:29 -0500)]
Clean whitespace
laryn [Wed, 23 Aug 2017 14:24:51 +0000 (09:24 -0500)]
CRM-21095: Alternate 'more Civi-ish' approach
deb.monish [Fri, 4 Aug 2017 19:58:35 +0000 (01:28 +0530)]
additional fixes
deb.monish [Fri, 21 Jul 2017 12:00:16 +0000 (17:30 +0530)]
CRM-20936: Hide statuses on backoffice contribution form
Monish Deb [Wed, 23 Aug 2017 11:07:55 +0000 (16:37 +0530)]
Merge pull request #10700 from alifrumin/participantnote
CRM-20914 updating data type for participant note to be consistent wi…
Monish Deb [Wed, 23 Aug 2017 10:32:40 +0000 (16:02 +0530)]
Merge pull request #10832 from jitendrapurohit/CRM-21045
CRM-21045: Multiple email field shown on Contribution Page.
Jitendra Purohit [Wed, 23 Aug 2017 09:36:22 +0000 (15:06 +0530)]
add new api and unit test
Eileen McNaughton [Wed, 23 Aug 2017 03:11:17 +0000 (15:11 +1200)]
Merge pull request #10830 from jitendrapurohit/CRM-21043
CRM-21043 - Dupe check of on behalf organisation not working
Eileen McNaughton [Wed, 23 Aug 2017 03:05:10 +0000 (15:05 +1200)]
Merge pull request #10853 from seanmadsen/docs-contributing
(NFC) Improve docs in CONTRIBUTING.md
jmcclelland [Wed, 23 Aug 2017 02:17:08 +0000 (22:17 -0400)]
WIP CRM-20840 - ensure no receipt for recur payment if contrib page says … (#10850)
* CRM-20840 - Add unit test to ensure no receipt for recur payment if contrib page says no receipt
(bug fixed elsewhere)
* CRM-20840 - ensure unique address are sent to authorize.net
* CRM-20840 - argument should be optional to avoid breakage elsewhere.
Laryn - CEDC.org [Tue, 22 Aug 2017 21:35:27 +0000 (16:35 -0500)]
Merge pull request #4 from civicrm/master
Catching up w/ core
colemanw [Tue, 22 Aug 2017 21:00:07 +0000 (17:00 -0400)]
Merge pull request #10839 from MegaphoneJon/CRM-21049
CRM-21049 - Allow creating relationship types with no contact type specified
Eileen McNaughton [Tue, 22 Aug 2017 04:27:20 +0000 (16:27 +1200)]
Merge pull request #10878 from seamuslee001/contact_edit_notices
CRM-21075 Replace call to CRM_Core_OptionGroup::getValue with CRM_Cor…
Eileen McNaughton [Tue, 22 Aug 2017 00:29:51 +0000 (12:29 +1200)]
Merge pull request #10885 from MegaphoneJon/CRM-21089
CRM-21089 - CiviSurvey - Fix fatal error on 'Interview Respondents'
Eileen McNaughton [Mon, 21 Aug 2017 23:37:20 +0000 (11:37 +1200)]
Merge pull request #10705 from eileenmcnaughton/kill_switch_setting
CRM-20905: Make (simple_mail_limit) a configuration instead of h…
Eileen McNaughton [Mon, 21 Aug 2017 22:12:23 +0000 (10:12 +1200)]
Merge pull request #10881 from civicrm/4.7.24-rc
4.7.24 rc
colemanw [Mon, 21 Aug 2017 20:53:40 +0000 (16:53 -0400)]
Merge pull request #10884 from laryn/BackdropCalls
CRM-21088: Changing drupal calls to backdrop calls
Jon goldberg [Mon, 21 Aug 2017 20:32:04 +0000 (16:32 -0400)]
CRM-21089 - CiviSurvey - Fix fatal error on 'Interview Respondents'
laryn [Mon, 21 Aug 2017 19:33:49 +0000 (14:33 -0500)]
CRM-21088: Changing drupal calls to backdrop calls
Monish Deb [Mon, 21 Aug 2017 11:19:08 +0000 (16:49 +0530)]
Merge pull request #10749 from eileenmcnaughton/ipn
CRM-19186 / CRM-20959 Subsequent Installments of Recurring Credit Card Contributions Indicate a Payment Instrument of Check
Monish Deb [Mon, 21 Aug 2017 10:34:11 +0000 (16:04 +0530)]
Merge pull request #10871 from mattwire/CRM-21078_message_template_form
CRM-21078 Allow user to save and continue editing message template
Eileen McNaughton [Mon, 21 Aug 2017 08:11:20 +0000 (20:11 +1200)]
Merge pull request #10880 from seamuslee001/CRM-21070
CRM-21070 Remove reference to outdated template url file
Seamus Lee [Mon, 21 Aug 2017 07:19:05 +0000 (17:19 +1000)]
CRM-21070 Remove reference to outdated template url file
Eileen McNaughton [Mon, 21 Aug 2017 05:17:11 +0000 (22:17 -0700)]
Merge pull request #10867 from totten/master-stack-test
(NFC) SettingsStack - Add test coverage for new helper class
Eileen McNaughton [Mon, 21 Aug 2017 05:16:11 +0000 (22:16 -0700)]
Merge pull request #10651 from jitendrapurohit/CRM-19739
CRM-19739 : New Account Relationship Option Screen does not show excep…
Eileen McNaughton [Mon, 21 Aug 2017 05:06:09 +0000 (22:06 -0700)]
Merge pull request #10835 from jitendrapurohit/CRM-21015
CRM-21015 - Fix recurring contribution creation if not checked on mai…
Eileen McNaughton [Mon, 21 Aug 2017 05:01:29 +0000 (22:01 -0700)]
Merge pull request #10869 from MegaphoneJon/4.7.24-rc
CRM-21076 - ACL Role Assignments aren't browseable
Eileen McNaughton [Mon, 21 Aug 2017 04:57:42 +0000 (21:57 -0700)]
Merge pull request #10797 from agileware/CIVICRM-230
CIVICRM-230 CRM-17040 Import Contributions using External Ids causes …
Seamus Lee [Sat, 19 Aug 2017 00:14:27 +0000 (10:14 +1000)]
CRM-21075 Replace call to CRM_Core_OptionGroup::getValue with CRM_Core_PseudoConstant::getKey in CommunicationsPreferences edit
Justin Freeman [Fri, 18 Aug 2017 21:57:53 +0000 (07:57 +1000)]
CIVICRM-230 CRM-17040 Add unit tests for CRM-17040
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
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
Matthew Wire [Fri, 18 Aug 2017 15:05:00 +0000 (16:05 +0100)]
Fix formRule. Replace fatal with statusBounce when file cannot be uploaded
Matthew Wire [Thu, 17 Aug 2017 19:46:59 +0000 (20:46 +0100)]
Add a save button that saves and allows you to continue editing the same template
Matthew Wire [Thu, 17 Aug 2017 19:03:21 +0000 (20:03 +0100)]
Clean up message template form code
Jitendra Purohit [Fri, 18 Aug 2017 09:28:27 +0000 (14:58 +0530)]
add additional params to test
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…
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
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
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
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
Jon goldberg [Thu, 17 Aug 2017 16:39:31 +0000 (12:39 -0400)]
CRM-21076 - ACL Role Assignments aren't browseable
Tim Otten [Thu, 17 Aug 2017 17:25:08 +0000 (10:25 -0700)]
(NFC) SettingsStack - Add test coverage for new helper
This class was recently added as a helper for another unit-test, but it
didn't have its own coverage. This is a quick/simple test for it.
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
Jitendra Purohit [Thu, 17 Aug 2017 06:25:12 +0000 (11:55 +0530)]
Style fix and move success msg
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
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…
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
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
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
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
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.
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
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.
Tim Otten [Tue, 8 Aug 2017 22:53:42 +0000 (15:53 -0700)]
CRM-21052 - Activity.create API - Abide by 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`
Tim Otten [Tue, 8 Aug 2017 22:52:38 +0000 (15:52 -0700)]
CRM-21052 - Case.setting.php - Define new setting `civicaseActivityRevisions`
Tim Otten [Tue, 8 Aug 2017 22:47:28 +0000 (15:47 -0700)]
CRM-21052 - templates/CRM/Admin/Form/Setting/Case.tpl - Style cleanup
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…
Seamus Lee [Mon, 14 Aug 2017 22:20:40 +0000 (08:20 +1000)]
Alter task step message as per comment from Tim
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
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
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
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
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.
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.
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.
eileen [Tue, 15 Aug 2017 18:21:53 +0000 (14:21 -0400)]
NFC minor code simplification on comparing pledge status
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.
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…
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
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
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
Jitendra Purohit [Mon, 14 Aug 2017 16:03:33 +0000 (21:33 +0530)]
replace setStatus with statusBounce
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.
Seamus Lee [Mon, 14 Aug 2017 09:10:54 +0000 (19:10 +1000)]
Regenerate DAOs and Upgrade step to fix current installs
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
Sean Madsen [Sun, 13 Aug 2017 19:11:22 +0000 (13:11 -0600)]
Improve docs in CONTRIBUTING.md
This ia a non-functional
change. In https://github.com/civicrm/civicrm-dev-docs/pull/275
I migrated some of the content from CONTRIBUTING.md into the
Developer Guide. This commit removes that content from
CONTRIBUTING.md and puts hyerlinks in its place.
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…
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
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
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
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
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
Eileen McNaughton [Fri, 11 Aug 2017 21:54:33 +0000 (17:54 -0400)]
Merge pull request #10843 from agileware/patch-1
Update CONTRIBUTORS.txt
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
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
Amal [Fri, 11 Aug 2017 06:39:59 +0000 (12:09 +0530)]
Avoid Hidden field and get join_date value in `formRule{}`
Brian Shaughnessy [Fri, 11 Aug 2017 02:23:40 +0000 (22:23 -0400)]
CRM-21057: pass limit to retrieve all mapping values