Eileen McNaughton [Sun, 5 Mar 2017 20:46:29 +0000 (09:46 +1300)]
Merge pull request #9933 from spalmstr/new
CRM-20004 Fix regression Event payment receipt sent twice
spalmstr [Sat, 4 Mar 2017 12:23:12 +0000 (12:23 +0000)]
CRM-20004 Fix regression Event payment receipt sent twice
Eileen McNaughton [Thu, 2 Mar 2017 20:55:39 +0000 (09:55 +1300)]
Merge pull request #9919 from seamuslee001/CRM-20204-code-cleanup
CRM-20201 add in escaped curly braces to ensure nothing unusual happens
Eileen McNaughton [Thu, 2 Mar 2017 20:38:57 +0000 (09:38 +1300)]
Merge pull request #9918 from colemanw/moveTags
CRM-19943 - Add permission check and move tags button
Seamus Lee [Thu, 2 Mar 2017 20:05:17 +0000 (07:05 +1100)]
CRM-20204 add in escaped curly braces to ensure nothing unusual happens
Coleman Watts [Thu, 2 Mar 2017 16:09:17 +0000 (11:09 -0500)]
CRM-19943 - Add permission check and move tags button
Eileen McNaughton [Wed, 1 Mar 2017 21:09:13 +0000 (10:09 +1300)]
Merge pull request #9913 from seamuslee001/CRM-20201
CRM-20201 Fix issue where manage tags page would not display properly…
Seamus Lee [Wed, 1 Mar 2017 03:45:14 +0000 (14:45 +1100)]
CRM-20201 Fix issue where manage tags page would not display properly if tag set does not have a created by set
Tim Otten [Tue, 28 Feb 2017 03:06:03 +0000 (19:06 -0800)]
Merge pull request #9908 from eileenmcnaughton/regress
Towards CRM-19815 Fix misdisplay of gender on drupal user-view page as a result of previous work on this within this release
Eileen McNaughton [Tue, 28 Feb 2017 02:59:48 +0000 (15:59 +1300)]
Merge pull request #9906 from mattwire/verp_config_warning
CRM-20196: Add a useful message when the user didn't setup bounce processing pro…
Tim Otten [Tue, 28 Feb 2017 02:25:55 +0000 (18:25 -0800)]
Merge pull request #9874 from totten/master-acttok
(Regression) CRM_Mailing_ActionTokens - Degrade gracefully
eileen [Tue, 28 Feb 2017 00:58:39 +0000 (13:58 +1300)]
CRM-19815 Fix misdisplay of gender on drupal user-view page
Note that the click-throughs still do not work but this turns out to be
a pre-existing issue so I will leave that for a follow up
Matthew Wire [Mon, 27 Feb 2017 22:41:54 +0000 (22:41 +0000)]
Add a useful message when the user didn't setup bounce processing properly
Eileen McNaughton [Mon, 27 Feb 2017 21:43:22 +0000 (10:43 +1300)]
Merge pull request #9902 from JKingsnorth/CRM-19492
CRM-19492 Merging: disable location settings if the relevant checkbox isn't selected
Eileen McNaughton [Mon, 27 Feb 2017 19:37:01 +0000 (08:37 +1300)]
Merge pull request #9893 from JKingsnorth/CRM-20154
CRM-20154 Dedupe - remove unused autoflip parameter
Eileen McNaughton [Mon, 27 Feb 2017 19:34:47 +0000 (08:34 +1300)]
Merge pull request #9866 from lcdservices/CRM-20145
CRM-20145 line_item $0 entity_financial_trxn fix
Brian Shaughnessy [Mon, 27 Feb 2017 12:11:08 +0000 (07:11 -0500)]
CRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:42:34 +0000 (06:42 -0500)]
CRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:37:33 +0000 (06:37 -0500)]
CRM-20145 fix code style issues
JKingsnorth [Mon, 27 Feb 2017 10:38:28 +0000 (10:38 +0000)]
CRM-19492 Fixes for disabling location settings when checkbox isn't selected
eileen [Thu, 10 Nov 2016 10:28:37 +0000 (23:28 +1300)]
CRM-19492 disable location settings if the relevant checkbox is not enabled
eileen [Thu, 10 Nov 2016 04:12:07 +0000 (17:12 +1300)]
(towards CRM-19492) Remove defunct vars
I could find no evidence of these being used anywhere
eileen [Thu, 10 Nov 2016 03:59:57 +0000 (16:59 +1300)]
(towards CRM-19492) Improve whitespace layout
eileen [Thu, 10 Nov 2016 03:49:24 +0000 (16:49 +1300)]
(towards CRM-19492) Do not assign variables by reference
They are not used as references & this just adds confusion.
eileen [Thu, 10 Nov 2016 03:25:00 +0000 (16:25 +1300)]
(towards CRM-19492) Extract bounce portion of code into separate function
eileen [Thu, 10 Nov 2016 03:21:34 +0000 (16:21 +1300)]
(towards CRM-19492) Minor variable simplification
JKingsnorth [Mon, 27 Feb 2017 09:16:02 +0000 (09:16 +0000)]
Fix another reference to removed autoFlip param
JKingsnorth [Fri, 24 Feb 2017 09:19:09 +0000 (09:19 +0000)]
[NFC] Fix comments for lookupValues function
JKingsnorth [Fri, 24 Feb 2017 09:15:17 +0000 (09:15 +0000)]
CRM-20154 Remove more unused autoflips
Eileen McNaughton [Sun, 26 Feb 2017 23:22:51 +0000 (12:22 +1300)]
Merge pull request #9900 from fuzionnz/CRM-20181-deprecate_crm_core_error_fatal
CRM-20181. Deprecate CRM_Core_Error::fatal().
Chris Burgess [Sun, 26 Feb 2017 07:20:49 +0000 (20:20 +1300)]
CRM-20181. Document why we must be rid of this troublesome function.
Chris Burgess [Sun, 26 Feb 2017 07:12:03 +0000 (20:12 +1300)]
CRM-20181. Deprecate CRM_Core_Error::fatal().
Eileen McNaughton [Sun, 26 Feb 2017 07:08:42 +0000 (20:08 +1300)]
Merge pull request #9888 from eileenmcnaughton/cust_another
CRM-19490: Profile date fields don't respect localisation on the Cont…
eileen [Sun, 26 Feb 2017 04:06:45 +0000 (17:06 +1300)]
CRM-19490 change 'view' action check to '&' to also pick up 'preview' action
eileen [Sun, 26 Feb 2017 03:56:59 +0000 (16:56 +1300)]
Enotice fix from recent merge
Eileen McNaughton [Sun, 26 Feb 2017 03:02:58 +0000 (16:02 +1300)]
Merge pull request #9890 from spalmstr/CRM-19453
CRM-19453
eileen [Thu, 23 Feb 2017 12:39:06 +0000 (01:39 +1300)]
CRM-19490 define non-updated fields in a function for easier transition.
Looking to find a way to migrate these as safely as possible. Defining them in one place seems like a good step
eileen [Thu, 23 Feb 2017 11:35:14 +0000 (00:35 +1300)]
CRM-19490: Profile date fields don't respect localisation on the Contribution Page confirmation screen
Eileen McNaughton [Sun, 26 Feb 2017 02:32:13 +0000 (15:32 +1300)]
Merge pull request #9873 from eileenmcnaughton/dedupe_code
CRM-20154 dedupe code improvement, remove unused autoflip parameter
Tim Otten [Sat, 25 Feb 2017 18:59:52 +0000 (11:59 -0700)]
Merge pull request #9898 from totten/master-dl-only
Extension.download API - Allow downloading without installing
colemanw [Sat, 25 Feb 2017 04:01:21 +0000 (23:01 -0500)]
Merge pull request #9897 from totten/master-doclink
CRM-20180 - Documentation URLs should contain "stable" *or* "current", not both
Tim Otten [Sat, 25 Feb 2017 02:12:51 +0000 (19:12 -0700)]
Extension.download API - Allow downloading without installing
The current `download` action does both download and install. This option
preserves the default behavior but allows one to opt-out of installation.
Tim Otten [Sat, 25 Feb 2017 01:54:18 +0000 (18:54 -0700)]
CRM-20180 - Documentation URLs should contain "stable" *or* "current", not both
Examples:
* In "Administer => Communications => Scheduled Reminders", the green box has
a link to "learn more". This links to "https://docs.civicrm.org/user/en/stable/current/email/scheduled-reminders/"
* In "Search =>= Advanced Search", view the help for "Views for Display Contacts".
The help message includes a link to "https://docs.civicrm.org/user/en/stable/current/organising-your-data/profiles"
Both examples include the redundant formulation "user/en/stable/current" and
point to non-existent pages. Use either "stable" or "current". It would be
silly for one installation to contain a mix of links for "stable" and
"current". It appears that `formatDocUrl()` aims to normalize these.
colemanw [Fri, 24 Feb 2017 17:53:14 +0000 (12:53 -0500)]
Merge pull request #9894 from JKingsnorth/CRM-20175
CRM-20175 Increase pager support
JKingsnorth [Fri, 24 Feb 2017 11:58:07 +0000 (11:58 +0000)]
CRM-20175 Increase pager support
colemanw [Fri, 24 Feb 2017 07:52:05 +0000 (02:52 -0500)]
Merge pull request #9892 from totten/master-depr
MailingGroup API - Tighten up deprecations
Tim Otten [Fri, 24 Feb 2017 06:13:06 +0000 (23:13 -0700)]
MailingGroup API - Tighten up deprecations
The `MailingGroup.php` includes some very different APIs, e.g.
* Several 'event'(subscribue/resubscribe) APIs
* Some CRUD APIs for mailing data
The deprecation applies to the 'event' (subscribe/resubscribe) APIs --
because those can be done another way. However, the CRUD for `MailingGroup`
records is the only way to do access that data.
Eileen McNaughton [Fri, 24 Feb 2017 02:49:51 +0000 (15:49 +1300)]
Merge pull request #9885 from eileenmcnaughton/search
CRM-19815, CRM-19830 make pseudoconstant handling more generic in order to improve performance
eileen [Thu, 23 Feb 2017 04:56:17 +0000 (17:56 +1300)]
Towards CRM-19815 make pseudoconstant handling more generic.
Using metadata pseudoconstants we can remove joins on the option_value table, which hur performance. This patch
only opens it up within the context of the Contact table. It is intended to open the code up to
allow us to extend the performance advantage of dropping the bad join to other entities.
The following fields have metadata links to the
option_value table:
gender_id
prefix_id
suffix_id
preferred_communication_method
communication_style_id
preferred_language
The general pattern for the api is to return (eg) communication_style_id = 1, communication_style = 'Formal', where communication_style is the db name of the option group for communication_style_id.
preferred_communication_method is the exception. For api calls it returns an array of ids like all other api calls.
However, it returns a string of names for non-api calls on that field, allowing us to avoid handling it in a number of other places.
I added tests to ensure no change on the api inputs & outputs and searched these fields through search builder & advanced
search + export. I also checked profile search listings. They are not using the convert routine & have some e-notices that
pre-existed, but no regression I could see.
spalmstr [Thu, 23 Feb 2017 14:34:03 +0000 (14:34 +0000)]
CRM-19453
Eileen McNaughton [Thu, 23 Feb 2017 12:41:07 +0000 (01:41 +1300)]
Merge pull request #9887 from JKingsnorth/CRM-20170
CRM-20170 Fix participant count in summary report for free events
Eileen McNaughton [Thu, 23 Feb 2017 11:33:56 +0000 (00:33 +1300)]
Merge pull request #9884 from seamuslee001/CRM-20144-examples
CRM-20144 (NFC) Update tests and example
JKingsnorth [Thu, 23 Feb 2017 11:22:48 +0000 (11:22 +0000)]
CRM-20170 Fix participant count in summary report for free events
Seamus Lee [Thu, 23 Feb 2017 10:35:12 +0000 (21:35 +1100)]
Revert changes to test and re-generate example from better test
Seamus Lee [Thu, 23 Feb 2017 06:50:57 +0000 (17:50 +1100)]
CRM-20144 (NFC) Update tests and example
Eileen McNaughton [Thu, 23 Feb 2017 06:30:01 +0000 (19:30 +1300)]
Merge pull request #9867 from seamuslee001/CRM-20144
CRM-20144 Fix contact.get api break where groups no longer returned i…
Tim Otten [Wed, 22 Feb 2017 18:04:34 +0000 (10:04 -0800)]
CRM_Mailing_ActionTokens - Degarde gracefully
Most of the `CRM_*_Tokens` classes include a `checkActive()` function whic
prevents them from trying to do anything if they don't have the necessary
data. However, this one was missing it, which means that it attempts to
evalute `{action.*}` tokens even when they're not valid.
Eileen McNaughton [Thu, 23 Feb 2017 02:51:16 +0000 (15:51 +1300)]
Merge pull request #9876 from JMAConsulting/CRM-20158
CRM-20158, added card_type and pan_truncation field
colemanw [Thu, 23 Feb 2017 02:38:01 +0000 (21:38 -0500)]
Merge pull request #9882 from colemanw/Display
Display error message for activity processing
colemanw [Thu, 23 Feb 2017 02:36:00 +0000 (21:36 -0500)]
Merge pull request #9883 from colemanw/ApiExplorer
ApiExplorer - Fix js error
Coleman Watts [Thu, 23 Feb 2017 02:33:55 +0000 (19:33 -0700)]
ApiExplorer - Fix js error
Coleman Watts [Wed, 22 Feb 2017 23:30:44 +0000 (16:30 -0700)]
Display error message for activity processing
Seamus Lee [Wed, 22 Feb 2017 20:59:34 +0000 (07:59 +1100)]
Fix legacy test
Seamus Lee [Wed, 22 Feb 2017 20:25:22 +0000 (07:25 +1100)]
Add support for some legacy handling of group param as well that maybe out in the wild
Pradeep Nayak [Wed, 22 Feb 2017 20:08:26 +0000 (01:38 +0530)]
CRM-20158, added card_type and pan_truncation field
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
eileen [Wed, 22 Feb 2017 04:19:05 +0000 (17:19 +1300)]
CRM-20156 - Code cleanup - Do not pass as ref for OptionGroup::lookupValues
eileen [Wed, 22 Feb 2017 01:25:56 +0000 (14:25 +1300)]
CRM-20154 dedupe code improvement, remove unused autoflip parameter
Eileen McNaughton [Wed, 22 Feb 2017 01:44:48 +0000 (14:44 +1300)]
Merge pull request #9871 from eileenmcnaughton/rev
More test output on intermittant error
eileen [Wed, 22 Feb 2017 01:04:26 +0000 (14:04 +1300)]
Add delay in test to resolve concurrent changes
Seamus Lee [Wed, 22 Feb 2017 00:00:39 +0000 (11:00 +1100)]
Tidy up checks as per discussion with Eileen and add new test of array format
Seamus Lee [Tue, 21 Feb 2017 21:26:22 +0000 (08:26 +1100)]
Fix up re-setting of the array in the OIK format
Seamus Lee [Tue, 21 Feb 2017 21:17:17 +0000 (08:17 +1100)]
CRM-20144 move special handling to API layer from BAO
remove accidentally generated files
Seamus Lee [Tue, 21 Feb 2017 09:44:06 +0000 (20:44 +1100)]
CRM-20144 Fix contact.get api break where groups no longer returned if using title in params
Brian Shaughnessy [Tue, 21 Feb 2017 21:06:25 +0000 (16:06 -0500)]
CRM-20145 move to utility function
Brian Shaughnessy [Tue, 21 Feb 2017 05:07:36 +0000 (00:07 -0500)]
CRM-20145 line_item $0 entity_financial_trxn fix
colemanw [Mon, 20 Feb 2017 18:54:51 +0000 (13:54 -0500)]
Merge pull request #9862 from eileenmcnaughton/rev
CRM-20061 Add tables as a parameter on the revert api
eileen [Mon, 20 Feb 2017 01:30:48 +0000 (14:30 +1300)]
CRM-20061 Add tables as a parameter on the revert api
Eileen McNaughton [Mon, 20 Feb 2017 01:58:12 +0000 (14:58 +1300)]
Merge pull request #9459 from colemanw/CRM-19693
CRM-19693 - Don't show options for disabled components
Eileen McNaughton [Sun, 19 Feb 2017 19:27:11 +0000 (08:27 +1300)]
Merge pull request #9858 from ajdavis/paypal-ipn-business-name
CRM-20048 Parse "business" not "receiver_email" from IPN
colemanw [Sun, 19 Feb 2017 18:44:50 +0000 (13:44 -0500)]
Merge pull request #9844 from colemanw/CRM-20034
CRM-20034 - CRM-20034 - Support OR grouping of api get params
Eileen McNaughton [Sat, 18 Feb 2017 23:35:49 +0000 (12:35 +1300)]
Merge pull request #9856 from seamuslee001/CRM-19657-2
CRM-19657 Fall back to system wide information if no default from email can be …
Eileen McNaughton [Sat, 18 Feb 2017 22:43:55 +0000 (11:43 +1300)]
Merge pull request #9770 from seamuslee001/CRM-19960
CRM-19960 Hide page title when is supposed to be removed
A. Jesse Jiryu Davis [Sat, 18 Feb 2017 03:20:48 +0000 (22:20 -0500)]
CRM-20048 Parse "business" not "receiver_email" from IPN
Coleman Watts [Fri, 17 Feb 2017 19:06:31 +0000 (14:06 -0500)]
CRM-19816 - Support activity tag joins and activity attachments
Seamus Lee [Fri, 17 Feb 2017 21:52:26 +0000 (08:52 +1100)]
Fall back to system wide information if no default from email can be found and no contribution page can be used and no receipt from is passed in and add test to prove it
Eileen McNaughton [Fri, 17 Feb 2017 05:29:26 +0000 (18:29 +1300)]
Merge pull request #9853 from eileenmcnaughton/cont_test
Remove mispelt param.
eileen [Thu, 16 Feb 2017 22:47:31 +0000 (11:47 +1300)]
Remove mispelt param.
Fixing this upsets test, because it should be calculated so trying removal against tests
Eileen McNaughton [Thu, 16 Feb 2017 12:21:33 +0000 (01:21 +1300)]
Merge pull request #9808 from seamuslee001/CRM-19972
CRM-19972 Add in post upgrade message about the addition of manage ta…
Eileen McNaughton [Thu, 16 Feb 2017 12:20:19 +0000 (01:20 +1300)]
Merge pull request #9833 from francescbassas/patch-9
CRM-20013 Localization for participant status on Event Income Report …
Eileen McNaughton [Thu, 16 Feb 2017 10:23:28 +0000 (23:23 +1300)]
Merge pull request #9823 from JKingsnorth/CRM-19999
CRM-19999 Soften event error message on registration
JKingsnorth [Fri, 10 Feb 2017 16:46:51 +0000 (16:46 +0000)]
CRM-19999 Soften event error message on registration
Eileen McNaughton [Thu, 16 Feb 2017 07:12:49 +0000 (20:12 +1300)]
Merge pull request #9842 from seamuslee001/CRM-19657
CRM-19657 Try to use domain from email rather than user email for from address …
Eileen McNaughton [Thu, 16 Feb 2017 07:11:33 +0000 (20:11 +1300)]
Merge pull request #9846 from eileenmcnaughton/performance2
CRM-19184 remove old old old suppress group functionality by defining…
Seamus Lee [Thu, 16 Feb 2017 00:51:42 +0000 (11:51 +1100)]
CRM-19657 Fix issue where domain address wasn't being used for recurring contribution emails but logged in was.
Eileen McNaughton [Thu, 16 Feb 2017 04:59:52 +0000 (17:59 +1300)]
Merge pull request #9845 from eileenmcnaughton/cust_date_under
[NFC] Date metadata fixes towards CRM-19490, CRM-18387, CRM-20012, CRM-20011, CRM-15948, CRM-19911
eileen [Sun, 1 Jan 2017 22:10:56 +0000 (11:10 +1300)]
CRM-19184 remove old old old suppress group functionality by defining 'CIVICRM_GROUPTREE'
Eileen McNaughton [Thu, 16 Feb 2017 04:40:23 +0000 (17:40 +1300)]
Merge pull request #9807 from eileenmcnaughton/perf
CRM-19934 improvement on acl cache.
Coleman Watts [Thu, 16 Feb 2017 03:44:26 +0000 (22:44 -0500)]
API Explorer - add icons to tabs
Coleman Watts [Thu, 16 Feb 2017 03:33:03 +0000 (22:33 -0500)]
CRM-20034 - Expose OR grouping to api explorer
eileen [Thu, 16 Feb 2017 03:41:26 +0000 (16:41 +1300)]
[NFC] towards CRM-19840 & others, load date metadata for custom & core profile fields.
This is further NFC change towards CRM-19840 and a range of other date fixes. It ensures that date data is available on date fields
allowing us to reduce code elsewhere