Commit Graph

7067 Commits

Author SHA1 Message Date
Sam Lord
230058d6ec Merged 4.6.5 into main 2021-06-07 11:32:15 +01:00
Sam Lord
0fb9417ed5 v4.6.5 2021-06-07 11:25:16 +01:00
Renovate Bot
26b28b72b9 Update dependency eslint to v7.28.0 2021-06-04 23:23:59 +00:00
Peter Zimon
c1cb738b52 Display Portal badge on product card condition 2021-06-04 15:36:18 +02:00
Peter Zimon
258c9439a6 Updated product badge color 2021-06-04 15:18:39 +02:00
Peter Zimon
49655fa451 Updated 'Add product' modal styles 2021-06-04 14:27:33 +02:00
Rishabh
e9486a8e87 Removed unused prices method in portal links
no refs

The `getAvailablePrices` method was removed from portal links as we no longer loop over prices for links but use monthly/yearly directly instead.
2021-06-04 17:43:46 +05:30
Rishabh
25a1e52391 Fixed incorrect existing product check in modal
refs https://github.com/TryGhost/Team/issues/715
2021-06-04 16:55:33 +05:30
Peter Zimon
db1cc85882 Adding 'Available in Portal' badge to product card 2021-06-04 13:02:16 +02:00
Rishabh
72ca4ded76 Removed portal option for default product for tiers UI
no refs

This change reverts the last commit to add portal option to product as it breaks the model that is passed to popup.

This reverts commit 5f538b5036.
2021-06-04 16:14:05 +05:30
Rishabh
5f538b5036 Added portal option to default product for tiers UI
refs https://github.com/TryGhost/Team/issues/715

By default, the first product/tier is available in Portal at the moment, this adds an attribute that can be used to denote which product is active in Portal in UI
2021-06-04 15:34:27 +05:30
Peter Zimon
ba149afcc3 Updated add product UI style 2021-06-04 11:35:28 +02:00
Peter Zimon
a82b31353f Updated product card styles (alpha) 2021-06-04 10:59:42 +02:00
Rishabh
d4cb7f9d1d Updated setup wizard pricing to use new product API
refs https://github.com/TryGhost/Team/issues/721

The setup wizard in Admin handles creating default prices as well as handling new price changes on default Product. This change updates the handling to use updated Products API with support for `monthly/yearly_price` values that offloads price handling to backend and makes the logic simpler. Also updates the stripe connect flow to use new API for creating default prices.
2021-06-04 13:30:11 +05:30
Rishabh
2b13bfea98 🐛 Fixed visible add complimentary button without Stripe enabled
closes https://github.com/TryGhost/Team/issues/742

The button to add a complimentary subscription for a member was visible even if Stripe was not connected on the site, and errored out with nasty red banner. This hides the `Add complimentary` button for member if stripe is not enabled on the site.
2021-06-04 13:30:11 +05:30
Rishabh
404a86b9d7 Cleaned unused methods in portal links
refs https://github.com/TryGhost/Team/issues/684

Removes now unused methods for fetching list of prices to show in Portal links, since it was reverted back to showing monthly/yearly prices only.
2021-06-04 13:30:11 +05:30
Rishabh
64393ab197 Updated portal settings to use names in portal_plans setting
refs https://github.com/TryGhost/Team/issues/753

The portal_plans setting was previously storing price ids for active monthly/yearly prices for the default product, which was done to allow multiple prices in Portal. Since the portal_plans setting is now reverted to use `monthly`/`yearly` named values to denote the availability of active monthly/yearly pricing on a product, this change updates the handling in portal settings modal to work with new settings.
2021-06-04 13:30:11 +05:30
Rishabh
46e281241e Wired new membership tiers UI to API
refs https://github.com/TryGhost/Team/issues/712
closes https://github.com/TryGhost/Team/issues/717

The product API is updated to support `monthly/yearly_price` on each product instead of using list of stripe prices. This change updates the handling of membership settings to use the updated API instead of `stripe_prices` property.
2021-06-04 13:30:11 +05:30
Rishabh
6165441c30 Added UI for handling multiple tiers in membership settings
refs https://github.com/TryGhost/Team/issues/715

Adds new modal and component to handle managing a list of products(tiers) in Admin behind the developer experiments flag. Also adds a new helper for stripe prices to convert amount from decimal value.
2021-06-04 13:30:11 +05:30
Kevin Ansfield
c10f8d014a Added query param for email design settings modal
no issue

- allows for easier development because modal stays open when refreshing as UI state is stored in the URL
2021-06-03 17:22:59 +01:00
Peter Zimon
bf700c5d98 Added product selector modal for complimentary sub
Developer experiment for multiple products.
- Added modal to choose a product for complimentary subscriptions.
2021-06-03 18:06:42 +02:00
Kevin Ansfield
e5056af95e Update dependencies ember-in-viewport@3.9.0 and ember-infinity@2.2.1
no issue

