Commit Graph

12074 Commits

Author SHA1 Message Date
Kevin Ansfield
93fa9b4d9e Removed unnecessary bookshelf-relations config in EmailRecipient model
no issue

- we don't use any of the `bookshelf-relations` plugin's added features for the `EmailRecipient` model so there's no need to opt in to it
2021-01-05 15:28:30 +00:00
Kevin Ansfield
ab834b2615 Updated bookshelf-relations dependency to fix broken release
closes https://github.com/TryGhost/Ghost/issues/12493

- the published version of `bookshelf-relations` 1.4.0 was missing the critical commit that added the new relationship config feature
- v1.4.1 is a valid release
2021-01-05 15:24:45 +00:00
Kevin Ansfield
eccd220461 🐛 Fixed error when deleting a member that has received a newsletter email
closes https://github.com/TryGhost/Ghost/issues/12493

- bumps `bookshelf-relations` to new version that allows for `hasMany` children to be kept when a parent record is destroyed
- adds necessary config to the `Member.email_recipients` relationship to keep related records when a member is deleted
2021-01-05 14:06:20 +00:00
Daniel Lockyer
bc6df8cebe
v3.40.3 2021-01-05 13:10:14 +00:00
Daniel Lockyer
a36c159163
Updated Ghost-Admin to v3.40.3 2021-01-05 13:10:13 +00:00
Rish
d2543462fa 🐛 Fixed reply-to address not set for newsletters
closes https://github.com/TryGhost/Ghost/issues/12492

The changes to email processing models had set replyTo address for an email batch as `reply_to` instead of `replyTo` which was not picked by mailgun service for setting newsletter reply address
2021-01-05 17:58:55 +05:30
Fabien O'Carroll
81218ab467 🐛 Fixed re-enabling of complimentary subscriptions
closes #12503

