eileen [Mon, 19 Mar 2018 03:18:18 +0000 (16:18 +1300)]
Revert "CRM-8140: Not possible to select fields for export when using Custom Searches"
This reverts commit
ce40afac219b38872fef1d8f052c38d85667db79.
CiviCRM [Thu, 15 Mar 2018 23:06:29 +0000 (23:06 +0000)]
set-version.php - Fix for running on uninitialized codebase
The script assumes that `civicrm-version.php` is around. It will eventually be
committed, and it's available if you ran GenCode, but it's not *necessarily*
around yet.
CiviCRM [Thu, 15 Mar 2018 23:05:08 +0000 (23:05 +0000)]
Downgrade number from 5.0.0 to 5.0.beta1
We're about to branch for RC period. Since we've got the third digit again
(for use in each monthly cycle), let's take advantage of it!
Eileen McNaughton [Thu, 15 Mar 2018 11:20:17 +0000 (00:20 +1300)]
Merge pull request #11815 from eileenmcnaughton/notice
Activity Form - Fix recently introduced warning
Eileen McNaughton [Thu, 15 Mar 2018 07:48:20 +0000 (20:48 +1300)]
Merge pull request #11519 from eileenmcnaughton/hook
CRM-21659 - Add hook to CRM_Utils_System::redirect
Tim Otten [Thu, 15 Mar 2018 05:19:49 +0000 (22:19 -0700)]
CRM_Utils_Hook::alterRedirect - Pass URL by reference
PSR-7 specifies that the `UriInterface` is immutable. There are methods
like `withQuery(...)` which generate a *new instance*.
For the hook to support altering the URL, you must be able to replace the
`$url` with a newer instance.
eileen [Thu, 15 Mar 2018 04:21:44 +0000 (17:21 +1300)]
Warning fix
Eileen McNaughton [Thu, 15 Mar 2018 02:28:25 +0000 (15:28 +1300)]
Merge pull request #11813 from seanmadsen/add-survey-pre-post-hooks
Add pre and post hooks to the Survey entity
Eileen McNaughton [Wed, 14 Mar 2018 22:59:14 +0000 (11:59 +1300)]
Merge pull request #11811 from mukeshcompucorp/fix-template-structure-issues
Fix transaction template
Eileen McNaughton [Wed, 14 Mar 2018 22:32:14 +0000 (11:32 +1300)]
Merge pull request #11704 from totten/master-50
dev/release/1 - Change numbering to 5.x.x
Sean Madsen [Wed, 14 Mar 2018 21:31:47 +0000 (17:31 -0400)]
Add pre/post hooks to the Survey entity
Also improve docblock
Eileen McNaughton [Wed, 14 Mar 2018 21:04:35 +0000 (10:04 +1300)]
Merge pull request #11808 from mattwire/CRM-21391_find_respondents_fix
CRM-21391 Fix for "Find Respondents" Search
Matthew Wire [Wed, 14 Mar 2018 11:50:48 +0000 (11:50 +0000)]
CRM-21391 Fix 'Find Respondents' Search Tasks
Mukesh Ram [Wed, 14 Mar 2018 11:36:04 +0000 (17:06 +0530)]
Fix transaction templates
eileen [Wed, 14 Mar 2018 02:00:15 +0000 (15:00 +1300)]
CRM-21659 Add hook to CRM_Utils_System::redirect
fixup CRM-21659 Add hook to CRM_Utils_System::redirect
This renames the hook function to be stylistically more consistent. In
other tests, the function name matches the hook name.
Tim Otten [Wed, 21 Feb 2018 23:41:21 +0000 (15:41 -0800)]
Set version to 5.0.0
colemanw [Tue, 13 Mar 2018 13:06:12 +0000 (09:06 -0400)]
Merge pull request #11721 from eileenmcnaughton/website
Fix relationshipType, paymentProcessorType, Note & jobLog apis to support custom data
colemanw [Tue, 13 Mar 2018 13:02:06 +0000 (09:02 -0400)]
Merge pull request #11590 from michaelmcandrew/CRM-21576-sms-permission
CRM-21576 Add a 'send SMS' permission
colemanw [Tue, 13 Mar 2018 12:10:45 +0000 (08:10 -0400)]
Merge pull request #11796 from mukeshcompucorp/fix-template-structure-issues
Fix html template structure with classes, divs & tags
Michael McAndrew [Tue, 13 Mar 2018 09:18:36 +0000 (09:18 +0000)]
Adding Send SMS permission + test + upgrade message
Monish Deb [Tue, 13 Mar 2018 07:47:00 +0000 (13:17 +0530)]
Merge pull request #11801 from eileenmcnaughton/api_test
Add test for api money, fix net_amount calc
Eileen McNaughton [Tue, 13 Mar 2018 07:20:02 +0000 (20:20 +1300)]
Merge pull request #11802 from jitendrapurohit/CRM-21777-ts
CRM-21777 - add ts to the message string
Mukesh Ram [Tue, 13 Mar 2018 05:35:18 +0000 (11:05 +0530)]
Call labels from logic instead of static
Jitendra Purohit [Tue, 13 Mar 2018 05:13:43 +0000 (10:43 +0530)]
CRM-21777 - add ts to the message string
eileen [Tue, 13 Mar 2018 03:24:23 +0000 (16:24 +1300)]
Add test for api money, fix net_amount calc
Eileen McNaughton [Tue, 13 Mar 2018 01:04:10 +0000 (14:04 +1300)]
Merge pull request #11781 from colemanw/MenuHacks
Remove hacks from CRM_Core_Menu for old unsupported versions
Eileen McNaughton [Mon, 12 Mar 2018 23:36:11 +0000 (12:36 +1300)]
Merge pull request #11799 from eileenmcnaughton/enotice
E-notice fix.
eileen [Mon, 12 Mar 2018 08:02:29 +0000 (21:02 +1300)]
E-notice fix - move variable declaration to parent class.
I hit this when editing a contribution with line items related to membership.
colemanw [Mon, 12 Mar 2018 19:57:26 +0000 (15:57 -0400)]
Merge pull request #11800 from GinkgoFJG/patch-2
CRM-21667: Fix for timezone handoff from Drupal6 should take DST into account.
Mathieu Lu [Mon, 12 Mar 2018 18:51:29 +0000 (14:51 -0400)]
Merge pull request #11777 from twomice/CRM-20608_paypal_ipn_confuses_pro_vs_standard
CRM-20608: IPN thinks Paypal Pro is Standard.
Frank J. Gómez [Mon, 12 Mar 2018 17:04:36 +0000 (13:04 -0400)]
CRM-21667: Fix for timezone handoff from Drupal6 should take DST into account
Allen Shaw [Mon, 12 Mar 2018 16:11:45 +0000 (11:11 -0500)]
Fix for CRM-20608: throw exception in case of not-found processor or wrong processor type.
Eileen McNaughton [Mon, 12 Mar 2018 09:06:14 +0000 (22:06 +1300)]
Merge pull request #11795 from mattwire/form_disabled_currency
dev/financial/5 If a currency has been disabled allow the form to be submitted
Seamus Lee [Mon, 12 Mar 2018 04:06:26 +0000 (15:06 +1100)]
Merge pull request #11798 from eileenmcnaughton/test
Update test to NOT accept a failure in the api call.
Eileen McNaughton [Mon, 12 Mar 2018 04:00:36 +0000 (17:00 +1300)]
Merge pull request #11680 from jitendrapurohit/setting
CRM-21777 - Set readonly for the fields initialised in civicrm_settings.php
Eileen McNaughton [Mon, 12 Mar 2018 03:34:01 +0000 (16:34 +1300)]
Merge pull request #11761 from mattwire/CRM-21391_mailing_task
CRM-21391 Convert Mailing to use core Task class
Eileen McNaughton [Mon, 12 Mar 2018 03:22:30 +0000 (16:22 +1300)]
Merge pull request #11762 from mattwire/CRM-21391_member_task
CRM-21391 Convert Member to use core Task class
eileen [Mon, 12 Mar 2018 02:27:44 +0000 (15:27 +1300)]
Update test to NOT accept a failure in the api call.
I believe the failure handling exists because this was copied from a test that
uses a real payment gateway's sandbox account, hence intermittant failure.
However, we don't need that for the Dummy processor & it's making debugging hard
Eileen McNaughton [Sun, 11 Mar 2018 22:17:57 +0000 (11:17 +1300)]
Merge pull request #11780 from JMAConsulting/CRM-21756
CRM-21756: Freeze total amount field on Edit Contribution if related to Membership or Event registration
Eileen McNaughton [Sun, 11 Mar 2018 22:06:51 +0000 (11:06 +1300)]
Merge pull request #11763 from mattwire/CRM-21391_pledge_task
CRM-21391 Convert Pledge to use core Task class
Eileen McNaughton [Sun, 11 Mar 2018 21:39:29 +0000 (10:39 +1300)]
Merge pull request #11776 from vinuvarshith/CRM-21830-state-province-tokens-not-working-billing-address
CRM-21830: Add 'state_province_name' token and set appropriate value …
Eileen McNaughton [Sun, 11 Mar 2018 21:32:30 +0000 (10:32 +1300)]
Merge pull request #11600 from mattwire/CRM-21720_core_task_search_classes
CRM-21720 Cleanup search classes to use enumerators instead of hardcoded values
Matthew Wire [Sun, 11 Mar 2018 21:31:52 +0000 (21:31 +0000)]
Convert Contact to use core Task class (#11764)
Matthew Wire [Sun, 11 Mar 2018 21:23:52 +0000 (21:23 +0000)]
Add contributionStatusName to invoice params so you don't have to use hardcoded IDs in template (#11771)
Mukesh Ram [Sat, 10 Mar 2018 11:02:03 +0000 (16:32 +0530)]
Fix template structure
Tim Otten [Sat, 10 Mar 2018 01:30:45 +0000 (17:30 -0800)]
Merge pull request #11769 from JMAConsulting/CRM-21806
[REGRESSION] CRM-21806: Fix issues is search form when FULL_GROUP_BY_MODE enabled
colemanw [Fri, 9 Mar 2018 15:09:10 +0000 (10:09 -0500)]
Merge pull request #11790 from GinkgoFJG/dev/core#12-crmWizard-scrollup
dev/core#12: Added auto-scroll-up functionality between steps to crmUiWizard
colemanw [Fri, 9 Mar 2018 14:36:45 +0000 (09:36 -0500)]
Merge pull request #11792 from mukeshcompucorp/fix-template-structure-issues
Fix style glitches
Mathieu Lu [Fri, 9 Mar 2018 14:21:19 +0000 (09:21 -0500)]
Merge pull request #11793 from cor73x/CRM-21837
Refs CRM-21837 - Missing states for Gabon
Matthew Wire [Fri, 9 Mar 2018 11:39:51 +0000 (11:39 +0000)]
If a currency has been disabled allow the form to be submitted
Mukesh Ram [Fri, 9 Mar 2018 10:10:06 +0000 (15:40 +0530)]
Fix classes and tags
Lukasz Krutul [Fri, 9 Mar 2018 10:07:15 +0000 (11:07 +0100)]
Refs CRM-21837 - Missing states for Gabon
Mukesh Ram [Fri, 9 Mar 2018 07:21:39 +0000 (12:51 +0530)]
Make pledge labels proper
Mukesh Ram [Fri, 9 Mar 2018 06:10:11 +0000 (11:40 +0530)]
Add appropriate labels
Mukesh Ram [Fri, 9 Mar 2018 04:42:17 +0000 (10:12 +0530)]
Fix style glitches
Tim Otten [Fri, 9 Mar 2018 00:04:47 +0000 (16:04 -0800)]
Merge pull request #11791 from civicrm/4.7.31-rc
4.7.31 rc
Frank J. Gómez [Thu, 8 Mar 2018 20:39:36 +0000 (15:39 -0500)]
dev/core#12: Added auto-scroll-up functionality between steps to crmUiWizard.
colemanw [Thu, 8 Mar 2018 14:24:20 +0000 (09:24 -0500)]
Merge pull request #11788 from mukeshcompucorp/fix-template-structure-issues
Make template structure proper
Mukesh Ram [Thu, 8 Mar 2018 13:00:25 +0000 (18:30 +0530)]
Make template structure proper
Tim Otten [Wed, 7 Mar 2018 23:39:57 +0000 (15:39 -0800)]
Merge pull request #11741 from agh1/4.7.31-releasenotes
4.7.31 release notes
Andrew Hunt [Wed, 7 Mar 2018 20:22:41 +0000 (15:22 -0500)]
4.7.31 release notes: last-minute credit add
Andrew Hunt [Wed, 7 Mar 2018 19:56:58 +0000 (14:56 -0500)]
4.7.31 release notes: fixed one mis-categorized thing
Andrew Hunt [Wed, 7 Mar 2018 17:03:48 +0000 (12:03 -0500)]
4.7.31 release notes: alphabetized sections and filled synopsis
Also added late change
Andrew Hunt [Wed, 7 Mar 2018 16:59:56 +0000 (11:59 -0500)]
4.7.31 release notes: finished bugs
Andrew Hunt [Wed, 7 Mar 2018 02:59:34 +0000 (21:59 -0500)]
4.7.31 release notes: added code contributors since 4.7.14 to CONTRIBUTORS.txt
Andrew Hunt [Wed, 7 Mar 2018 01:44:23 +0000 (20:44 -0500)]
4.7.31 release notes: finished contributors
Andrew Hunt [Wed, 7 Mar 2018 00:26:51 +0000 (19:26 -0500)]
4.7.31 release notes: done with features
Andrew Hunt [Wed, 28 Feb 2018 17:23:51 +0000 (12:23 -0500)]
4.7.31 release notes: first items, boilerplate
colemanw [Wed, 7 Mar 2018 16:51:46 +0000 (11:51 -0500)]
Merge pull request #11779 from mukeshcompucorp/fix-template-structure-issues
Fix template structure
colemanw [Wed, 7 Mar 2018 16:18:38 +0000 (11:18 -0500)]
Merge pull request #11774 from colemanw/NFC
NFC - Minor code cleanup in CKEditorConfig.php
Coleman Watts [Wed, 7 Mar 2018 16:15:19 +0000 (11:15 -0500)]
Remove hacks from CRM_Core_Menu for old unsupported versions
deb.monish [Wed, 7 Mar 2018 14:03:27 +0000 (19:33 +0530)]
CRM-21756: Freeze total amount field on Edit Contribution if related to membership or Event registration
Mukesh Ram [Wed, 7 Mar 2018 11:50:23 +0000 (17:20 +0530)]
Add proper class to form
Mukesh Ram [Wed, 7 Mar 2018 11:00:24 +0000 (16:30 +0530)]
Fix template structure
Allen Shaw [Wed, 7 Mar 2018 04:38:57 +0000 (22:38 -0600)]
Fix for CRM-20608: IPN thinks Paypal Pro is Standard.
Aniessh Sethh [Wed, 7 Mar 2018 03:30:53 +0000 (09:00 +0530)]
CRM-21813 : Parameter list mismatch (#11734)
* Fix for CRM-21813
varshith89 [Wed, 7 Mar 2018 03:04:59 +0000 (03:04 +0000)]
CRM-21830: Add 'state_province_name' token and set appropriate value to it so that it is not empty for billing address
colemanw [Wed, 7 Mar 2018 02:24:13 +0000 (21:24 -0500)]
Merge pull request #11775 from agh1/cancel-fa-fixes
CiviMember: use `fa-ban`, proper `crm-i` class for canceled auto-renew
Andrew Hunt [Tue, 6 Mar 2018 21:33:03 +0000 (16:33 -0500)]
CiviMember: use `fa-ban`, proper `crm-i` class for canceled auto-renew
Coleman Watts [Tue, 6 Mar 2018 20:49:00 +0000 (15:49 -0500)]
NFC - Minor code cleanup in CKEditorConfig.php
Seamus Lee [Tue, 6 Mar 2018 20:13:02 +0000 (07:13 +1100)]
Merge pull request #11773 from civicrm/4.7.31-rc
4.7.31 rc
Seamus Lee [Tue, 6 Mar 2018 20:10:28 +0000 (07:10 +1100)]
Merge pull request #11749 from eileenmcnaughton/4.7.31-rc
CRM-21771: error when viewing event registration with linked contribu…
colemanw [Tue, 6 Mar 2018 14:34:31 +0000 (09:34 -0500)]
Merge pull request #11770 from mattwire/messagetemplate_form_fixes
Add 'huge' class to html textarea to match plaintext textarea
deb.monish [Tue, 6 Mar 2018 07:28:57 +0000 (12:58 +0530)]
CRM-21806: Fix issues is search form when FULL_GROUP_BY_MODE enabled
Matthew Wire [Tue, 6 Mar 2018 09:53:58 +0000 (09:53 +0000)]
Add 'huge' class to html textarea to match plaintext textarea
Monish Deb [Tue, 6 Mar 2018 05:05:03 +0000 (10:35 +0530)]
Merge pull request #11757 from eileenmcnaughton/manual
CRM-21819 - Do not load 'Submit Credit Card Contribution' button if only pseudo-manual processor exists
Eileen McNaughton [Tue, 6 Mar 2018 05:01:27 +0000 (18:01 +1300)]
Merge pull request #11768 from jmcclelland/core-issue-7
ensure correct payment_instrument_id
Mathieu Lu [Tue, 6 Mar 2018 00:05:06 +0000 (19:05 -0500)]
Merge pull request #11453 from colemanw/php55
Update minimum php version to 5.5
Jamie McClelland [Mon, 5 Mar 2018 18:05:39 +0000 (13:05 -0500)]
ensure correct payment_instrument_id
https://lab.civicrm.org/dev/core/issues/7
Otherwise, after first recurring contribution, contributions are coded
as check, not credit card.
colemanw [Mon, 5 Mar 2018 14:52:02 +0000 (09:52 -0500)]
Merge pull request #11760 from mattwire/CRM-21391_grant_task
CRM-21391 Convert Grant to use core Task class
colemanw [Mon, 5 Mar 2018 14:36:11 +0000 (09:36 -0500)]
Merge pull request #11766 from mukeshcompucorp/fix-template-structure-issues
Fixed template structure issues
Matthew Wire [Tue, 2 Jan 2018 09:10:37 +0000 (16:10 +0700)]
Cleanup search classes to use enumerators instead of hardcoded values
Eileen McNaughton [Mon, 5 Mar 2018 12:05:48 +0000 (01:05 +1300)]
Merge pull request #11759 from mattwire/CRM-21391_case_task
CRM-21391 Convert Case to use core Task class
Eileen McNaughton [Mon, 5 Mar 2018 12:03:47 +0000 (01:03 +1300)]
Merge pull request #11745 from agh1/0000-00-00
Fix upgrade failures from zero value `trxn_date`
Mukesh Ram [Mon, 5 Mar 2018 11:28:47 +0000 (16:58 +0530)]
Fixed template strucutre issues
Eileen McNaughton [Mon, 5 Mar 2018 11:15:48 +0000 (00:15 +1300)]
Merge pull request #11758 from mattwire/CRM-21391_campaign_task
CRM-21391 Convert Campaign to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:06:14 +0000 (16:06 +0700)]
Convert Pledge to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:06:01 +0000 (16:06 +0700)]
Convert Member to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:05:42 +0000 (16:05 +0700)]
Convert Mailing to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:05:16 +0000 (16:05 +0700)]
Convert Grant to use core Task class