eileen [Mon, 23 Jul 2018 10:01:21 +0000 (22:01 +1200)]
Rationalise selectedPaymentFields.
The selected payments field variable is primarily used when exporting participants
with contributions. This gets the definition of it out of the returnProperties definition
and calculates it more sensibly.
eileen [Mon, 23 Jul 2018 09:11:25 +0000 (21:11 +1200)]
Add unit test covering specifiable output fields for participant export.
Monish Deb [Tue, 24 Jul 2018 19:44:30 +0000 (01:14 +0530)]
Merge pull request #12521 from eileenmcnaughton/fix_im_export_test
Move relationship return properties to the processor class to fix leakage related test fail
Eileen McNaughton [Tue, 24 Jul 2018 19:37:30 +0000 (07:37 +1200)]
Merge pull request #12544 from totten/master-redis-pool
(dev/core#217) CRM_Utils_Cache_Redis::connect() - Allow pooling connections
Eileen McNaughton [Tue, 24 Jul 2018 19:37:02 +0000 (07:37 +1200)]
Merge pull request #12545 from totten/master-prevnext-fill
(dev/core#217) PrevNext - Define and use fillWithSql()/fillWithArray()
Eileen McNaughton [Tue, 24 Jul 2018 19:36:24 +0000 (07:36 +1200)]
Merge pull request #12546 from eileenmcnaughton/redis
Reduce config required to use Redis.
Eileen McNaughton [Tue, 24 Jul 2018 19:33:43 +0000 (07:33 +1200)]
Merge pull request #12385 from mattwire/test_transactions
dev/core#219 Improve consistency displaying "Test Transactions"
Mathieu Lu [Tue, 24 Jul 2018 14:25:20 +0000 (10:25 -0400)]
Merge pull request #12475 from mattwire/CRM-21574_disable_contact_email_tellafriend
CRM-21574 Allow to disable sending of email from source contact for tell a friend on pcp
colemanw [Tue, 24 Jul 2018 12:45:26 +0000 (08:45 -0400)]
Merge pull request #12536 from mukeshcompucorp/SHOR-13-regression-search
Theme layer Fix search for Shoreditch compatibility
Eileen McNaughton [Tue, 24 Jul 2018 10:49:52 +0000 (22:49 +1200)]
Merge pull request #12549 from civicrm/5.4
5.4
Seamus Lee [Tue, 24 Jul 2018 10:26:34 +0000 (20:26 +1000)]
Merge pull request #12538 from JKingsnorth/patch-8
dev/core#131 Stop Monmouthshire from breaking upgrades
Eileen McNaughton [Tue, 24 Jul 2018 08:23:59 +0000 (20:23 +1200)]
Merge pull request #12501 from pradpnayak/customFT
Expose UI support for custom fields on financial types
Eileen McNaughton [Tue, 24 Jul 2018 05:08:00 +0000 (17:08 +1200)]
Merge pull request #12541 from colemanw/menuIcons
Update navigation menu items to use FontAwesome
Eileen McNaughton [Tue, 24 Jul 2018 04:53:18 +0000 (16:53 +1200)]
Merge pull request #12437 from mattwire/fix_premium_display_contributionpage
dev/core#242 Fix display of premiums on contribution page
Eileen McNaughton [Tue, 24 Jul 2018 04:52:26 +0000 (16:52 +1200)]
Merge pull request #12387 from mattwire/paypalipn_fixes
dev/financial#27 Paypal_Standard recurring IPNs don't work
eileen [Tue, 24 Jul 2018 03:40:18 +0000 (15:40 +1200)]
Reduce config required to use Redis.
Specifying the default port sensibly removes one config step & makes sysadmins happier
Tim Otten [Mon, 9 Jul 2018 00:43:01 +0000 (17:43 -0700)]
(dev/core#217) CRM_Utils_Cache_Redis::connect() - Allow pooling connections
Before
------
* Every time you create an instance of `CRM_Utils_Cache_Redis`, it makes
a new instance of the driver class `Redis`.
After
-----
* Every time you create an instance of `CRM_Utils_Cache_Redis`, it uses
a shared instance of the driver class `Redis` (assuming the host/port
are the same).
* If you're writing a driver somewhere else (e.g. the upcomgin
`CRM_Core_PrevNextCache_Redis`), you can use the shared instance
of `Redis`.
Eileen McNaughton [Tue, 24 Jul 2018 01:15:46 +0000 (13:15 +1200)]
Merge pull request #12540 from colemanw/Link
Link to option group page from option group menu item
Seamus Lee [Tue, 24 Jul 2018 01:05:38 +0000 (11:05 +1000)]
Merge pull request #12539 from colemanw/recursiveUtils
(NFC) Remove deprecated recursive array utils
Tim Otten [Mon, 2 Jul 2018 22:58:45 +0000 (15:58 -0700)]
(dev/core#217) Campaign Selector - Change direct SQL call to `prevnext->fillWithSql(...)`
Tim Otten [Sat, 30 Jun 2018 00:34:07 +0000 (17:34 -0700)]
(dev/core#217) CRM_Contact_Selector::rebuildPreNextCache - Use PrevNextCache::fillWithArray()
Tim Otten [Fri, 29 Jun 2018 22:05:31 +0000 (15:05 -0700)]
(dev/core#217) CRM_Contact_Selector::fillupPrevNextCache - Use PrevNextCache::fillWithSql()
John Kingsnorth [Mon, 23 Jul 2018 16:01:22 +0000 (17:01 +0100)]
dev/core#131 Stop Monmouthshire from breaking upgrades
Eileen McNaughton [Mon, 23 Jul 2018 19:47:23 +0000 (07:47 +1200)]
Merge pull request #12473 from mattwire/optiongroup_ui_improvements
dev/core#259 OptionGroup Admin UI workflow improvements
Coleman Watts [Mon, 23 Jul 2018 19:33:11 +0000 (15:33 -0400)]
Update navigation menu items to use FontAwesome
Matthew Wire (MJW Consulting) [Mon, 23 Jul 2018 19:25:54 +0000 (20:25 +0100)]
Use same function for 'Contributions' tab count on subtab
Coleman Watts [Mon, 23 Jul 2018 18:56:57 +0000 (14:56 -0400)]
Link to option group page from option group menu item
colemanw [Mon, 23 Jul 2018 18:32:27 +0000 (14:32 -0400)]
Merge pull request #12529 from colemanw/Deprecate
(NFC) Deprecate redundant array util function
Coleman Watts [Mon, 23 Jul 2018 18:28:36 +0000 (14:28 -0400)]
Remove deprecated recursive array utils
Matthew Wire [Fri, 6 Jul 2018 16:34:18 +0000 (17:34 +0100)]
Improve PayPalIPN unit tests
Matthew Wire (MJW Consulting) [Mon, 23 Jul 2018 17:08:20 +0000 (18:08 +0100)]
Don't hardcode contribution_status_id in PayPalProIPN, re-order parameters for readability to match PayPalIPN
Matthew Wire [Sun, 1 Jul 2018 19:43:36 +0000 (20:43 +0100)]
Fix Paypal recurring IPNs
Matthew Wire [Fri, 6 Jul 2018 21:21:20 +0000 (22:21 +0100)]
financial_type_id is not required for a premium product so may not be set in civicrm_premium_product. The filter for display should select those with a NULL financial_type as well as specific financial types.
Matthew Wire [Sat, 14 Jul 2018 15:52:48 +0000 (16:52 +0100)]
Improve optiongroups admin UI workflow
Matthew Wire [Sun, 17 Dec 2017 09:54:47 +0000 (18:54 +0900)]
Disable sending from logged in contact ID / user email for 'Tell a Friend'
Pradeep Nayak [Mon, 23 Jul 2018 14:27:00 +0000 (15:27 +0100)]
fixed api test
Pradeep Nayak [Thu, 19 Jul 2018 17:30:04 +0000 (23:00 +0530)]
added api test
Pradeep Nayak [Mon, 23 Jul 2018 13:25:43 +0000 (14:25 +0100)]
Added code to support custom field for Financial Type
Mukesh Ram [Mon, 23 Jul 2018 11:03:26 +0000 (16:33 +0530)]
SHOR-13: Fix regression search
Eileen McNaughton [Mon, 23 Jul 2018 04:03:15 +0000 (16:03 +1200)]
Merge pull request #12531 from seamuslee001/fix_line_endings
(NFC) Convert files to use linux line endings not windows
Eileen McNaughton [Mon, 23 Jul 2018 03:52:44 +0000 (15:52 +1200)]
Merge pull request #12534 from civicrm/5.4
5.4 to master
Eileen McNaughton [Mon, 23 Jul 2018 03:52:16 +0000 (15:52 +1200)]
Merge pull request #12533 from JMAConsulting/dev-core-272-54
dev/core#272 : Fatal Error (Regression) on PCP pages associated with Events
eileen [Fri, 20 Jul 2018 03:56:03 +0000 (15:56 +1200)]
Move relationship return properties to the processor class to fix leakage related test fail
deb.monish [Sun, 22 Jul 2018 06:20:43 +0000 (11:50 +0530)]
dev/core#272 : Fatal Error (Regression) on PCP pages associated with Events
Seamus Lee [Sat, 21 Jul 2018 22:02:27 +0000 (08:02 +1000)]
(NFC) Convert files to use linux line endings not windows
Seamus Lee [Sat, 21 Jul 2018 21:49:27 +0000 (07:49 +1000)]
Merge pull request #12526 from agh1/relpermicons
Icons in colored boxes for relationship permissions
Andrew Hunt [Sat, 21 Jul 2018 17:45:12 +0000 (13:45 -0400)]
Relationship permissions: put icons first when viewing a single relationship
Coleman Watts [Sat, 21 Jul 2018 14:40:35 +0000 (10:40 -0400)]
Deprecate redundant array util function
Eileen McNaughton [Sat, 21 Jul 2018 04:29:46 +0000 (16:29 +1200)]
Merge pull request #12528 from eileenmcnaughton/tim
(dev/core#217) Add skeletal PrevNextCache service
Eileen McNaughton [Sat, 21 Jul 2018 00:34:21 +0000 (12:34 +1200)]
Merge pull request #12505 from eileenmcnaughton/export_fix_return_order
Extract code for getting additional return properties, test
Eileen McNaughton [Sat, 21 Jul 2018 00:29:16 +0000 (12:29 +1200)]
Merge pull request #12523 from eileenmcnaughton/product
Fix signature on BAO_Product::add to make ids optional
Tim Otten [Fri, 29 Jun 2018 21:07:54 +0000 (14:07 -0700)]
(dev/core#217) Add skeletal PrevNextCache service
Seamus Lee [Fri, 20 Jul 2018 21:57:25 +0000 (07:57 +1000)]
Merge pull request #12524 from mukeshcompucorp/SHOR-9-regression-issues-advanced-search
Shoreditch support: Fix following change in core that resulted in visual regression in shoreditch in advanced search
eileen [Wed, 18 Jul 2018 11:47:29 +0000 (23:47 +1200)]
Export Move relationship type definition to processor class
eileen [Wed, 18 Jul 2018 11:47:29 +0000 (23:47 +1200)]
Export: refactor default return properties retrieval to the Processor class
eileen [Wed, 18 Jul 2018 09:28:09 +0000 (21:28 +1200)]
Move paymentTableID to processor class
paymentid
eileen [Wed, 18 Jul 2018 09:20:27 +0000 (21:20 +1200)]
Refactor out paymentFields
Code tidy up on payent fields var
eileen [Wed, 18 Jul 2018 11:41:15 +0000 (23:41 +1200)]
Remove caching of static arrays & reference marker as we are getting inconsisten results from this function during testing
eileen [Wed, 18 Jul 2018 03:24:52 +0000 (15:24 +1200)]
Extract code for getting additional return properties, test
Fix for test fail when full suite run, make sure Case is enabled, fix params
eileen [Fri, 20 Jul 2018 09:02:25 +0000 (21:02 +1200)]
Remove ids from BAO_Product::create (renamed from add) signature altogether
This is actually a new function so we don't need to respect the signature of the deprecated one
Andrew Hunt [Fri, 20 Jul 2018 20:05:54 +0000 (16:05 -0400)]
Relationship permissions: standardize all permission icons into template
Andrew Hunt [Fri, 20 Jul 2018 19:32:59 +0000 (15:32 -0400)]
Relationship permissions: color the squares
colemanw [Fri, 20 Jul 2018 19:23:24 +0000 (15:23 -0400)]
Merge pull request #12518 from eileenmcnaughton/export_notice_tests
Export : Add a lot of unit tests. Fix an enotice
Andrew Hunt [Fri, 20 Jul 2018 19:09:06 +0000 (15:09 -0400)]
Relationship permissions: move icons to template, change to stacked on squares
colemanw [Fri, 20 Jul 2018 16:10:48 +0000 (12:10 -0400)]
Merge pull request #12207 from JMAConsulting/access-3-contri
dev/accessiblity#3 Add aria-label to form elements of contribution page which don't have accessible labels
Mukesh Ram [Fri, 20 Jul 2018 09:25:01 +0000 (14:55 +0530)]
SHOR-9: Fix regression issues advanced search
Matthew Wire [Fri, 20 Jul 2018 08:54:32 +0000 (20:54 +1200)]
Fix signature on BAO_Product::add to make ids optional
Eileen McNaughton [Fri, 20 Jul 2018 04:41:53 +0000 (16:41 +1200)]
Merge pull request #12520 from civicrm/5.4
5.4
Eileen McNaughton [Fri, 20 Jul 2018 04:41:20 +0000 (16:41 +1200)]
Merge pull request #12517 from eileenmcnaughton/case_export_fail
Fix regression on case export from recent export fix
Seamus Lee [Fri, 20 Jul 2018 02:58:14 +0000 (12:58 +1000)]
Merge pull request #12519 from totten/5.4-purify
(Forward port) Add Smarty modifier to purify HTML
Sean Madsen [Sun, 22 Apr 2018 13:29:03 +0000 (09:29 -0400)]
Add Smarty modifier to purify HTML
With this modifier, we can write Smarty code like:
<div>{$untrustedHTML|purify}</div>
By using the purify modifier, we've protected against XSS, even if the
output variable contains HTML.
eileen [Thu, 19 Jul 2018 22:47:44 +0000 (10:47 +1200)]
Fix regression on case export from recent export fix
https://github.com/civicrm/civicrm-core/commit/
3b4adc92793dccfa446cf66f0740edb543f110d7 changed the way componentmode is defined
It now seems inconsistent
eileen [Thu, 19 Jul 2018 08:32:05 +0000 (20:32 +1200)]
Remove e-notice causing clause.
I'm pretty convinced that this would never be true - although it WOULD be true [] would have the case fields. We are calling queryFields both with case enabled & disabled which is the only thing changing it's output
eileen [Thu, 19 Jul 2018 07:26:28 +0000 (19:26 +1200)]
Test sql Column definitions for all default fields
Eileen McNaughton [Thu, 19 Jul 2018 21:14:52 +0000 (09:14 +1200)]
Merge pull request #12515 from civicrm/5.4
5.4 to master
Eileen McNaughton [Thu, 19 Jul 2018 21:14:26 +0000 (09:14 +1200)]
Merge pull request #12514 from seamuslee001/5-3-1-update-notes
Update 5.3.1 Release Notes to include final SA
Seamus Lee [Thu, 19 Jul 2018 21:02:03 +0000 (07:02 +1000)]
Update 5.3.1 Release Notes to include final SA
Monish Deb [Thu, 19 Jul 2018 11:58:33 +0000 (17:28 +0530)]
Merge pull request #12503 from eileenmcnaughton/strtolower_1
Remove LOWER from street_address search, rely on mysql to handle.
Eileen McNaughton [Thu, 19 Jul 2018 11:25:00 +0000 (23:25 +1200)]
Merge pull request #12483 from colemanw/DAODefault
Respect '0' as a default when generating DAOs
Eileen McNaughton [Wed, 18 Jul 2018 22:56:17 +0000 (10:56 +1200)]
Merge pull request #12511 from eileenmcnaughton/master
Merge 5.4 to master
eileen [Wed, 18 Jul 2018 22:53:14 +0000 (10:53 +1200)]
Merge branch '5.4' of https://github.com/civicrm/civicrm-core
Eileen McNaughton [Wed, 18 Jul 2018 22:34:36 +0000 (10:34 +1200)]
Merge pull request #12504 from eileenmcnaughton/yashi
Fix misformatted start_date default on new contribution page
Seamus Lee [Mon, 16 Jul 2018 05:27:14 +0000 (15:27 +1000)]
Add in 5.3.1 Release notes
eileen [Tue, 12 Jun 2018 22:22:44 +0000 (10:22 +1200)]
Add escape to various lines in merge.tpl
Coleman Watts [Wed, 25 Apr 2018 14:53:36 +0000 (10:53 -0400)]
Escape js strings in smarty templates
Sean Madsen [Sun, 22 Apr 2018 13:53:29 +0000 (09:53 -0400)]
security/core#3 Improve output escaping for errors
- In the template, use either `escape` or `purify` for all outputs.
- Remove `htmlspecialchars()` call in PHP since it's now happening in
Smarty via `escape`.
Sean Madsen [Sun, 22 Apr 2018 00:25:55 +0000 (20:25 -0400)]
security/core#2 Harden some of the "mode" inputs
Sean Madsen [Sun, 22 Apr 2018 15:07:56 +0000 (11:07 -0400)]
security/core#1 Escape outputs in report stats
Seamus Lee [Thu, 26 Apr 2018 21:55:56 +0000 (07:55 +1000)]
Resolve #19 Fix regression following upgrade to latest CKEditor by getting uploaded file response back in json
Seamus Lee [Tue, 24 Apr 2018 22:48:36 +0000 (08:48 +1000)]
Update to latest CKEdtior
Sean Madsen [Sun, 22 Apr 2018 02:11:56 +0000 (22:11 -0400)]
Add HTML purification to status messages
This is a security protection measure that protects us just a little bit
more against XSS.
Sean Madsen [Sun, 22 Apr 2018 23:06:46 +0000 (19:06 -0400)]
security/core#14 Add output encoding within js
Sean Madsen [Sun, 22 Apr 2018 21:50:47 +0000 (17:50 -0400)]
security/core#14 Validate "context" inputs
When "context" is passed as a GET parameter, ensure that its values is
a valid "Alphanumeric" type. This helps prevent XSS when the "context"
value finds its way into templates that lack HTML output encoding.
Replace...
CRM_Utils_Request::retrieve\((['"])context\1,(\s*)(['"])String\3
...with...
CRM_Utils_Request::retrieve\($1context$1,$3Alphanumeric$3
Also search for the following and manually fix:
\$_GET\[(['"])context\1\]
\$_POST\[(['"])context\1\]
\$_REQUEST\[(['"])context\1\]
Eileen McNaughton [Wed, 18 Jul 2018 21:54:15 +0000 (09:54 +1200)]
Merge pull request #12492 from eileenmcnaughton/msg_fix
dev/core/#/258 Fix message update routine.
colemanw [Wed, 18 Jul 2018 16:17:25 +0000 (12:17 -0400)]
Merge pull request #11197 from agileware/CRM-21104
CRM-21104: Forcing reCaptcha on Contribution pages(with online payments) which have no Profile associated with them.
Eileen McNaughton [Wed, 18 Jul 2018 13:53:36 +0000 (01:53 +1200)]
Merge pull request #12499 from wannesderoy/patch-4
Allow Drupal 8 vendor folder outside webroot
Eileen McNaughton [Wed, 18 Jul 2018 12:58:32 +0000 (00:58 +1200)]
Merge pull request #12508 from civicrm/5.4
5.4 to master
Eileen McNaughton [Wed, 18 Jul 2018 12:57:58 +0000 (00:57 +1200)]
Merge pull request #12502 from eileenmcnaughton/no_pay
Prevent financial transactions from being saved with no payment instr…
Eileen McNaughton [Wed, 18 Jul 2018 12:00:00 +0000 (00:00 +1200)]
Merge pull request #12469 from eileenmcnaughton/export_extract
Export cleanup Extract bulk of the transformation for each field to its own function
Eileen McNaughton [Wed, 18 Jul 2018 10:36:38 +0000 (22:36 +1200)]
Merge pull request #12489 from eileenmcnaughton/mergees
dev/core/#/233 Expose information about where a contact has been merged to