TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-30 21:40:39 +03:00
Code Issues Projects Releases Wiki Activity
9,943 Commits 237 Branches 1,680 Tags 386 MiB
78e16ddd3f
Commit Graph

7194 Commits

Author SHA1 Message Date
Kevin Ansfield
78e16ddd3f Merge branch 'master' into v3 2019-10-11 11:31:31 +01:00
Rishabh Garg
fb1d11c09a Fixed subscribers migration to work without model (#11227) 
no issue

Since we removed subscribers code in v3, we cannot use `models.Subscribers` for migration, and instead switch to using db directly for fetching existing subscribers before migrating them to members.
 2019-10-11 10:43:18 +01:00
Rish
cd02fd5c63 Renamed member requirePayment setting 
no issue

Renames member setting `requirePaymentForSignup` -> `allowSelfSignup` to match members API usage
 2019-10-11 14:08:31 +05:30
Fabien O'Carroll
85d83b4f08 Fixed regression test for canary content api 
no-issue

We now return the visibility field on the content api
 2019-10-11 14:14:46 +07:00
Fabien O'Carroll
3eb4427888
Exposed visibility prop for posts on canary api (#11229) 
no-issue

This is required by the theme layer to style member only posts
differently
 2019-10-11 13:58:50 +07:00
Fabien O'Carroll
95fa815eb3 Improved settings model tests 
no-issue

This makes them way less brittle and reliant on correctly indexing an array
 2019-10-11 13:47:48 +07:00
Fabien O'Carroll
1500881923 Renamed getRequirePaymentSetting 
no-issue

The negation before this function call was a little easy to miss for me
 2019-10-11 13:47:48 +07:00
Fabien O'Carroll
0c602976c0 Passed members_email_auth_secret to members-api 
no-issue
 2019-10-11 13:47:48 +07:00
Fabien O'Carroll
cbb13904b8 Added members_email_auth_secret setting 
no-issue

This will be used for signing HS256 JWTs it's a 64 byte (256 bit) hex
string
 2019-10-11 13:47:48 +07:00
Fabien O'Carroll
ef5e6f7e5b Removed text-transform: capitalize from buttons 
no-issue

Button text should be sentence case not title case
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
527632f287 Updated members email templates 
no-issue

These changes fix come colors and styles
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
3062ec7690 Wired up members plaintext emails 
no-issue
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
257bebbb39 Wired up the members emails templates 
no-issue
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
f4d202d7c5 Added member email templates 
no-issue
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
98f27c1c33 Added getSubject function for members emails 
no-issue
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
6f160518d1 Ensured that members emails include our text version 
no-issue
 2019-10-11 11:45:11 +07:00
Fabien O'Carroll
b030081a4b Updated GhostMailer to allow forcing text content 
no-issue

This is so that we can pass our own customised text content
 2019-10-11 11:45:11 +07:00
Naz Gargol
1b04b48ffd Added from parameter for member emails (#11222) 
* Added from parameter for member emails

no issue

- Passed in the `from` parameter when initializing members mailer to be able to customize outgoing address
- Extends GhsotMailer to accept a from parameter from the outside
 2019-10-11 11:21:53 +07:00
Kevin Ansfield
0cc8b019d1 Updated Ghost-Admin to 2.35.0 2019-10-10 18:18:45 +01:00
Kevin Ansfield
c0533b75ac Fixed regression tests 2019-10-10 17:45:47 +01:00
Kevin Ansfield
6b3c4a59b4 🐛 Fixed rendering and url transformation of v1 "card-markdown" aliased cards 
no issue

- Ghost 1.x stored markdown cards with the name `card-markdown`, this was changed in Ghost 2.x to be `markdown`. To keep compatibility with the older mobiledoc content the `markdown` card was aliased using a straightforward `Object.assign()`. Unfortunately this failed to work adequately when the url transformation functions were added to cards and resulted in corrupted data being returned in API responses
- moved the markdown card definition into a factory function so that a clean card definition object can be used for both the `markdown` and `card-markdown` cards
 2019-10-10 16:35:29 +01:00
Rish
4f0ca2914f Updated members schema validation for name 
no issue

- Removed minimum length requirement for `name` as its possible to have empty name for a member
 2019-10-10 17:26:56 +05:30
Fabien O'Carroll
6b4e6fb400 Removed unused stripe_customers relationship 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
99681e692a Updated the create,get&update member functions 
no-issue

This updates them to async functions, and defaults falsy name and note to null
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
38832d5c6b Added note to member json schema 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
f3a8119870 Added note column to csv import/export for members 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
fe59613867 Wired up the note property to members-api 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
035cb55ca9 Added migration for note column on members table 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
0a40d11af9 Added note column to members table 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
58651caa32 Removed members endpoint from admin v2 api 
no-issue
 2019-10-10 17:51:46 +07:00
Fabien O'Carroll
dd214d71dc Decoupled add from importCSV queries 
no-issue
 2019-10-10 17:51:46 +07:00
Kevin Ansfield
08a0a4c69e Fixed regression tests 2019-10-10 11:10:04 +01:00
Kevin Ansfield
7fc10106dc Merge branch 'master' into v3 2019-10-10 10:37:42 +01:00
Nazar Gargol
977fb5f650 Added reading_time property to post/page resources in Content API 2019-10-10 15:42:04 +07:00
Nazar Gargol
4a10ddc8fa Fixed unsafeAttributes fetching in Admin API v2 
no issue

- This check was misside and only was implemented for canary.
 2019-10-09 21:16:27 +02:00
Kevin Ansfield
e37cb1dce8 Updated Ghost-Admin to 2.34.0 2019-10-09 18:43:04 +01:00
Kevin Ansfield
cb89703e2b Fixed regression tests 2019-10-09 18:37:44 +01:00
Kevin Ansfield
57e9bd5aae Updated regression tests for subscribers removal 2019-10-09 16:40:52 +01:00
Kevin Ansfield
587bd8accb Merge branch 'master' into v3 2019-10-09 15:04:09 +01:00
Kevin Ansfield
dc9a22d4de
Updated post model url transforms for posts/posts_meta split (#11223) 
no issue

- `og_image` and `twitter_image` fields are now located in a separate model so the transform functionality for those fields needed to move accordingly
 2019-10-09 13:38:08 +01:00
Rish
e7d7d9fdcc Added new fromAddress setting for member subscriptions 
no issue

- Adds new `fromAddress` setting for member subscriptions to allow custom from mail address
 2019-10-09 15:28:40 +05:30
Naz Gargol
0225936292
Removed subscribers from the codebase (#11153) 
refs https://github.com/TryGhost/Ghost/pull/11152

- Added subscribers table drop migration
- Removed subscribers from schema
- Removed subscribers controllers/routes/regression tests
- Removed subscriber related API code
- Removed subscribers from internal apps
- Removed subscriber importer
- Removed subscriber model
- Removed subscriber related permissions
- Removed webhook code related to subscribers
- When upgrading to v3 it is on the site admin to migrate all zapps or any other webhook clients to use members
- Removed subscriber-specific translation
- Removed subscriber lab flag
 2019-10-09 11:47:04 +02:00
Fabien O'Carroll
b77026870b Moved migrations from 3.0 to 2.34 
no-issue
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
cbb6337ae4 Prefixed stripe_customers_subscriptions with members 
no-issue
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
29b3dad302 Updated get/set metadata fn signatures 
no-issue

This is to reflect an upstream change in members-api
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
4c07d86086 Updated getMemberMetadata to use findAll method 
no-issue

This means we go via our version of the bookshelf model
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
ee0449245a Updated setMemberMetadata to use upsert method 
no-issue

Much cleaner now :)
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
3366bd1254 Added upsert method to stripe models 
no-issue

This is kind of copied from the session model, but simplified
This will allow much easier integration with members-api
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
998642eb24 Allowed filter option for findAll method 
no-issue

This will allow us to constrain findAll queries, rather than using knex
`where` & `fetchAll` methods
 2019-10-09 16:24:51 +07:00
Fabien O'Carroll
a6354d1acb Updated members api to store/retrieve subscriptions 
no-issue
 2019-10-09 16:24:51 +07:00