civicrm-core.git
5 years agofixes issue #981: sort participants did not remember search criteria
Alain Benbassat [Fri, 24 May 2019 21:37:58 +0000 (23:37 +0200)]
fixes issue #981: sort participants did not remember search criteria

5 years agoMerge pull request #14277 from seamuslee001/dev_core_976
Seamus Lee [Tue, 21 May 2019 21:18:32 +0000 (07:18 +1000)]
Merge pull request #14277 from seamuslee001/dev_core_976

Remove htmlpurifier from composer and move it back to within IDS to f…

5 years agoRemove htmlpurifier from composer and move it back to within IDS to fix breakage...
Seamus Lee [Tue, 21 May 2019 02:31:32 +0000 (12:31 +1000)]
Remove htmlpurifier from composer and move it back to within IDS to fix breakage on drupal with the htmlpurifier module

5 years agoJenkins style fix
Seamus Lee [Wed, 15 May 2019 20:39:27 +0000 (06:39 +1000)]
Jenkins style fix

5 years agoUpdate 5.13.4.md
totten [Wed, 15 May 2019 15:48:00 +0000 (15:48 +0000)]
Update 5.13.4.md

5 years agoUpdate date of 5.13.3 release and add in APIv4 SA into 5.13.4
Seamus Lee [Tue, 14 May 2019 21:19:22 +0000 (07:19 +1000)]
Update date of 5.13.3 release and add in APIv4 SA into 5.13.4

5 years agoUpdate 5.13.4.md
totten [Tue, 14 May 2019 10:34:04 +0000 (10:34 +0000)]
Update 5.13.4.md

5 years agoWIP Release Notes for security release
Seamus Lee [Wed, 1 May 2019 02:40:10 +0000 (12:40 +1000)]
WIP Release Notes for security release

Update Release notes based on Tim's Review and likely drop of 5.13.3

5 years agocivicrm/file - Be forgiving about old image hyperlinks
Tim Otten [Wed, 8 May 2019 23:41:55 +0000 (16:41 -0700)]
civicrm/file - Be forgiving about old image hyperlinks

Previous versions of Civi sometimes generated URLs for contact-images with incorrect `&mime-type` values:

http://dmaster.bknix:8001/civicrm/file?reset=1&filename=Hello_cca4153cb14beab37c68ab7f07162425.jpg&mime-type=image/jpg

The recent security update will generate an error if the mime-type is incorrect, so this patch relaxes it
to allow the old links to continue working.

5 years agoAdd whitelist back in and validate extension of file is permtted for the mime-type...
Seamus Lee [Fri, 3 May 2019 04:53:48 +0000 (14:53 +1000)]
Add whitelist back in and validate extension of file is permtted for the mime-type supplied and use mime-type from db if supplied with an fid and eid

Switch to different libary that is php5.6 compatable

5 years agoStrength mime checking by comparing mime-type to the file path mime-type if we have...
Seamus Lee [Fri, 29 Mar 2019 23:34:47 +0000 (10:34 +1100)]
Strength mime checking by comparing mime-type to the file path mime-type if we have entity_id and file id otherwise only permit image mime_types to be accepted if going via the filename route

Ensure mimetype is set in the case where we are passing it through and its valid

Remove Whitelisting of mime-types as not useful and only check mime-types if we have had one passed in

5 years agoResolve security/core#45 by validating the mimeType of the file with the supplied...
Seamus Lee [Sun, 3 Mar 2019 01:14:16 +0000 (12:14 +1100)]
Resolve security/core#45 by validating the mimeType of the file with the supplied mime-type

5 years agoResolve security/core#52 by validating that an installtype is sensible
Seamus Lee [Mon, 29 Apr 2019 04:05:15 +0000 (14:05 +1000)]
Resolve security/core#52 by validating that an installtype is sensible

