Commit Graph

15209 Commits

Author SHA1 Message Date
Rishabh
018c96413d Handled new free product type in importer and member api
refs https://github.com/TryGhost/Team/issues/1037

- updates `members-api` to handle new free product and `type` column
- updates `members-importer` to handle default product usage as we have both free and paid default products now
2022-01-17 23:10:58 +05:30
Rishabh
62777d7f26 Handled default product to use first paid product
Since we now have 2 products by default for all ghost sites, free and default paid, the usage of default product which so far was using first product needs to be updated to use the first paid product.

- updates default product usage to use first paid tier
- updates tests
2022-01-17 22:59:34 +05:30
Rishabh
345eb5828c Added tier type in API response
refs https://github.com/TryGhost/Team/issues/1037

Tiers now have a `type` column to differentiate between `free` and `paid` tiers. This change allows `type` data for a tier in Admin and Portal API output.
2022-01-17 22:59:34 +05:30
Rishabh
e54395eab5 Added new default free tier
refs https://github.com/TryGhost/Team/issues/1037

Free tier is now setup the same way as other tiers, to allow custom description/benefits. This change:

- adds a migration to add a default free tier for all sites
- adds a default fixture to insert a free tier for all new sites
2022-01-17 22:59:34 +05:30
Rishabh
761a330e16 Added new type column for tiers
refs https://github.com/TryGhost/Team/issues/1037

- adds new `type` column for tiers to differentiate between free and paid tiers
- all existing tiers are updated to be `paid` tiers
2022-01-17 22:59:34 +05:30
Kevin Ansfield
d77948540a Added membersActivityFeed alpha labs flag
refs https://github.com/TryGhost/Team/issues/1277

