colemanw [Mon, 14 May 2018 17:21:29 +0000 (13:21 -0400)]
Merge pull request #12124 from eileenmcnaughton/membership_metadata
Add field metadata to MembershipType schema info (xml)
Eileen McNaughton [Mon, 14 May 2018 05:32:08 +0000 (17:32 +1200)]
Merge pull request #12126 from eileenmcnaughton/membership_type
Preliminary cleanup for Custom data support for MembershipType form
Eileen McNaughton [Mon, 14 May 2018 04:04:53 +0000 (16:04 +1200)]
Merge pull request #12125 from eileenmcnaughton/membership_config
[NFC] Fix leakage of Form entity
Matthew Wire [Sun, 6 May 2018 17:10:02 +0000 (18:10 +0100)]
Preliminary cleanup for Custom data support for MembershipType form
Eileen McNaughton [Mon, 14 May 2018 02:13:58 +0000 (14:13 +1200)]
Merge pull request #12123 from eileenmcnaughton/membership_type
Preliminary tidy up of MembershipType form (towards custom data support)
eileen [Mon, 14 May 2018 00:57:07 +0000 (12:57 +1200)]
Fix leakage of Form entity
eileen [Mon, 14 May 2018 00:55:48 +0000 (12:55 +1200)]
Add field metadata to MembershipType schema info (xml)
Eileen McNaughton [Mon, 14 May 2018 00:12:53 +0000 (12:12 +1200)]
Merge pull request #12122 from eileenmcnaughton/cudat
tpl extraction of shared code for customDataBlock
Matthew Wire [Sun, 6 May 2018 17:10:02 +0000 (18:10 +0100)]
Preliminary tidy up of MembershipType form (towards custom data support)
Eileen McNaughton [Sun, 13 May 2018 23:00:11 +0000 (11:00 +1200)]
Merge pull request #11908 from mattwire/membershiptype_customdata_support
Support hooks for MembershipType entity
eileen [Tue, 8 May 2018 06:00:21 +0000 (18:00 +1200)]
tpl extraction of shared code for customDataBlock
Seamus Lee [Sun, 13 May 2018 00:46:32 +0000 (10:46 +1000)]
Merge pull request #12121 from civicrm/5.2
5.2
Seamus Lee [Sun, 13 May 2018 00:45:31 +0000 (10:45 +1000)]
Merge pull request #12120 from eileenmcnaughton/fgb
Fgb
deb.monish [Tue, 8 May 2018 06:36:26 +0000 (12:06 +0530)]
revert some change and other fixes
deb.monish [Wed, 18 Apr 2018 18:38:36 +0000 (00:08 +0530)]
(dev/core/68) Fix DB Error on 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
Matthew Wire [Sat, 12 May 2018 07:38:17 +0000 (08:38 +0100)]
Add create/edit pre/post hooks to MembershipType
Monish Deb [Fri, 11 May 2018 04:12:17 +0000 (09:42 +0530)]
Merge pull request #12085 from seamuslee001/pledge_search_form_test
(NFC) Add unit test of submitting the Pledge Search Form
Eileen McNaughton [Fri, 11 May 2018 00:19:20 +0000 (12:19 +1200)]
Merge pull request #12110 from kcristiano/5.2-11936
Re-Fix Case form task (export/print not working) (replace quick fix with proper fix)
Matthew Wire [Mon, 7 May 2018 08:24:09 +0000 (09:24 +0100)]
Further fixes to export
Matthew Wire [Mon, 7 May 2018 06:42:45 +0000 (07:42 +0100)]
Fix export
Matthew Wire [Thu, 5 Apr 2018 09:50:30 +0000 (10:50 +0100)]
Restore the entity specific field name to handle legacy code and allow tokens to work properly (eg. PDF letter)
Matthew Wire [Wed, 4 Apr 2018 11:51:12 +0000 (12:51 +0100)]
Fix Case form task regressions (export/print not working) since we switched to using CRM_Core_Form_Task
Eileen McNaughton [Thu, 10 May 2018 22:09:21 +0000 (10:09 +1200)]
Merge pull request #11996 from JMAConsulting/dev-core-68
(dev/core/68) Fix DB Error on 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
Eileen McNaughton [Thu, 10 May 2018 21:31:43 +0000 (09:31 +1200)]
Merge pull request #11903 from MiyaNoctem/CRM-38-show-recurring-contributions-on-membership-modal
dev/core#38 Show Recurring Contributions on Membership Modal View
Monish Deb [Thu, 10 May 2018 19:45:58 +0000 (01:15 +0530)]
Merge pull request #12108 from colemanw/ApiExplorer
ApiExplorer - Output short array syntax
Camilo Rodriguez [Fri, 30 Mar 2018 15:24:11 +0000 (15:24 +0000)]
CRM-38: Show Recurring Contributions on Membership Modal View
Currently, when viewing a membership from contact's detailed view (on
memberships tab), it is hard to tell if a membership has any recurring
contributions associated to it, even though you can see all payments done for
the membership.
Added a recurring contributions section below the contributions table
currently being shown, by loading recurring contributions using ajax call to
load list of recurring contributions.
Added recurring contributionslist to membership edit view using ajax call.
Coleman Watts [Thu, 10 May 2018 15:13:21 +0000 (11:13 -0400)]
ApiExplorer - Output short array syntax
Monish Deb [Thu, 10 May 2018 14:28:49 +0000 (19:58 +0530)]
Merge pull request #12104 from lcdservices/dev-core-108
dev/core#108 reset address array when setting new event location
Tim Otten [Thu, 10 May 2018 01:56:48 +0000 (18:56 -0700)]
Merge pull request #12105 from totten/master-karma-sr
karma.conf.js - Switch singleRun back to `false` default
Seamus Lee [Thu, 10 May 2018 00:22:24 +0000 (10:22 +1000)]
Merge pull request #12102 from seamuslee001/nfc_constant_moneytext
(NFC) Fix use of undefined constant USD in MoneyTest
Tim Otten [Thu, 10 May 2018 00:05:03 +0000 (17:05 -0700)]
karma.conf.js - Switch singleRun back to `false` default
It's useful to have two ways of running the Karma test suite:
* For continuous integration, run once and report back with a file.
(This has been `karma start --browsers PhantomJS --single-run --reporters dots,junit`.)
* For local dev, run in a watch/live/monitoring mode which auto-executes any time you edit the JS code.
(This has been `karma start`)
This partially reverts a recent change so that the second one works the same
way as before.
Brian Shaughnessy [Wed, 9 May 2018 22:24:43 +0000 (18:24 -0400)]
dev/core#108 reset address array when setting new event location
Seamus Lee [Wed, 9 May 2018 21:47:14 +0000 (07:47 +1000)]
Merge pull request #12070 from eileenmcnaughton/loggin_fix
Fix fatal error on logging tab when hook alters logging tables.
Seamus Lee [Wed, 9 May 2018 21:33:58 +0000 (07:33 +1000)]
(NFC) Fix use of undefined constant USD in MoneyTest
colemanw [Wed, 9 May 2018 13:06:58 +0000 (09:06 -0400)]
Merge pull request #12101 from seamuslee001/upgrade_karma_phantomjs_launcher
Upgrade Karma phantomjs launcher to latest version
Seamus Lee [Wed, 9 May 2018 05:20:49 +0000 (15:20 +1000)]
Upgrade Karma phantomjs launcher to latest version
colemanw [Wed, 9 May 2018 03:40:36 +0000 (23:40 -0400)]
Merge pull request #12097 from eileenmcnaughton/relationshipTypeForm
Fix Relationship Type form to use the metadata for fields & api in postProcess
Tim Otten [Tue, 8 May 2018 23:00:10 +0000 (16:00 -0700)]
Merge pull request #12084 from seamuslee001/phpunit5
Run master tests using phpunit5
Eileen McNaughton [Tue, 8 May 2018 12:05:23 +0000 (00:05 +1200)]
Merge pull request #12099 from civicrm/5.2
5.2 to master
Monish Deb [Tue, 8 May 2018 10:34:44 +0000 (16:04 +0530)]
Merge pull request #12095 from eileenmcnaughton/custom_data
Function extraction (Move towards generic custom data support for all entities)
Monish Deb [Tue, 8 May 2018 10:30:08 +0000 (16:00 +0530)]
Merge pull request #12080 from eileenmcnaughton/fgb
Fix (unreleased) regression on report pager
Matthew Wire [Sun, 6 May 2018 17:09:40 +0000 (18:09 +0100)]
Function extraction (Move towards generic custom data support for all forms)
deb.monish [Tue, 8 May 2018 06:36:26 +0000 (12:06 +0530)]
revert some change and other fixes
eileen [Tue, 8 May 2018 06:46:22 +0000 (18:46 +1200)]
Fix Relationship Type form to use the api in postProcess in preparation to support custom data.
Now that we have custom-data-on-any forms that use the api to save can potentially support custom data. This is a
preparatory tidy-up commit. It switches to the api & does minor tidy ups, including using metadata and addField to
add fields. This last part does slightly alter the wording on the form. I think that is OK?
deb.monish [Wed, 18 Apr 2018 18:38:36 +0000 (00:08 +0530)]
(dev/core/68) Fix DB Error on 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
Eileen McNaughton [Tue, 8 May 2018 02:36:23 +0000 (14:36 +1200)]
Merge pull request #12094 from eileenmcnaughton/member
Fix Fatal error on membership detail report (with ACLs enabled) dev/core/#100
eileen [Tue, 8 May 2018 00:30:03 +0000 (12:30 +1200)]
Fix Fatal error on membership detail report (with ACLs enabled) dev/core/#100
eileen [Fri, 4 May 2018 04:38:22 +0000 (16:38 +1200)]
Fix (unreleased) regression on report pager
We recently added a patch to disable full group by before some queries that were not
compliant with that standard. That patch broke the report pager because later code relied on the
last issued query ALWAYS being the one that determined how many rows are retrived by the main query,
however, we were doing a query to check sql mode after the main query.
I could make a case for storing sql mode data somewhere sensible at the start of the session.
However, I think this fix is the right fix for the bug as it calculates the rows retrieved
/ retrievable immediately after the retrieval query, rather than 'at some later date when
we hope no other queries have run'. If is in the same function as the enableFullGroupBy so
only reports that ALSO run that will hit the line (ie. not reports that override buildRows)
Seamus Lee [Mon, 7 May 2018 21:04:14 +0000 (07:04 +1000)]
Merge pull request #11936 from mattwire/case_form_task_fixes
Re-Fix Case form task (export/print not working) (replace quick fix with proper fix)
Matthew Wire [Mon, 7 May 2018 08:24:09 +0000 (09:24 +0100)]
Further fixes to export
colemanw [Mon, 7 May 2018 17:28:13 +0000 (13:28 -0400)]
Merge pull request #12092 from JMAConsulting/CRM-20459
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue
Seamus Lee [Sat, 5 May 2018 06:16:04 +0000 (16:16 +1000)]
Add unit test of submitting the Pledge Search Form
Add in check of rows
Matthew Wire [Mon, 7 May 2018 06:42:45 +0000 (07:42 +0100)]
Fix export
deb.monish [Sun, 29 Apr 2018 06:09:04 +0000 (11:39 +0530)]
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue
Matthew Wire [Thu, 5 Apr 2018 09:50:30 +0000 (10:50 +0100)]
Restore the entity specific field name to handle legacy code and allow tokens to work properly (eg. PDF letter)
Matthew Wire [Wed, 4 Apr 2018 11:51:12 +0000 (12:51 +0100)]
Fix Case form task regressions (export/print not working) since we switched to using CRM_Core_Form_Task
Monish Deb [Mon, 7 May 2018 05:37:34 +0000 (11:07 +0530)]
Merge pull request #12090 from eileenmcnaughton/notice
Fix e-notice
eileen [Mon, 7 May 2018 03:12:17 +0000 (15:12 +1200)]
Fix e-notice
Notice is visible on add payment processor page
Camilo Rodríguez [Mon, 7 May 2018 02:07:20 +0000 (21:07 -0500)]
(dev/core/40) Show List of Contributions On Recurring Contribution View (#11920)
* CRM-40: Show List of Contributions On Recurring Contribution View
Altered ContributionRecur page so that the list of contributions related to a
recurring contribution are shown when viewing said recurring contribution.
Implemented by running CRM_Contribute_Form_Search
ebedded within the page and
including CRM/Contribute/Form/Selector.tpl template within the page's
template. Also included ContributionTotals.tpl to show, which I though could
be cool.
* CRM-40: Don't Use CRM_Contribute_Form_Search to Show Contributions
CRM_Contribute_Form_Search class is very hard to read and maintain, which is
why it was found better to look for related contributions manually and show
them using an ajax datatable.
* CRM-40: Fix Failing Test
* CRM-40: Show Contribution List Using Ajax Call
Added new Page that shows related payments for a given relted contribution in
a data table and included the table on recurring contribution's detail view
using an ajax call.
colemanw [Mon, 7 May 2018 01:11:25 +0000 (21:11 -0400)]
Merge pull request #12075 from JMAConsulting/CRM-20459-3
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue
Eileen McNaughton [Sun, 6 May 2018 23:13:30 +0000 (11:13 +1200)]
Merge pull request #11868 from eileenmcnaughton/cust_url
CRM-20922 fix support for passing custom date values via url
Eileen McNaughton [Sun, 6 May 2018 23:10:09 +0000 (11:10 +1200)]
Merge pull request #12086 from seamuslee001/get_mock_deprecated
(NFC) Change use createMock in tests otherwise stick with getMock to fix deprecated warning…
Eileen McNaughton [Sun, 6 May 2018 22:57:34 +0000 (10:57 +1200)]
Merge pull request #12089 from civicrm/5.2
5.2 to master
Eileen McNaughton [Sun, 6 May 2018 22:57:01 +0000 (10:57 +1200)]
Merge pull request #12081 from JMAConsulting/dev_core_98_52rc
(dev/core/98) Searching by any Address fields with location type other than primary throw DB error
Eileen McNaughton [Sun, 6 May 2018 22:35:15 +0000 (10:35 +1200)]
Merge pull request #12087 from seamuslee001/karma_conf_upgrade
(NFC) Update karma conf for more recent karma
Seamus Lee [Sat, 5 May 2018 06:16:23 +0000 (16:16 +1000)]
Update karma conf for more recent karma
Seamus Lee [Sun, 6 May 2018 01:04:14 +0000 (11:04 +1000)]
Merge pull request #12076 from JMAConsulting/dev_core_99
(dev/core/99) Search builder doesn't retain selected (boolean) option after searching
Seamus Lee [Sat, 5 May 2018 07:12:43 +0000 (17:12 +1000)]
Dynamically switch mock methods based on phpunit version
Seamus Lee [Sat, 5 May 2018 06:16:13 +0000 (16:16 +1000)]
(NFC) Change getMock to createMock in tests to fix deprecated warning on getMock in phpunit5
Seamus Lee [Sat, 5 May 2018 06:27:45 +0000 (16:27 +1000)]
Merge pull request #12083 from xurizaemon/payflow_not_payflo
Payflow Pro not payflo
Andrew Hunt [Fri, 4 May 2018 14:40:33 +0000 (10:40 -0400)]
5.1.0 release notes: updated synopsis
Seamus Lee [Fri, 4 May 2018 23:01:04 +0000 (09:01 +1000)]
If php version supports it use phpunit5 otherwise phpunit4
Seamus Lee [Fri, 4 May 2018 22:36:47 +0000 (08:36 +1000)]
Update Civi/ test documentation
Seamus Lee [Fri, 4 May 2018 22:33:47 +0000 (08:33 +1000)]
Run master tests using phpunit5
Chris Burgess [Fri, 4 May 2018 21:07:22 +0000 (09:07 +1200)]
PR#12083 - Correct typing of "Payflow Pro" in various messages.
"Payflo" is a different payment processor.
Chris Burgess [Fri, 4 May 2018 21:06:27 +0000 (09:06 +1200)]
PR#12083 - Noting that getRecurringTransactionStatus() appears to not return a value.
Chris Burgess [Fri, 4 May 2018 21:05:37 +0000 (09:05 +1200)]
PR#12083 - Docs changes only.
Tim Otten [Fri, 4 May 2018 20:03:28 +0000 (13:03 -0700)]
Merge pull request #12082 from agh1/5.1.0-synopsis
5.1.0 release notes: updated synopsis
Andrew Hunt [Fri, 4 May 2018 14:40:33 +0000 (10:40 -0400)]
5.1.0 release notes: updated synopsis
deb.monish [Thu, 3 May 2018 06:02:25 +0000 (11:32 +0530)]
(dev/core/98) Searching by any Address fields with location type other than primary throw DB error
Monish Deb [Thu, 3 May 2018 18:22:11 +0000 (23:52 +0530)]
Merge pull request #12074 from JMAConsulting/dev_core_98
(dev/core/98) FGB Searching by any Address fields with location type other than primary throw DB error
Monish Deb [Thu, 3 May 2018 12:06:42 +0000 (17:36 +0530)]
Merge pull request #12050 from JMAConsulting/CRM-20459-2
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue[Sub PR 2]
deb.monish [Thu, 3 May 2018 11:05:37 +0000 (16:35 +0530)]
(dev/core/99) Search builder doesn't retain selected (boolean) option after searching
deb.monish [Thu, 3 May 2018 07:11:16 +0000 (12:41 +0530)]
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue
deb.monish [Thu, 3 May 2018 07:07:39 +0000 (12:37 +0530)]
CRM-20459: Actively deprecate CRM_Core_OptionGroup::getValue
deb.monish [Thu, 3 May 2018 06:02:25 +0000 (11:32 +0530)]
(dev/core/98) Searching by any Address fields with location type other than primary throw DB error
CiviCRM [Wed, 2 May 2018 23:24:22 +0000 (23:24 +0000)]
Set version to 5.3.alpha1
CiviCRM [Wed, 2 May 2018 23:11:57 +0000 (23:11 +0000)]
Set version to 5.2.beta1
Monish Deb [Wed, 2 May 2018 10:33:48 +0000 (16:03 +0530)]
Merge pull request #12056 from eileenmcnaughton/pcp
Fix Soft credit personal note ton limit to 255 characters (DB limit).
eileen [Tue, 1 May 2018 23:07:16 +0000 (11:07 +1200)]
Fix fatal error on logging tab when hook alters logging tables.
When a custom table is removed from logged tables by hook (e.g a calculated table like a summary table) the logging report
still tries to include it but fails with a fatal error.
This patch excludes it from the list of customDataEnabled logging tables
eileen [Tue, 1 May 2018 06:20:14 +0000 (18:20 +1200)]
Enable tests on the logging summary report.
Despite seeming like a lot of change this is mostly just extraction to run via the tests. I can break out into a couple of refactor commits for reviewablility.
I have tested this on mysql 5.6 with full group by mode enabled.
eileen [Tue, 1 May 2018 06:38:05 +0000 (18:38 +1200)]
Extract buildQuery on ReportSummary.
This is a partial of https://github.com/civicrm/civicrm-core/pull/12065 which is a very simple extraction - only one additional change of moving a variable to a class property
Eileen McNaughton [Wed, 2 May 2018 08:46:29 +0000 (20:46 +1200)]
Merge pull request #12072 from civicrm/5.1
5.1 merge to master
Eileen McNaughton [Wed, 2 May 2018 08:46:03 +0000 (20:46 +1200)]
Merge pull request #12071 from jitendrapurohit/core-94
core-94 - Advanced Search Display Results As always displays contact …
Jitendra Purohit [Wed, 2 May 2018 06:46:56 +0000 (12:16 +0530)]
core-94 - Advanced Search Display Results As always displays contact tasks on first search
Monish Deb [Wed, 2 May 2018 04:46:58 +0000 (10:16 +0530)]
Merge pull request #12069 from agh1/5.1.0-release-notes
5.1.0 release notes
Andrew Hunt [Tue, 1 May 2018 23:51:35 +0000 (19:51 -0400)]
5.1.0 release notes: move CRM-21784 to features per eileen's suggestion
Andrew Hunt [Tue, 1 May 2018 23:45:28 +0000 (19:45 -0400)]
5.1.0 release notes: finished contributors
Andrew Hunt [Tue, 1 May 2018 23:32:22 +0000 (19:32 -0400)]
5.1.0 release notes: done with features and bugs
Andrew Hunt [Tue, 1 May 2018 21:54:38 +0000 (17:54 -0400)]
5.0.1 and 5.0.2 release notes: update to match format