- dependencies needed to be updated together due to inter-dependency version issues
2021-06-03 15:26:26 +01:00
renovate[bot]
763a3f6797 Update dependency @tryghost/kg-parser-plugins to v1.1.8 (#1988)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-03 14:52:03 +01:00
renovate[bot]
9ddd280189 Update dependency ember-fetch to v8.0.5 (#1992)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-03 14:01:02 +01:00
renovate[bot]
8840ec44d8 Update dependency @sentry/ember to v6.5.1 (#1991)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-03 14:00:48 +01:00
renovate[bot]
0cb368692b Update dependency ember-concurrency to v2.1.0 (#1989)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-03 14:00:19 +01:00
renovate[bot]
2338b7c493 Update dependency @tryghost/kg-clean-basic-html to v1.0.18 (#1987)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-03 13:59:47 +01:00
Kevin Ansfield
79d14082c2 🎨 Enabled use of Grammarly extension in the editor
no issue

- Grammarly have indicated their extension is now compatible with the underlying editor technology used in Ghost
- removed html attributes that explicitly disabled the extension on our editor fields
2021-06-03 13:22:07 +01:00
Daniel Lockyer
f1954f8772 Added CI step to trigger canary build
refs 84bfbae282

- if Admin is pushed to after Ghost, the canary build won't contain
  Admin changes, so we need to trigger another canary build
- this commit adds a final step to the CI flow that will trigger the
  Ghost canary build if all steps were successful
2021-06-01 17:16:08 +01:00
Kevin Ansfield
2f828137ab 🐛 Fixed Enter key not working in send email confirmation modal
no issue

- the modal wasn't overriding the default `confirm` action so an error was thrown and the confirm action not triggered when pressing <kbd>Enter</kbd> whilst the modal is shown
- resolves Sentry error `ADMIN-M`
2021-06-01 17:02:31 +01:00
Kevin Ansfield
194cf296e5 Fixed "this.args is undefined" error when pressing Escape to close roles modal
no issue

- the modal component is using a native class but with the `@classic` decorator so it's still using pre-Glimmer component syntax where `this.args` doesn't exist
- fixes Sentry error `ADMIN-4C`
2021-06-01 16:50:02 +01:00
Kevin Ansfield
66f6d25d4b 🐛 Fixed blank branding preview on split front-end/admin domain setups
no issue

- the POST request made to fetch the preview was going to the non-trailing-slash version of the site URL which was resulting in a redirect to the trailing-slash version which then failed due to CORS
2021-06-01 10:46:28 +01:00
renovate[bot]
167a18deaf Lock file maintenance (#1986)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:43:20 +01:00
renovate[bot]
d3c0e6d0b4 Update dependency markdown-it-footnote to v3.0.3 (#1971)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:22:09 +01:00
renovate[bot]
21c365b039 Update dependency @sentry/ember to v6.5.0 (#1985)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:20:54 +01:00
renovate[bot]
848d6b0785 Update dependency ember-modifier to v2.1.2 (#1983)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:20:40 +01:00
renovate[bot]
bcd71a29a4 Update dependency testem to v3.4.2 (#1984)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:08:21 +01:00
renovate[bot]
7f2c7ca1fb Update dependency papaparse to v5.3.1 (#1982)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:07:49 +01:00
renovate[bot]
7d6908ef6a Update dependency ember-keyboard to v6.0.3 (#1981)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:06:54 +01:00
renovate[bot]
a11b1d0f70 Update dependency broccoli-funnel to v3.0.6 (#1979)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-01 09:06:34 +01:00
Sanne de Vries
098f5b9d06 Added icon to staff user role dropdown field 2021-06-01 09:29:37 +02:00
Daniel Lockyer
b8ec55a380 Merged v4.6.4 into main
v4.6.4
2021-05-27 19:20:16 +01:00
Daniel Lockyer
c961a89cad v4.6.4 2021-05-27 19:19:14 +01:00
Kevin Ansfield
04f3a4ae41 Enabled sourcemap build output in production
no issue

- production sourcemaps are needed to have reasonably readable stack traces in error reporting
- will be excluded from Ghost release zips by `.npmignore` rules
2021-05-27 18:54:25 +01:00
Kevin Ansfield
fb17b41c05 Fixed tests expecting '(Untitled') in editor title input
refs a5dd92f1b8

- updated to reflect changed behaviour
2021-05-27 18:52:35 +01:00
Kevin Ansfield
a5dd92f1b8 Changed editor title input to treat '(Untitled)' as blank
refs https://github.com/TryGhost/Team/issues/707

- the switch to a hard `'(Untitled)'` when you start typing is jarring and pulls you away from writing to want to set a title
- by changing the input to treat '(Untitled)' as a blank value the placeholder continues to be shown so flow isn't broken. Post validation and title display elsewhere in the app is unaffected because we're still setting `'(Untitled')` under the hood, it's only the editor display that changes
2021-05-27 18:18:51 +01:00
Kevin Ansfield
6d66c2cc73 Converted <GhKoenigEditor> to glimmer component
no issue

- switched to Ember Octane patterns
  - use native class instead of EmberObject syntax
  - moved container element into template
2021-05-27 18:18:51 +01:00
Daniel Lockyer
5f582c0d16 v4.6.3 2021-05-27 17:25:35 +01:00
Kevin Ansfield
3d43964bcd 🐛 Fixed portal preview resize when using split front-end/admin URLs (#1980)
no issue

- switched to listening to Portal's `message` events that now include a height
- removes need to reach into Portal preview iframe contents which is blocked by browser security when working cross-origin
2021-05-27 13:20:37 +01:00
Kevin Ansfield
c8f1fb5b45 🐛 Fixed error on membership screen when using split front-end/admin URLs
no issue

- when the preview iframe origin does not match the admin origin (ie, front-end and admin live on different URLs) we would hit browser security restrictions for accessing contents of a cross-origin iframe
- added a guard around the preview resize code so we abort resizing when we hit a security error
2021-05-27 11:00:10 +01:00