Conflicts:
	Controllers/api/v1/blog.php
	Controllers/api/v2/boost/feed.php
	Core/Provisioner/Provisioners/cassandra-provision.cql
	composer.json
	settings.example.php

[Sprint/GiddyGiraffe] (fix): analytics

See merge request !246

Marcelo Rivera authored Jul 23, 2019 and Mark Harding committed Jul 23, 2019

(fix): never include last unit in given timestamp

[Sprint/GiddyGiraffe] (fix): don't show suggestions if near subscriptions ratelimit threshold

Closes #267

See merge request !192

Fixed bug causing script to exit

See merge request !275

[Sprint/InterestingIguana](bug): Adding in max video filesize config for front/1506

Closes front#1506

See merge request !269

(fix) Cast guid values to string in UpdateMarker export - Fixes #638

Closes #638

See merge request !278

[Sprint/JollyJellyfish](chore): Referrals console SEO

Closes #651

See merge request !276

epic/referrals

Closes #614

See merge request !236

Olivia Madrid authored Jul 18, 2019 and Mark Harding committed Jul 18, 2019

-subdomain=rockyracoon

[Sprint/InterestingIguana] (feat) ability to disable toaster notifications

Closes #239

See merge request !256

[Sprint/InterestingIguana] (fix): resolve comments by urn

Closes #457

See merge request !262

[Sprint/InterestingIguana] (fix) Blog: Check if an activity exists before creating to prevent double posts

Closes #632

See merge request !272

Guy Thouret authored Jul 16, 2019 and Mark Harding committed Jul 16, 2019

[Sprint/InterestingIguana] (fix) Blog: Check if an activity exists before creating to prevent double posts

(feat) Specify From minds.com on sms messages

See merge request !267

(feat) Disabling comments 526

See merge request !255

Brian Hatchet authored Jul 16, 2019 and Mark Harding committed Jul 16, 2019

Backend for turning off comments
Extended the base entities to track whether or not comments are allowed
Setup a Permissions/Manager to centralize applying of permissions (much more to come, this is just setting up the flow with comments feature)
Setup a new permissions end point that validates and applies the permissions
Extended the comments endpoint to enforce comments permissions