Commit Graph

7158 Commits

Author SHA1 Message Date
renovate[bot]
621f014df6 Update dependency element-resize-detector to v1.2.3 (#2020)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-28 10:31:57 +01:00
renovate[bot]
31650171bb Update dependency @sentry/ember to v6.7.2 (#2016)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-28 10:31:15 +01:00
renovate[bot]
4d27f57969 Update dependency ember-test-selectors to v5.4.0 (#2019)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-28 10:30:53 +01:00
Sanne de Vries
637b50956e Adjusted padding in post settings menu 2021-06-28 10:11:40 +02:00
Renovate Bot
cb4cd7a313 Update dependency eslint-plugin-ghost to v2.4.0 2021-06-24 15:13:10 +00:00
Daniel Lockyer
e6a6303278 Merged v4.8.3 into main
v4.8.3
2021-06-24 14:00:17 +01:00
Daniel Lockyer
6fd806aac7 v4.8.3 2021-06-24 13:58:35 +01:00
Sanne de Vries
d676473bb1 Updated post settings menu icon 2021-06-24 14:51:10 +02:00
Daniel Lockyer
c70ca8dcbc Merged v4.8.2 into main
v4.8.2
2021-06-24 13:19:38 +01:00
Daniel Lockyer
539fbf040c v4.8.2 2021-06-24 13:16:51 +01:00
Daniel Lockyer
023820eddd Merged v4.8.1 into main
v4.8.1
2021-06-24 11:20:17 +01:00
Daniel Lockyer
c1149889c6 v4.8.1 2021-06-24 11:19:09 +01:00
Rishabh
38a499a531 🐛 Fixed stripe connect modal not closing
closes https://github.com/TryGhost/Ghost/issues/13090

The `X` on stripe connect modal is not closing the popup as the updated modal changes was not wiring the close method.

Note: Clicking outside the popup to close it was still working
2021-06-24 14:52:06 +05:30
Rishabh
4665e64103 🐛 Fixed default currency for MRR stats on dashboard
closes https://github.com/TryGhost/Team/issues/799

- previous logic was still using `stripe_plans` for MRR currency, which is not used anymore
- updates first product's currency as default mrr currency
2021-06-24 14:51:39 +05:30
Peter Zimon
81ae1afcaa Added inner scrolling for benefits list (alpha) 2021-06-23 15:12:08 +02:00
Kevin Ansfield
1206889b0d Fixed editor flex breakouts squashing sidebar in settings menu redesign
no issue

- added `--editor-sidebar-width` CSS variable directly in `index.html` so it doesn't get removed by `postcss-custom-properties` (we use `preserve: false` to avoid problems with `postcss-color-mod-function`)
- adjusted editor CSS
  - added max-width calc on container element to prevent browser from increasing the element's width beyond what would allow the sidebar to display at it's desired width
  - adjusted the editor flex breakout styles to work with a non-100vw width by using the sidebar width variable
- updated labs post settings menu component to set the `--editor-sidebar-width` variable to the actual width of the sidebar element
  - avoids need to have multiple classes with fixed widths to adjust editor and breakout sizes
2021-06-23 13:54:40 +01:00
Peter Zimon
516825e41f Fixed Multiple products alpha feature name case style 2021-06-23 11:58:59 +02:00
Sanne de Vries
f15bce5c2d Updated design for new fixed post settings menu 2021-06-22 20:51:31 +02:00
Peter Zimon
c078b639c2 Benefit list width refinement (alpha) 2021-06-22 16:59:58 +02:00
Peter Zimon
a02711c2a2 Refined benefits list (alpha) 2021-06-22 16:44:16 +02:00
Daniel Lockyer
4e6b59f295 v4.8.0 2021-06-22 15:25:52 +01:00
Sanne de Vries
3fc538eb4a Fixed feature image indicator alignment 2021-06-22 13:45:45 +02:00
Sanne de Vries
223a7f35c3 Added feature image indicator 2021-06-22 13:12:41 +02:00
Kevin Ansfield
1c9b7bba9d Fixed number of post save retry attempts
refs ac094821c8

- 2 attempts were used to speed up development, should have been 6 to match the 30seconds total retry period
2021-06-22 12:11:35 +01:00
Rishabh
1df55f76f7 Fixed product save handling on membership settings
no refs

- the settings save on memberships was incorrectly relying on developerExperiments flag instead of multipleProducts feature flag
2021-06-22 14:19:08 +05:30
Kevin Ansfield
bc950e655f Fixed error when editing settings
no issue

- the `newsletter_show_header` setting has been removed on the server side but was still being included by the client when saving the settings model resulting in a `Resource not found error, cannot edit setting. Problem finding setting: newsletter_show_header` error
2021-06-22 09:06:39 +01:00
Kevin Ansfield
a8c05f4be7 Fixed linting errors
refs ac094821c8

- stray console.logs
2021-06-21 18:15:17 +01:00
Kevin Ansfield
ac094821c8 Improved "Server unreachable" error handling in editor
refs https://github.com/TryGhost/Team/issues/788

- automatically retry any failed save attempts every 5 seconds for up to 30 seconds
- only show error bar after when we completely give up
- clear error bar if a later save is successful
- update error message to specify there's a connection problem and to retry with Cmd+S
- notify Sentry of a successful save after an initial failure including the number of attempts that were made and the total time for save to succeed in seconds
2021-06-21 18:13:45 +01:00
Sanne de Vries
81bfc3c6f6 Updated feature image button in editor 2021-06-21 16:27:13 +02:00
Kevin Ansfield
2770c73bab Fixed tests
refs 37a6197f81

- fixed find/replace whoopsie with `slugGenerator.generateSlug()`
- updated editor controller unit tests to match rename
2021-06-21 15:18:11 +01:00
Kevin Ansfield
37a6197f81 Renamed editor tasks to use xTask naming
no issue

- helps indicate that you're dealing with an ember-concurrency task object rather than a function/action so you know to use `perform` and that you have access to derived state
2021-06-21 15:05:41 +01:00
Sanne de Vries
0744119299 Fixed feature image caption vs alt text spacing issue 2021-06-21 16:00:49 +02:00
Kevin Ansfield
e322709f95 Updated newsletter design settings modal for new settings (#2013)
refs https://github.com/TryGhost/Team/issues/793
requires https://github.com/TryGhost/Ghost/pull/13074

- replaced main email design settings modal component with labs component and removed conditional
- removed `labs-newsletter-settings` class and cleaned up CSS
2021-06-21 13:40:54 +01:00
Peter Zimon
6011142428 Portal settings spacing refinement 2021-06-21 14:32:35 +02:00
Sanne de Vries
33d86c5dd5 Updated feature image design in editor 2021-06-21 12:03:40 +02:00
Kevin Ansfield
3f13aec6b8 Lock file maintenance 2021-06-21 10:19:50 +01:00
renovate[bot]
770b7735b8 Update dependency @tryghost/helpers to v1.1.47 (#2014)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 10:15:33 +01:00
renovate[bot]
fe4607ad0c Update dependency @tryghost/timezone-data to v0.2.45 (#2015)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:58:31 +01:00
renovate[bot]
bd582c19f4 Update dependency ember-fetch to v8.1.0 (#2012)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:56:50 +01:00
renovate[bot]
a13e36e6ff Update dependency broccoli-funnel to v3.0.8 (#2011)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:56:30 +01:00
renovate[bot]
0dca4580ab Update dependency @sentry/ember to v6.7.1 (#2009)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:56:16 +01:00
renovate[bot]
88b137fc28 Update dependency ember-cli-inject-live-reload to v2.1.0 (#2007)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:55:37 +01:00
Rishabh Garg
274044e253 Added UI for portal products (#2010)
refs https://github.com/TryGhost/Team/issues/768

- adds portal products selection UI behind flag on portal settings screen
2021-06-21 14:21:48 +05:30
Rishabh
cde942f5bc Updated product benefits handling
refs https://github.com/TryGhost/Team/issues/792

- adds list of product benefits, if available, to main memebrship screen
- updates benefits management on product detail screen
2021-06-21 14:06:17 +05:30
Rishabh
dc6b2884f1 Added model and validator for product's benefit item
refs https://github.com/TryGhost/Team/issues/792

- updates product model to read product's list of benefits
- adds transformer to return emberArray with list of product benefits
- adds new model for each product benefit
- adds validator for new product benefit
2021-06-21 14:05:01 +05:30
Rishabh
e5a24c8bb3 Wired removing complimentary product action to API
refs https://github.com/TryGhost/Team/issues/769

- wired removing comp product action button to API, allowing removing comped subscription for member
2021-06-21 12:32:20 +05:30
Renovate Bot
129377a59a Update dependency eslint to v7.29.0 2021-06-18 21:16:59 +00:00
Kevin Ansfield
fc21cd836a 🎨 Opened member email settings up to Administrator staff users
no issue

- previously only Owner staff users could access the email settings screens despite Administrators having server-side permissions to change the related settings
2021-06-18 18:43:38 +01:00
Sanne de Vries
4961b35692 Added feature image caption to newsletter template preview 2021-06-18 18:50:20 +02:00
Sanne de Vries
e2a136609a Updated email design settings layout 2021-06-18 17:22:23 +02:00
Peter Zimon
821c087871 Refined complimentary for multiple products (alpha) 2021-06-18 16:58:00 +02:00
Rishabh
9b228659da Added dummy benefits section to products
refs https://github.com/TryGhost/Team/issues/792

- adds new hardcoded benefits section as prototype in Products modal
2021-06-18 19:09:14 +05:30
Kevin Ansfield
d96046cf1b Handled SecurityError when accessing iframe in <GhSiteIframe>
no issue

- when a site has a separate front-end and admin URL the `site` screen could throw errors due to cross-origin access to the iframe content
- detect the error and fall back to a less efficient forced refresh on guid change
2021-06-18 13:08:19 +01:00
Rishabh
176ed4a260 Fixed member product modal not closing
no refs

- Added missing close handling for member product modal
2021-06-18 16:28:53 +05:30
Rishabh
bc25dbdefa Fixed modal errors in stripe connect and member product
refs 909bd60db3

- The modal actions for glimmer modal components need to define `actions.confirm` separately and add confirmAction to handle both enter and manual confirmation
2021-06-18 16:24:18 +05:30
Kevin Ansfield
922e4e6b32 Fixed unhandled errors from billing app for non-owner users
no issue

- if the identities endpoint returned an expected 403 for non-owner/admin users we weren't handling it resulting in an error that could bubble up into error reporting services
2021-06-18 10:34:30 +01:00
Kevin Ansfield
909bd60db3 Fixed errors when enter key is pressed in modals
no issue

- enter key when a modal is displayed will always trigger the `confirm` action, if it's not provided then the base modal will throw a `You must override the "confirm" action ...` error
2021-06-18 10:12:46 +01:00
Peter Zimon
178733a521 Added benefits container to add/edit product (alpha) 2021-06-18 10:51:10 +02:00
Kevin Ansfield
c1841fd58b Removed unused from address confirmation modal component
no issue

- email send confirmation and instructions are shown inline rather than a modal meaning this component wasn't being used
2021-06-18 09:46:38 +01:00
Kevin Ansfield
1447a57aa8 Fixed enter key in brand accent form triggering error
no issue

- pressing enter in the accent field would attempt to submit the form and trigger the confirm action
- no confirm action was present on the modal component meaning the base modal confirm action would trigger a invalid usage error
- we don't want enter in the accent field to save, instead we want to blur the element and trigger a preview update
2021-06-18 09:42:32 +01:00
Kevin Ansfield
a41cb42a87 First pass at fixed rather than popover post settings sidebar
refs https://github.com/TryGhost/Team/issues/786

Enabled through labs `psmRedesign` flag, rough implementation to help design direction.

- fixed rather than popover when opened by putting editor and sidebar inside a flex container
- settings toggle fixed in top right rather than separate close button
2021-06-17 19:00:59 +01:00
Kevin Ansfield
dc1caf0b29 Removed usage of SettingsMenuMixin in post settings menu
no issue

- the post settings menu is the only component that uses the mixin so it makes sense to inline it, especially as mixins are deprecated and the mixin's utility is minimal and already overridden in places
2021-06-17 16:45:13 +01:00
Kevin Ansfield
4482aa5395 Added alpha labs flag for PSM redesign
refs https://github.com/TryGhost/Team/issues/786

- adds flag checkbox to labs page
- duplicates psm component ready for changes
2021-06-17 14:10:32 +01:00
Kevin Ansfield
18c9da0bf0 Fixed capitalisation inconsistency for Post Title
no issue

- out title standard is to only capitalise the first word rather than every word
2021-06-17 12:12:31 +01:00
Peter Zimon
d5a4be4ea1 Small UI refinement for benefits alpha 2021-06-17 11:18:26 +02:00
Peter Zimon
b82ab6b2f6 Added static benefits list to products card 2021-06-17 11:11:17 +02:00
Rishabh Garg
aa35d99de4 Add UI for complimentary products with multiple products feature (#2008)
* Added v1 comped subscription handling

* Cleanup

* Added cancellation for existing subscriptions

* Added loader for fetching products

* Refined complimentary popup

* Added default product selection

* Updated add complimentary for multiple products

* Updated products add comped button

Co-authored-by: Peter Zimon <zimo@ghost.org>
2021-06-17 13:09:43 +05:30
Kevin Ansfield
182cd106e5 Added retry button to feature image uploader
refs https://github.com/TryGhost/Team/issues/771

- allows for getting out of the error state so an upload can be re-attempted
2021-06-16 18:08:22 +01:00
Kevin Ansfield
0d30077325 Switched to new component for labs feature image redesign
refs https://github.com/TryGhost/Team/issues/771

- added `<GhEditorFeatureImage>` for more flexibility than offered by `<GhImageUploaderWithPreview>`
  - updated to more closely match intended designs
- removed alt/caption support from `<GhImageUploaderWithPreview>` as it's no longer used
- fixed upload/delete/upload not working due to file input references getting out of sync
2021-06-16 17:56:25 +01:00
Peter Zimon
628a482c3a Added cancellation reason to Members details
refs. https://github.com/TryGhost/Team/issues/780
2021-06-15 13:30:56 +02:00
Kevin Ansfield
ba47b710cb 🎨 Moved default focus in editor from body to title for new posts
refs https://github.com/TryGhost/Team/issues/707

Placing focus in the title aligns better with typical editorial process.

- switched `autofocus` attribute from body to title for new posts
- added a default value to the `mobiledoc` attr on the Post model, without it the autosave when moving from title to editor creates a forced re-render and clears the focus whilst you're typing
2021-06-14 15:35:59 +01:00
Kevin Ansfield
811ef34f2a Lock file maintenance 2021-06-14 14:46:50 +01:00
renovate[bot]
c5764ab84a Update dependency @tryghost/members-csv to v1.0.1 (#1990)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:46:08 +01:00
renovate[bot]
acbcd436a9 Update dependency @tryghost/timezone-data to v0.2.44 (#2002)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:44:58 +01:00
renovate[bot]
3457468af9 Update dependency @tryghost/helpers to v1.1.46 (#2001)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:44:40 +01:00
renovate[bot]
7dff13392f Update dependency @tryghost/limit-service to v0.6.1 (#2000)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:43:06 +01:00
renovate[bot]
b59e959ee6 Update dependency @ember/jquery to v2 (#2004)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:42:00 +01:00
renovate[bot]
038463e6c6 Update dependency walk-sync to v3 (#2006)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:35:28 +01:00
renovate[bot]
c1da1fe862 Update dependency broccoli-funnel to v3.0.7 (#2005)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:35:13 +01:00
renovate[bot]
30927c6d68 Update dependency @sentry/ember to v6.7.0 (#2003)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:34:55 +01:00
Peter Zimon
71e347b72c Updated product price styles 2021-06-14 14:05:49 +02:00
Kevin Ansfield
1b85b9244b Updated email previews to show full from email address
no issue

- moved duplicated email domain generation from `members-email` controller and `<GhMembersEmailSetting>` to `config.emailDomain`
- added `{{from-email-address emailStr}}` helper that will output the passed in emailStr value if it contains an `@` or concat `emailStr@emailDomain` if it doesn't - lets us use `settings.membersFromAddress` to always get a full email address when it could be just a name (`noreply`) or a full address
- updated customise email and post email preview templates to use the new helper
2021-06-11 16:42:27 +01:00
Sanne de Vries
f837eb5630 Updated email template settings and preview 2021-06-11 16:40:56 +02:00
Kevin Ansfield
645fd18a80 Fixed syntax error 2021-06-11 12:22:12 +01:00
Kevin Ansfield
9adfad67d2 Added <GhMembersFilterCount @filter="..." />
no issue

- added generic members filter component
- updated `<GhRecipientFilterCount />` to use the new generic component with `subscribed:true` added to the filter
2021-06-11 12:19:44 +01:00
Kevin Ansfield
937eac51ad Fixed "and sent to..." text appearing in scheduled header when not sending
refs bd60c8089b

- added conditional for displaying the recipient text
- fixed tests not expecting newlines in html
2021-06-11 12:10:28 +01:00
Kevin Ansfield
bd60c8089b 🐛 Fixed confusing member count shown in save notification and editor header
closes https://github.com/TryGhost/Team/issues/776

Since switching to using a real NQL filter in the `posts.email_recipient_filter` field where we used to show `free members`, `paid members`, or `all members` we were showing `status:free`, `status:-free`, and `status:free,status:-free` respectively. If labels are used in a filter the text became even longer.

- added a `membersCountCache` service
  - `.count(filter)` fetches a numeric count from the members API, if the filter has been counted in the last minute it returns the count directly from a cache instead to avoid hammering the members API when we show counts in multiple places across the UI
  - `.countString(filter)` fetches a count but returns a humanized string with the logic extracted from what we displayed in the confirm email sending modal
- added a `<GhRecipientFilterCount @filter="" />` component that acts as a wrapper around the async count from `membersCountCache`
- updated confirm email send modal, plus save notification and editor status displays for scheduled posts to use the new service and component
2021-06-11 11:44:50 +01:00
Peter Zimon
505eee29ef Fixed settings description line-height 2021-06-11 11:20:49 +02:00
Daniel Lockyer
b284e2e4da 🐛 Fixed sticky "unsaved settings" modal
fixes https://github.com/TryGhost/Team/issues/777

- the unsaved settings modal would come back if you left a settings
  sub-page with unsaved changes and then came back to the page
- if you then clicked on "Leave", Admin would crash with a Sentry error
  of `Cannot read property 'finally' of undefined`
- we had a similar bug in
  39c850f4fe
  and the fix was to remove the `.finally` because it assumed the
  confirm action returned a promise
- this commit performs a similar fix and seems to resolve the problem
2021-06-11 09:15:27 +01:00
Kevin Ansfield
ceb16b5e9f Added first version of feature image with caption inside editor (#1999)
refs https://github.com/TryGhost/Team/issues/771

- updated `<GhImageUploaderWithPreview>` to take an `@includeMetadata` argument that shows a basic html supporting caption field underneath (ready for toggle between caption/alt but not fully implemented)
- added feature image alt/caption properties to post model
- updated UI behind "featureImageMeta" labs flag
  - added the feature image uploader to the top of `<GhKoenigEditor>` for display above the editor title
  - removed feature image uploader from post settings menu
- added labs flag checkbox
2021-06-10 20:42:32 +01:00
Renovate Bot
85c6655959 Update dependency eslint-plugin-ghost to v2.3.0 2021-06-10 16:30:18 +00:00
Hannah Wolfe
75e573568c Swapped to American English spellings
- Traditionally all of Ghost's public-facing text was written in British English
- We're changing that to US English because that's more common
- This PR mostly just fixes up the words customise/customisation and favourite
2021-06-09 16:32:14 +01:00
Rishabh
afa06a08b0 Updated multiple products UI behind feature flag
refs https://github.com/TryGhost/Team/issues/763

- Added dev experiments requirement for multiple product feature as its alpha
- Puts new multiple products UI in membership settings behind the feature flag
- Puts add comp sub popup prototype behind the feature flag
2021-06-09 16:14:48 +05:30
renovate[bot]
928e1fb254 Update dependency ember-composable-helpers to v4.5.0 (#1998)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-09 11:22:18 +01:00
Rishabh
ab069c5b81 Added UI for multiple products labs flag
refs https://github.com/TryGhost/Team/issues/763

- Ensure the feature flag is available in the feature service so that it knows where to pull the setting from (labs)
- Added a toggle UI to the alpha features list in labs for switching multiple products
2021-06-09 15:45:37 +05:30
Rishabh
b0632fd5d8 Updated gitignore to exclude IDE files
no refs

- adds standard IDE excludes to .gitignore same as in core repo
2021-06-09 15:42:13 +05:30
Daniel Lockyer
5770e35476 v4.7.0 2021-06-08 17:06:36 +01:00
Kevin Ansfield
8f5e305721 🐛 Fixed member count not showing in send email confirmation modal
closes https://github.com/TryGhost/Team/issues/738
refs https://github.com/TryGhost/Admin/pull/1972

- when we switched from the segment select back to checkboxes and label select we lost the automatic member counting which meant other parts of the publishing workflow had no counts
- fixed subscribed status counts shown in publish menu
- added the async count back to the confirm modal, taking full free/paid/specific query into account
- added total subscribed member count back to the draft publish menu so the email options can be disabled when no subscribed members exist
  - fixed missing disabled styling inside `<GhMembersRecipientSelect>`
2021-06-08 13:07:16 +01:00
Kevin Ansfield
e44f18a412 🐛 Fixed member count in publish menu not matching subscription status
no issue

- the `subscribed:true` filter was missed in the member count queries when we switched from `<GhMembersSegmentSelect>` to `<GhMembersRecipientSelect>` (https://github.com/TryGhost/Admin/pull/1972)
2021-06-08 12:27:30 +01:00
Kevin Ansfield
4ad305534a 🐛 Fixed links in email preview not being clickable
no issue

- browsers blocked links from opening in a new window due to the iframe sandbox permissions
- allowed popups so that it's possible to check links go where you expect them to before sending an email
- our email rendering adds `target="_blank"` to all links so they'll open in a new tab rather than clearing navigating away from the admin area
2021-06-08 10:36:17 +01:00
Sanne de Vries
dab8f44499 Added spacing and center aligned email header image in preview 2021-06-08 10:33:20 +02:00
Sanne de Vries
b933a5e82f Updated header img uploader and disabled states in email design settings 2021-06-08 09:38:38 +02:00
Sanne de Vries
e1ce503e72 Updated email font selector dropdowns 2021-06-07 23:06:05 +02:00
Hannah Wolfe
f5f37e822f Added UI for match helper labs flag
- Ensure the feature flag is available in the feature service so that it knows where to pull the setting from (labs)
- Added a toggle UI to the alpha features list in labs as this is a new feature and is therefore alpha
- Changed the old gh-feature-flag helper to use the switch class instead of checkbox as that's a new pattern since we used this helper
2021-06-07 20:49:32 +01:00
Hannah Wolfe
b3ed4b81f9 Adding new alpha feature labs section with oauth
- Adding a new section to the labs page for alpha features
- Alpha features require both the dev experiments config var AND a labs flag
- Moving oauth into this section as it's dev experiments + it's own setting atm
2021-06-07 19:56:47 +01:00
Kevin Ansfield
cbb353f34d Switched newsletter body/title font selectors to dropdowns
refs https://github.com/TryGhost/Team/issues/755

- added new `<GhFontSelector>` component that wraps PowerSelect to create a quick option for offering a serif/sans-serif dropdown
- replaced radio buttons in labs email customisation modal with the new font selector
2021-06-07 18:52:37 +01:00
Sam Lord
579b89c6be Merged 4.6.6 into main 2021-06-07 18:04:33 +01:00
Sam Lord
a3e75f54b0 v4.6.6 2021-06-07 17:59:44 +01:00
Rishabh
1bfd37d24c 🐛 Fixed missing complimentary subscription add button
refs 81de2fe223
refs https://github.com/TryGhost/Team/issues/758

The "Add complimentary" subscription button in members does not show up when members already have an existing zero amount subscription. But this was incorrectly not taking into account active subscriptions and was applying the rule to canceled subscriptions. Since the `comped` behaviour changed in 4.6 which caused member's existing comp subscription to be canceled, this bug did not allow the comped subscription to be added back.
2021-06-07 22:24:49 +05:30
Kevin Ansfield
b2b66490b7 Added settings for newsletter header, title style, and feature image (#1993)
refs https://github.com/TryGhost/Team/issues/755
reqs https://github.com/TryGhost/Ghost/pull/13006

- updated settings model to match new server-side settings
- updated email customisation modal behind the dev experiments flag
  - adjusted layout to move to a fixed top bar and scrollable sidebar
  - added image upload, toggles and selections for new settings
  - updated preview to match selected settings

Co-authored-by: Sanne de Vries <sannedv@protonmail.com>
2021-06-07 16:36:21 +01:00
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