- used for prototyping a separate activity feed screen that can show all members activity, combining the events shown in the dashboard with the email events shown on the member screen
2022-01-17 12:23:38 +00:00
Renovate Bot
da1d178768
Update dependency mocha to v9.1.4 2022-01-14 21:15:42 +00:00
Fabien 'egg' O'Carroll
10c214c148
Switched AMP to be 'off' by default in all new Ghost instances (#13907)
refs https://github.com/TryGhost/Team/issues/1189

Support for AMP is slowly in decline, and makes developing new cards trickier,
since AMP no longer has an effect of SEO we're going to disable it by default
as a first step toward moving away from it.

Co-authored-by: Thibaut Patel <thibaut@ghost.org>
2022-01-14 18:55:48 +02:00
Daniel Lockyer
8df29f6574 v4.32.3 2022-01-14 16:00:28 +00:00
Daniel Lockyer
f370d10401 Updated Admin to v4.32.3 2022-01-14 16:00:28 +00:00
Kevin Ansfield
96ec60e393
🐛 Fixed "Create Post" action error in Zapier when assigning new tags (#13972)
closes https://github.com/TryGhost/Zapier/issues/56

- fixes tag creation when creating posts with `tags: [{slug: 'new'}]` which should be supported
  - assigning tags with only `{slug: 'new'}` was triggering our validation for the required `name` property then bubbling up to the `bookshelf-relations` library resulting in a 500 error
  - the fix applied here is to set the `name` field to the same as the `slug` field if a name is not provided
2022-01-14 13:37:20 +00:00
Fabien "egg" O'Carroll
f58b5984cb Updated caching policy for /members/.well-known
refs https://github.com/TryGhost/Team/issues/1273

This endpoint currently only serves the members public key, which should
never change. A 24 hours cache will drastically reduce the number of
requests for the key, with little to no impact on functionality.
2022-01-14 14:04:23 +02:00
Fabien "egg" O'Carroll
5d8f491823 Updated caching policy for /members/api/site
refs https://github.com/TryGhost/Team/issues/1240

As this endpoint is hit on every page load when Portal is enabled, it
can cause a lot of traffic to Ghost. The data does not change very
frequently so we've added a 30s cache policy to alleviate load on servers.
2022-01-14 14:04:23 +02:00
Fabien "egg" O'Carroll
76b33b6e77 Added JSDoc to cache control middleware
no-issue
2022-01-14 14:04:23 +02:00
Renovate Bot
02e4aeccd9 Update dependency @tryghost/validator to v0.1.10 2022-01-14 10:32:46 +00:00
Fabien "egg" O'Carroll
297b1a929f Added "api" source for MembersSubscribeEvents
refs https://github.com/TryGhost/Team/issues/1275

This will allow us to determine members which were added via the Admin
API for use in spam prevention.
2022-01-14 12:28:35 +02:00
Daniel Lockyer
34e8c299e7
Added concurrency option to test workflow in CI
refs
https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#example-using-a-fallback-value

- CI sometimes becomes clogged up with concurrent runs for a PR if the
  PR is updated
- this sometimes happens when we merge a bunch of Renovate PRs and other
  PRs rebase on top of `main` multiple times
- we shouldn't continue to run tests for PRs if the branches have been pushed
  to since they started
- from the referenced link above, this is the built-in solution that
  cancels previous in-progress runs if a new job starts
2022-01-14 10:26:26 +00:00
renovate[bot]
5037517aad
🐛 Support inline partial execution in children partials
refs https://github.com/TryGhost/Ghost/issues/13844
refs https://github.com/TryGhost/Team/issues/1274

- This enables using inline partials to create layouts in Ghost themes.
- The support for inline partials was dropped when moving away from Handlebars compilation and using AST traversing instead.
2022-01-14 11:17:13 +01:00
Renovate Bot
935fef79d6 Update dependency @tryghost/kg-default-cards to v5.15.12 2022-01-14 10:13:35 +00:00
Renovate Bot
8dcae5f686 Update dependency @tryghost/magic-link to v1.0.15 2022-01-14 10:11:40 +00:00
Renovate Bot
ab51f9b59a Update dependency @tryghost/tpl to v0.1.9 2022-01-14 10:11:19 +00:00
Renovate Bot
04e894eef2 Update dependency @tryghost/request to v0.1.11 2022-01-14 10:01:00 +00:00
Renovate Bot
9e2c81a612 Update dependency @tryghost/nodemailer to v0.3.9 2022-01-14 09:59:50 +00:00
Renovate Bot
2787b0cf32 Update dependency @tryghost/bookshelf-plugins to v0.3.6 2022-01-14 09:59:01 +00:00
Renovate Bot
570bf892fe Update dependency @tryghost/metrics to v1.0.2 2022-01-14 09:57:39 +00:00
Renovate Bot
e0e1316d3d Update dependency @tryghost/version to v0.1.8 2022-01-14 09:57:18 +00:00
Renovate Bot
7614d79284 Update dependency @tryghost/html-to-mobiledoc to v1.8.3 2022-01-14 09:40:50 +00:00
Renovate Bot
a7b4a30a5e Update dependency @tryghost/express-dynamic-redirects to v0.2.3 2022-01-14 09:38:57 +00:00
Renovate Bot
2cae1ec585 Update dependency @tryghost/debug to v0.1.10 2022-01-14 09:36:23 +00:00
Renovate Bot
280642baef Update dependency @tryghost/logging to v2.0.1 2022-01-14 09:36:14 +00:00
Renovate Bot
b779aca831 Update dependency @tryghost/root-utils to v0.3.8 2022-01-14 09:35:59 +00:00
Thibaut Patel
8ef46f2291 🐛 Restored support for inline partials and dynamic partials
refs TryGhost/Team#1242
refs TryGhost/Team#1266

- Both inline and dynamic partials haven't been supported since gscan v4.
- You can now use [inline partials](https://handlebarsjs.com/guide/partials.html#inline-partials) in themes.
- One limitation is that the inline partials aren't available in the execution of other partials.
- You can now use [dynamic partials](https://handlebarsjs.com/guide/partials.html#dynamic-partials) in themes.
- When using dynamic partials, you can only use them as a partial block so that there is a fallback.
- Dynamic partial defined inline like `{{> (dynamicPartial) }}` are considered invalid by gscan to make sure a fallback is present.
2022-01-12 16:41:34 +01:00
Thibaut Patel
222e7a39fc Revert "Restored support for inline partials and dynamic partials"
This reverts commit 25002e99cf.
2022-01-12 16:40:34 +01:00
renovate[bot]
25002e99cf
🐛 Restored support for inline partials and dynamic partials
refs https://github.com/TryGhost/Team/issues/1242
refs https://github.com/TryGhost/Team/issues/1266
2022-01-12 16:31:28 +01:00
Daniel Lockyer
dbd6e31fc0
Merged v4.32.2 into main
v4.32.2
2022-01-12 10:02:33 +00:00
Daniel Lockyer
61d85330a5 v4.32.2 2022-01-12 10:00:20 +00:00
Daniel Lockyer
98ac844ee4 Updated Admin to v4.32.2 2022-01-12 10:00:20 +00:00
Fabien "egg" O'Carroll
eab95cd0a7 Fixed Members importer tests
no-issue

These tests were incorrectly checking for a subscribed value of true,
and thus failed to catch the bug fixed in the previous commit. The tests
now reflect the intended behaviour.
2022-01-12 11:34:13 +02:00
Fabien "egg" O'Carroll
90b95f79b9 🐛 Fixed imports ignoring subscribed_to_emails flag
no-issue

Due to a bug in the members-csv package we were losing information about
the subscribed_to_emails flag and effectively ignoring it, resulting in
all members beign imported with the default value of true.
2022-01-12 11:33:49 +02:00
Fabien 'egg' O'Carroll
0aec18deee Stopped reconfiguring MemberAPI on settings change (#13943)
refs https://github.com/TryGhost/Team/issues/1257
refs https://github.com/TryGhost/Team/issues/1261

Certain event listens are being added twice due to the way we "reload"
the MembersAPI which can cause duplicate counts of Offer Redemptions.

Rather than creating multiple instances of the MembersAPI we're moving
toward being able to reload the config in place or passing getters for
the config which will allows us to use the MembersAPI as a singleton,
and remove any bugs which come from creating multiple instances.

This also fixes a bug with the allowSelfSignup config not refreshing when
the portal_plans setting was changed.
2022-01-12 11:31:59 +02:00
Renovate Bot
0477bd30dd Update dependency supertest to v6.2.1 2022-01-12 08:31:06 +00:00
Joe Grigg
60ff6d4267 Updated github release action to use new main branch of ghost-release
no issue

- We have switched over to using the new git standard of using the main branch rather than master.
2022-01-11 16:09:58 +00:00
Fabien "egg" O'Carroll
b3c12bd435 Fixed Members importer tests
no-issue

These tests were incorrectly checking for a subscribed value of true,
and thus failed to catch the bug fixed in the previous commit. The tests
now reflect the intended behaviour.
2022-01-11 16:44:12 +02:00
Fabien "egg" O'Carroll
5c13726e06 🐛 Fixed imports ignoring subscribed_to_emails flag
no-issue

Due to a bug in the members-csv package we were losing information about
the subscribed_to_emails flag and effectively ignoring it, resulting in
all members beign imported with the default value of true.
2022-01-11 16:34:29 +02:00
renovate[bot]
b63d5f02ff
Update dependency @tryghost/members-importer to v0.3.6 (#13947)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-01-11 11:13:49 +02:00
renovate[bot]
ec5be213a4
Update dependency @tryghost/members-ssr to v1.0.17 (#13949)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-01-11 11:13:35 +02:00
Renovate Bot
c1b6614054 Update dependency supertest to v6.2.0 2022-01-11 09:05:41 +00:00
Renovate Bot
2aa908c3fa Update dependency nock to v13.2.2 2022-01-11 09:05:19 +00:00
Renovate Bot
735fbc3725 Update dependency image-size to v1.0.1 2022-01-11 09:04:43 +00:00
renovate[bot]
2a7cb1036d
Update dependency @tryghost/members-offers to v0.10.4 (#13948)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-01-11 10:28:55 +02:00