5 years agosecurity/core#49 Ensure that only intergers are passed to the IN build options in...
Seamus Lee [Sat, 30 Mar 2019 05:19:58 +0000 (16:19 +1100)]
security/core#49 Ensure that only intergers are passed to the IN build options in address

Fix Rule checking and add a unit test

Add in unit test on building country_id options too

Add in a unit test for building county options with a state_province_id filter

5 years agoAlso escape subtype to fix POC#2 found by Patrick
Seamus Lee [Sun, 28 Apr 2019 22:32:58 +0000 (08:32 +1000)]
Also escape subtype to fix POC#2 found by Patrick

5 years agoescape alphanumeric/checkbox custom data
Jamie McClelland [Wed, 20 Feb 2019 17:59:34 +0000 (12:59 -0500)]
escape alphanumeric/checkbox custom data

5 years agoFix security/core#51 by paramatising the Event Type part of the wuere clause
Seamus Lee [Mon, 22 Apr 2019 07:45:52 +0000 (17:45 +1000)]
Fix security/core#51 by paramatising the Event Type part of the wuere clause

5 years agoResolve security/core#53 by updating tcpdf to latest version of 6.2.x
Seamus Lee [Wed, 24 Apr 2019 20:03:57 +0000 (06:03 +1000)]
Resolve security/core#53 by updating tcpdf to latest version of 6.2.x