Since we include _all_ subscriptions in the `stripeSubscriptions`
relation, we must check that for an existing active complimentary
subscription to decide whether or not we should skip creation of a
complimentary subscription
2021-01-05 10:51:05 +00:00
Kukhyeon Heo
7528ec8c3b
🐛 Fixed redirects "to" query params forwarding (#12333)
ref #10898

- The redirects configuration's `to` & `from` URL parameters used to ignore it's query string parameters, which resulted in unexpected behavior
- Current changeset only partially fixes the issue. Now `to` URL's query parameters always take precedence over incoming query parameters and the rest of query parameters are passed through.
2021-01-05 14:11:06 +13:00
Fabien O'Carroll
5af0b5735b 🐛 Added translation for BookshelfRelationsError
refs #12493

This protects against accidental relation errors giving unfriendly
errors messages.
2021-01-04 15:35:43 +00:00
Renovate Bot
9b5184387f Update dependency jwks-rsa to v1.12.1 2021-01-04 08:57:07 +00:00
Renovate Bot
1b0a8f5fbf Update actions/setup-node action to v2 2021-01-04 08:56:33 +00:00
Naz
33bdd2384b 🐛 Fixed incorrect locale loading when changing themes
closes #12271

- When previous active theme did not have locale data for certain language, loading a theme which has such data did not result in correct locale being loaded
- Underlying issue was in settings cache being outdated during theme change related i18n initialization
- Fix focuses on removing settings cache dependency and and rely on most up to date data about currently active theme
- The benefit of this approach is reduced coupling with settings cache
2021-01-04 17:26:22 +13:00
Sumedh
e756af65f2 Removed invalid default 'core' value in settings type
closes #12181
refs https://github.com/TryGhost/Ghost/pull/12265

- The 'core' value is invalid for settings 'type' column
- The 'core' default value for 'type' column in model is also invalid
- Both need to be removed as they are never used and only introduce confusion into the codebase
2021-01-04 15:32:57 +13:00
Renovate Bot
4c52c710b3
Update dependency eslint to v7.17.0 2021-01-04 00:07:54 +00:00
Renovate Bot
2daa87df5b
Update dependency eslint to v7.16.0 2020-12-18 23:06:06 +00:00
Renovate Bot
a0bfec6591
Update dependency @sentry/node to v5.29.2 2020-12-17 20:52:07 +00:00
Renovate Bot
ce6b8364c9
Update dependency sanitize-html to v2.3.0 2020-12-16 16:11:16 +00:00
Daniel Lockyer
2f2b71c2db
v3.40.2 2020-12-16 14:04:43 +00:00
Daniel Lockyer
ea3ebb4735
Updated Ghost-Admin to v3.40.2 2020-12-16 14:04:43 +00:00
Renovate Bot
39489bbc0b Update dependency @tryghost/constants to v0.1.3 2020-12-16 13:46:19 +00:00
Renovate Bot
810989dba8 Update dependency @tryghost/mw-session-from-token to v0.1.13 2020-12-16 13:46:07 +00:00
Renovate Bot
e04f913f1f Update dependency @tryghost/security to v0.2.3 2020-12-16 13:45:49 +00:00
Renovate Bot
b4bb1b46b3
Update dependency @sentry/node to v5.29.1 2020-12-16 11:45:44 +00:00
Naz
31a69d18f0 Improved JSDoc in default scheduler
no issue

- Previously used notation was not a valid JSDoc one. With this correction IDEs will provide more accurate information about all furnction parameters
2020-12-16 17:25:05 +13:00
Renovate Bot
79b723eee6 Update dependency @tryghost/adapter-manager to v0.2.5 2020-12-14 12:18:53 +00:00
Renovate Bot
d37f49508c Update dependency @tryghost/bootstrap-socket to v0.2.4 2020-12-14 12:18:44 +00:00
Renovate Bot
e6b6f74232 Update dependency @tryghost/errors to v0.2.6 2020-12-14 12:18:34 +00:00
Renovate Bot
1cf4d346f7 Update dependency @tryghost/promise to v0.1.3 2020-12-14 12:18:22 +00:00
Renovate Bot
e31c18c013 Update dependency @tryghost/session-service to v0.1.14 2020-12-14 12:17:57 +00:00
Renovate Bot
6383f1dbd7
Update dependency @tryghost/zip to v1.1.7 2020-12-14 05:08:18 +00:00
Naz
c1e3788570 Added central error handler to job manager
refs https://github.com/TryGhost/Ghost-Utils/issues/118

- Duplicating error handling across jobs is not best developer experience. Also, having custom error handling logic did not allow for recommended worker script behavior: allowing for unhandled exceptions to bubble up and be managed by parent process
2020-12-14 18:01:41 +13:00
Kevin Ansfield
8aa55feaf8
Added acceptance test for /member/:id/?include=email_recipients (#12477)
refs c1d66f0b01

- fixed base model allowing '@@INDEXES@@' as a permitted attribute/order
- fixed base model automatically setting `@@INDEXES@@` to null on the model when creating
- added `doAuth('members:emails')`
  - creates an `email_batch` record attached to the first email in the fixtures
  - creates an `email_recipients` record for each member
  - runs analytics aggregation so the email and member counts are as expected
- added acceptance test for `/member/:id/?include=email_recipients`
2020-12-11 18:45:35 +00:00
Renovate Bot
90adc9ed98
Update dependency sinon to v9.2.2 2020-12-11 12:43:36 +00:00
Daniel Lockyer
cbadaa762d
v3.40.1 2020-12-11 11:28:16 +00:00
Daniel Lockyer
0c0b5fb1e0
Updated Ghost-Admin to v3.40.1 2020-12-11 11:28:15 +00:00
Thibaut Patel
1677a05481 🐛 Fixed an issue with zip files parsing.
no issue

Updated gscan to 3.6.1
2020-12-11 12:15:29 +01:00
Daniel Lockyer
78013968e7
v3.40.0 2020-12-10 15:49:37 +00:00
Daniel Lockyer
31ba8029b0
Updated Ghost-Admin to v3.40.0 2020-12-10 15:49:37 +00:00
Fabien O'Carroll
939a54cc35 🐛 Fixed comped flag for members
no-issue

We now include all subscriptions as part of the member, so we need to
ensure the comped flag is only true if the member has an **active**
complimentary plan
2020-12-10 13:14:07 +00:00
Peter Zimon
c856d712ec
Import email refinements (#12473)
* Updated import email subject

* Updated import email title

* Fixed copy in import email to reflect if there was at least one member added
2020-12-10 12:19:26 +01:00
Thibaut Patel
63dde5a46c
Made the package-json module ready to be exported (#12451)
no issue
2020-12-10 11:37:43 +01:00
Kevin Ansfield
c1d66f0b01
Added email_recipients include option to members API read endpoint (#12471)
refs https://github.com/TryGhost/Ghost-Admin/pull/1796

We want to be able to display an email activity timeline in Ghost-Admin for each member. The quickest way to achieve that right now is to provide access to the `email_recipient` data for the member when fetching, this will allow clients to build up a timeline based on the event timestamps included with each email_recipient/email pair.

- sets up `email_recipients` relationship in `Member` model
- updates members API read endpoint to accept an `email_recipients` include parameter
  - appends `email_recipients.email` to the `withRelated` array when `email_recipients` is included so that we have data available for email subject and html/plaintext for previews
- updates members API output serializer to include the email_recipients object in the output
2020-12-10 10:04:05 +00:00
Kevin Ansfield
9586d1ce56 Fixed sqlite storing member email open rate as floats
no issue

- sqlite will store a float in an integer column due to it's type affinity resulting in long decimal numbers in the UI when we're expecting an integer
- use the `ROUND()` function to ensure we're storing integers in place of floats when performing open rate average calculations
2020-12-10 10:00:25 +00:00
Renovate Bot
c2bb7bd106 Update dependency @tryghost/mw-session-from-token to v0.1.12 2020-12-10 09:43:25 +00:00
Renovate Bot
7b4e041203 Update dependency @tryghost/adapter-manager to v0.2.4 2020-12-10 09:43:13 +00:00
Renovate Bot
89f77c8248 Update dependency @tryghost/job-manager to v0.5.0 2020-12-10 09:43:04 +00:00
Renovate Bot
0e6ee237ac Update dependency @tryghost/session-service to v0.1.13 2020-12-10 09:42:48 +00:00
Renovate Bot
712f78bc24
Update dependency @tryghost/helpers to v1.1.35 2020-12-09 21:48:48 +00:00
Kevin Ansfield
24bd2d78cb Fixed validation errors when saving members
no issue

- schema validation was erroring due extra properties on the member resource that were recently added to the output causing the client to send them back when saving
- updated @tryghost/admin-api-schema to include skips for the new read-only properties
2020-12-09 21:47:14 +00:00
Fabien O'Carroll
32fe260763 Updated canary members controller to use new Importer
no-issue

This completely replaces the old import functionality with the new
importer!
2020-12-09 19:25:57 +00:00