5 years ago(security/core#50) Update jQuery to address prototype pollution
Tim Otten [Tue, 23 Apr 2019 23:00:35 +0000 (16:00 -0700)]
(security/core#50) Update jQuery to address prototype pollution

5 years agoDon't expose condition to api.getoptions
Coleman Watts [Tue, 26 Mar 2019 22:16:18 +0000 (18:16 -0400)]
Don't expose condition to api.getoptions

5 years agoHarden against serialization vulnerabilities (#46)
Tim Otten [Tue, 5 Mar 2019 00:05:06 +0000 (16:05 -0800)]
Harden against serialization vulnerabilities (#46)

5 years agoMerge pull request #14246 from seamuslee001/5.14-release-notes
Seamus Lee [Tue, 14 May 2019 23:28:23 +0000 (09:28 +1000)]
Merge pull request #14246 from seamuslee001/5.14-release-notes

5.13.3 Release Notes

5 years agocontributor-key.yml, 5.13.13.md - Fix typo in credit
Tim Otten [Tue, 14 May 2019 10:54:21 +0000 (11:54 +0100)]
contributor-key.yml, 5.13.13.md - Fix typo in credit

I saw a typo and asked Patrick for preferred text.

5 years agoUpdate 5.13.3.md
Tim Otten [Sat, 11 May 2019 08:04:52 +0000 (09:04 +0100)]
Update 5.13.3.md

5 years agoUpdate 5.13.3.md
Tim Otten [Sat, 11 May 2019 08:03:11 +0000 (09:03 +0100)]
Update 5.13.3.md

5 years agoUpdate release notes
Seamus Lee [Sat, 11 May 2019 01:59:59 +0000 (11:59 +1000)]
Update release notes

5 years agoAdd in Release notes for 5.13.3 Drop
Seamus Lee [Fri, 10 May 2019 22:42:58 +0000 (08:42 +1000)]
Add in Release notes for 5.13.3 Drop

5 years agoMerge pull request #14236 from seamuslee001/activity_test
Eileen McNaughton [Sat, 11 May 2019 23:48:34 +0000 (11:48 +1200)]
Merge pull request #14236 from seamuslee001/activity_test

Fix Failing Activity Test

5 years agoFix Failing Activity Test
Seamus Lee [Sat, 11 May 2019 07:25:11 +0000 (17:25 +1000)]
Fix Failing Activity Test

5 years agoMerge pull request #14223 from eileenmcnaughton/5.14
Seamus Lee [Sat, 11 May 2019 06:40:48 +0000 (16:40 +1000)]
Merge pull request #14223 from eileenmcnaughton/5.14

dev/core#942 fix failure to render names for some activities

5 years agodev/core#942 fix failure to render names for some activities
eileenmcnaugton [Fri, 10 May 2019 04:13:11 +0000 (16:13 +1200)]
dev/core#942 fix failure to render names for some activities

Overview
----------------------------------------
Set limit for activity_contact retrieval to 0, allowing to retrieve more than 25 activity contacts when rendering the first 25 activities on the activity contact tab

Before
----------------------------------------
![before](https://user-images.githubusercontent.com/336308/57439801-e42a0580-729a-11e9-80a1-45df93d0c5eb.jpg)

After
----------------------------------------
![after](https://user-images.githubusercontent.com/336308/57439960-39fead80-729b-11e9-9701-acd79ff73497.jpg)

Technical Details
----------------------------------------
This moves the logic for retrieving the target contacts back into the getActivities function. We are stil not wanting to bypass the ACLs so still using the
api but strictly limiting the number of contacts we retrieve (at the cost of extra queries, but cheap ones).

Some tests added on the Bulk Mail activity.

Comments
----------------------------------------

5 years agoMerge pull request #14233 from seamuslee001/participant_count_search_fix
Eileen McNaughton [Sat, 11 May 2019 01:33:52 +0000 (13:33 +1200)]
Merge pull request #14233 from seamuslee001/participant_count_search_fix

dev/core#956 Fix hard breakage in find participants form when you do a filter on o…

5 years agoMerge pull request #14220 from pradpnayak/core/issues/923
Seamus Lee [Fri, 10 May 2019 23:31:19 +0000 (09:31 +1000)]
Merge pull request #14220 from pradpnayak/core/issues/923

core/issues/923, Fixed notice error when creating/editing profile

5 years agodev/core#956 Fix hard breakage in find participants form when you do a filter on...
Seamus Lee [Fri, 10 May 2019 23:24:47 +0000 (09:24 +1000)]
dev/core#956 Fix hard breakage in find participants form when you do a filter on one event and n participant statues

5 years agoMerge pull request #14214 from jitendrapurohit/activity-input
Eileen McNaughton [Fri, 10 May 2019 09:05:17 +0000 (21:05 +1200)]
Merge pull request #14214 from jitendrapurohit/activity-input

Add select2 to input field of datepicker

5 years agoMerge pull request #14221 from seamuslee001/activty_wrapper_date_picker_template
Eileen McNaughton [Fri, 10 May 2019 09:02:30 +0000 (21:02 +1200)]
Merge pull request #14221 from seamuslee001/activty_wrapper_date_picker_template

Add in Wrapper template around DatePickerRange template to have bette…

5 years agoAdd in Wrapper template around DatePickerRange template to have better layout of...
Seamus Lee [Fri, 10 May 2019 00:16:19 +0000 (10:16 +1000)]
Add in Wrapper template around DatePickerRange template to have better layout of Activity Search Form

Allow for colspan and class to be set when adding in wrapper

Update the wrapper to be only one td and not all and fix activity template appropriately

5 years agoMerge pull request #14219 from colemanw/hover
Eileen McNaughton [Thu, 9 May 2019 23:52:24 +0000 (11:52 +1200)]
Merge pull request #14219 from colemanw/hover

dev/core#950 Remove deprecated :hover jQuery selector

5 years agoRemove deprecated :hover jQuery selector
Coleman Watts [Thu, 9 May 2019 21:50:53 +0000 (17:50 -0400)]
Remove deprecated :hover jQuery selector

5 years agocore/issues/923, Fixed notice error when creating/editing profile
Pradeep Nayak [Thu, 9 May 2019 21:35:00 +0000 (22:35 +0100)]
core/issues/923, Fixed notice error when creating/editing profile

5 years agoAdd select2 to input field of datepicker
Jitendra Purohit [Wed, 8 May 2019 04:40:18 +0000 (10:10 +0530)]
Add select2 to input field of datepicker

5 years agoMerge pull request #14210 from seamuslee001/5_13_2_release_notes
Seamus Lee [Tue, 7 May 2019 01:35:15 +0000 (11:35 +1000)]
Merge pull request #14210 from seamuslee001/5_13_2_release_notes

Add 5.13.2 release notes

5 years agoUpdate 5.13.2.md
Tim Otten [Mon, 6 May 2019 23:32:12 +0000 (16:32 -0700)]
Update 5.13.2.md

5 years agoUpdate Release notes for dev/core#940
Seamus Lee [Mon, 6 May 2019 22:35:55 +0000 (08:35 +1000)]
Update Release notes for dev/core#940

Include Dave D for review purposes

5 years agoAdd 5.13.2 release notes
Tim Otten [Mon, 6 May 2019 19:31:11 +0000 (12:31 -0700)]
Add 5.13.2 release notes

5 years agoMerge pull request #14208 from seamuslee001/dev_core_940_5_14
Seamus Lee [Mon, 6 May 2019 23:34:42 +0000 (09:34 +1000)]
Merge pull request #14208 from seamuslee001/dev_core_940_5_14

(dev/core#940) Fix regression involving Email Processor filing and ".unknown" attachments

5 years agoFix Regression in Email Processor filing all emails as .unknown attachments
Seamus Lee [Mon, 6 May 2019 22:29:50 +0000 (08:29 +1000)]
Fix Regression in Email Processor filing all emails as .unknown attachments

5 years agoMerge pull request #14204 from totten/5.14-act-sort
Seamus Lee [Mon, 6 May 2019 20:36:27 +0000 (06:36 +1000)]
Merge pull request #14204 from totten/5.14-act-sort

(dev/core#934; followup) Fix escaping on new query code

5 years ago(dev/core#934; followup) Fix escaping on new query code
Tim Otten [Mon, 6 May 2019 19:34:37 +0000 (12:34 -0700)]
(dev/core#934; followup) Fix escaping on new query code

This updates a line which was added in the past day (#14194) to ensure that
the data is escaped.

5 years agoMerge pull request #14194 from eileenmcnaughton/activity_sort
Seamus Lee [Sun, 5 May 2019 02:38:19 +0000 (12:38 +1000)]
Merge pull request #14194 from eileenmcnaughton/activity_sort

dev/core#934 Fix regression on sorting activity tab by 'Added by'

5 years agodev/core#934 Fix regression on sorting activity tab by 'Added by'
eileen [Fri, 3 May 2019 02:37:14 +0000 (14:37 +1200)]
dev/core#934 Fix regression on sorting activity tab by 'Added by'

5 years agoMerge pull request #14193 from seamuslee001/5.14
Eileen McNaughton [Fri, 3 May 2019 05:29:19 +0000 (17:29 +1200)]
Merge pull request #14193 from seamuslee001/5.14

On PHP 7.2 we cannot start session until it has been configured by Dr…

5 years agoOn PHP 7.2 we cannot start session until it has been configured by Drupal.
mark burdett [Tue, 16 Apr 2019 23:29:43 +0000 (16:29 -0700)]
On PHP 7.2 we cannot start session until it has been configured by Drupal.

5 years agoMerge pull request #14191 from seamuslee001/5_13_release_notes
Seamus Lee [Fri, 3 May 2019 00:55:29 +0000 (10:55 +1000)]
Merge pull request #14191 from seamuslee001/5_13_release_notes

Add in release notes for 5.13.1 drop

5 years agoMerge pull request #14135 from colemanw/menubarVars
Seamus Lee [Thu, 2 May 2019 23:16:12 +0000 (09:16 +1000)]
Merge pull request #14135 from colemanw/menubarVars

Hook to alter menubar css variables & fix breakpoint in WP

5 years agoUpdate 5.13.1.md
Tim Otten [Thu, 2 May 2019 22:48:16 +0000 (15:48 -0700)]
Update 5.13.1.md

5 years agoMerge pull request #14189 from MegaphoneJon/wordpress-26-5.14
Seamus Lee [Thu, 2 May 2019 22:08:02 +0000 (08:08 +1000)]
Merge pull request #14189 from MegaphoneJon/wordpress-26-5.14

wordpress#26 - fix REST

5 years agoAdd in release notes for 5.13.1 drop
Seamus Lee [Thu, 2 May 2019 21:30:39 +0000 (07:30 +1000)]
Add in release notes for 5.13.1 drop

5 years agowordpress#26 - fix REST
Jon Goldberg [Thu, 2 May 2019 20:00:19 +0000 (16:00 -0400)]
wordpress#26 - fix REST

5 years agoMerge pull request #14188 from seamuslee001/dev_core_931_5_14
Seamus Lee [Thu, 2 May 2019 21:09:40 +0000 (07:09 +1000)]
Merge pull request #14188 from seamuslee001/dev_core_931_5_14

Resolve dev/core#931 by not doing translation on the query if field e…

5 years agoResolve dev/core#931 by not doing translation on the query if field exists during...
Seamus Lee [Thu, 2 May 2019 20:22:41 +0000 (06:22 +1000)]
Resolve dev/core#931 by not doing translation on the query if field exists during the upgrade process

5 years agoSet version to 5.14.beta1
CiviCRM [Thu, 2 May 2019 04:35:35 +0000 (04:35 +0000)]
Set version to 5.14.beta1

5 years agoMerge pull request #14176 from civicrm/5.13
Seamus Lee [Thu, 2 May 2019 02:29:36 +0000 (12:29 +1000)]
Merge pull request #14176 from civicrm/5.13

5.13

5 years agoMerge pull request #14056 from agh1/5.13.0-releasenotes
Tim Otten [Thu, 2 May 2019 02:23:55 +0000 (19:23 -0700)]
Merge pull request #14056 from agh1/5.13.0-releasenotes

5.13.0 release notes

5 years agoUpdate 5.13.0.md
Tim Otten [Wed, 1 May 2019 23:50:50 +0000 (16:50 -0700)]
Update 5.13.0.md

5 years agoMerge pull request #14173 from mlutfy/cart-payment-cid
Eileen McNaughton [Wed, 1 May 2019 23:27:10 +0000 (11:27 +1200)]
Merge pull request #14173 from mlutfy/cart-payment-cid

Event Cart: pass the contactID to fix payment on Stripe

5 years agoMerge pull request #14170 from mlutfy/cart-emails
Eileen McNaughton [Wed, 1 May 2019 23:26:27 +0000 (11:26 +1200)]
Merge pull request #14170 from mlutfy/cart-emails

Event Cart: fix sending of email receipts

5 years agoMerge pull request #14175 from mlutfy/cart-cc-icons
Eileen McNaughton [Wed, 1 May 2019 23:25:51 +0000 (11:25 +1200)]
Merge pull request #14175 from mlutfy/cart-cc-icons

Event Cart: add support for the Credit Card type icons

5 years agoMerge pull request #14174 from mlutfy/cart-allow-same-participant
Eileen McNaughton [Wed, 1 May 2019 23:25:31 +0000 (11:25 +1200)]
Merge pull request #14174 from mlutfy/cart-allow-same-participant

Event Cart: honor the allow_same_participant_emails setting

5 years agoEvent Cart: pass the contactID to fix payment on Stripe
Mathieu Lutfy [Wed, 1 May 2019 15:08:06 +0000 (11:08 -0400)]
Event Cart: pass the contactID to fix payment on Stripe

5 years ago5.13.0 release notes: late changes
Andrew Hunt [Wed, 1 May 2019 21:23:38 +0000 (17:23 -0400)]
5.13.0 release notes: late changes

5 years agouppercase if work is continued or begun
Alice Frumin [Thu, 25 Apr 2019 20:12:08 +0000 (16:12 -0400)]
uppercase if work is continued or begun

5 years agomoving gitlab issues to the end
Alice Frumin [Thu, 25 Apr 2019 20:06:12 +0000 (16:06 -0400)]
moving gitlab issues to the end

5 years ago5.13.0 release notes: bulk of edits
Alice Frumin [Tue, 16 Apr 2019 17:21:09 +0000 (13:21 -0400)]
5.13.0 release notes: bulk of edits

5 years ago5.13.0 release notes: added boilerplate
Andrew Hunt [Mon, 15 Apr 2019 21:01:28 +0000 (17:01 -0400)]
5.13.0 release notes: added boilerplate

5 years ago5.13.0 release notes: raw from script
Andrew Hunt [Mon, 15 Apr 2019 19:21:33 +0000 (15:21 -0400)]
5.13.0 release notes: raw from script

5 years agoEvent Cart: add support for the Credit Card type icons
Mathieu Lutfy [Wed, 1 May 2019 15:33:37 +0000 (11:33 -0400)]
Event Cart: add support for the Credit Card type icons

5 years agoEvent Cart: honor the allow_same_participant_emails setting
Mathieu Lutfy [Wed, 1 May 2019 15:13:28 +0000 (11:13 -0400)]
Event Cart: honor the allow_same_participant_emails setting

5 years agoMerge pull request #14169 from mlutfy/cart-i18n
Matthew Wire [Wed, 1 May 2019 12:05:26 +0000 (13:05 +0100)]
Merge pull request #14169 from mlutfy/cart-i18n

Event Cart: fix start_date formatting in line items during checkout

5 years agoMerge pull request #14168 from eileenmcnaughton/enotice
Matthew Wire [Wed, 1 May 2019 11:26:04 +0000 (12:26 +0100)]
Merge pull request #14168 from eileenmcnaughton/enotice

dev/core#918 enotice fix part 2 #14165

5 years agoEvent Cart: fix sending of email receipts
Mathieu Lutfy [Wed, 1 May 2019 10:32:52 +0000 (06:32 -0400)]
Event Cart: fix sending of email receipts

5 years agoEvent Cart: fix start_date formatting in line items during checkout
Mathieu Lutfy [Wed, 1 May 2019 10:25:00 +0000 (06:25 -0400)]
Event Cart: fix start_date formatting in line items during checkout

5 years agodev/core#918 enotice fix part 2 #14165
eileen [Wed, 1 May 2019 08:34:34 +0000 (20:34 +1200)]
dev/core#918 enotice fix part 2 #14165

5 years agoMerge pull request #14166 from civicrm/5.13
Seamus Lee [Wed, 1 May 2019 00:33:41 +0000 (10:33 +1000)]
Merge pull request #14166 from civicrm/5.13

5.13

5 years agoMerge pull request #14163 from seamuslee001/flexmailer_26
Seamus Lee [Wed, 1 May 2019 00:25:06 +0000 (10:25 +1000)]
Merge pull request #14163 from seamuslee001/flexmailer_26

(flexmailer#29) civicrm/mailing/view - Use Mailing.preview API. Fix compatibility with Flexmailer.

5 years agoMerge pull request #13887 from eileenmcnaughton/group_entity
Eileen McNaughton [Tue, 30 Apr 2019 23:59:47 +0000 (11:59 +1200)]
Merge pull request #13887 from eileenmcnaughton/group_entity

dev/core#818 Partial conversion of Group form to be an EntityForm

5 years agoMerge pull request #14164 from eileenmcnaughton/in_fix
Eileen McNaughton [Tue, 30 Apr 2019 23:41:42 +0000 (11:41 +1200)]
Merge pull request #14164 from eileenmcnaughton/in_fix

Fix deprecation handling [intra-rc-follow up] on #13999]

5 years agoReturn MailingID rather than ['id'] as id may not always be supplied
Seamus Lee [Tue, 30 Apr 2019 23:11:56 +0000 (09:11 +1000)]
Return MailingID rather than ['id'] as id may not always be supplied

5 years ago(flexmailer#29) civicrm/mailing/view - Generate content via Mailing.preview API
Tim Otten [Tue, 30 Apr 2019 22:50:21 +0000 (15:50 -0700)]
(flexmailer#29) civicrm/mailing/view - Generate content via Mailing.preview API

A root cause of flexmailer#29 is that the flexmailer has to override
multiple parts of CiviMail.  Case in point: it overrides the
`civicrm/mailing/view` and forces it to generate content via
`Mailing.preview` API.  This is unfortunate because flexmailer's variant is
missing other features (regarding permissioning and contact IDs).

This revision makes it unnecessary for flexmailer to override
`civicrm/mailing/view`.

5 years agoMerge pull request #14165 from eileenmcnaughton/enotice
colemanw [Tue, 30 Apr 2019 22:44:11 +0000 (18:44 -0400)]
Merge pull request #14165 from eileenmcnaughton/enotice

dev/core#918 Enotice fix

5 years agoMerge pull request #14161 from eileenmcnaughton/really
colemanw [Tue, 30 Apr 2019 22:43:54 +0000 (18:43 -0400)]
Merge pull request #14161 from eileenmcnaughton/really

Convert dedupe select to select 2 and remove not-used var

5 years ago(flexmailer#29) Mailing.preview API - Fix array access warning. Make unit-test pass.
Tim Otten [Tue, 30 Apr 2019 22:42:20 +0000 (15:42 -0700)]
(flexmailer#29) Mailing.preview API - Fix array access warning. Make unit-test pass.

5 years ago(flexmailer#29) Mailing.preview API - Add unit-test for call without contact ID
Tim Otten [Tue, 30 Apr 2019 22:40:46 +0000 (15:40 -0700)]
(flexmailer#29) Mailing.preview API - Add unit-test for call without contact ID

5 years agoEnotice fix
eileen [Tue, 30 Apr 2019 21:57:21 +0000 (09:57 +1200)]
Enotice fix

The check is looking for status at the wrong level in the array

5 years agoflexmailer#26 Fix Flexmailer handling of annonmous user access to view Mailings by...
Seamus Lee [Tue, 30 Apr 2019 20:57:32 +0000 (06:57 +1000)]
flexmailer#26 Fix Flexmailer handling of annonmous user access to view Mailings by porting handling of annon situation to api

5 years agoFix deprecation handling
eileen [Tue, 30 Apr 2019 21:33:26 +0000 (09:33 +1200)]
Fix deprecation handling

Turns out we were one of the sites naughtily using the BAO directly who needed this handling
to work - but because we passed a number in quote it didn't - this fixes

5 years agoMerge pull request #14157 from eileenmcnaughton/ref_dedupe
Seamus Lee [Tue, 30 Apr 2019 21:26:22 +0000 (07:26 +1000)]
Merge pull request #14157 from eileenmcnaughton/ref_dedupe

[REF] function extraction in dedupe code

5 years agoMerge pull request #14162 from civicrm/5.13
Seamus Lee [Tue, 30 Apr 2019 11:06:39 +0000 (21:06 +1000)]
Merge pull request #14162 from civicrm/5.13

5.13

5 years agoMerge pull request #14064 from JMAConsulting/core-338
Yashodha Chaku [Tue, 30 Apr 2019 06:21:27 +0000 (11:51 +0530)]
Merge pull request #14064 from JMAConsulting/core-338

dev/core#338: Batch update membership type

5 years agoMerge pull request #14156 from totten/5.13-mail-tokens
Tim Otten [Tue, 30 Apr 2019 05:50:32 +0000 (22:50 -0700)]
Merge pull request #14156 from totten/5.13-mail-tokens

CiviMail - Restore support for preview of "mailing"/"action" tokens via TokenProcessor/Flexmailer