Commit Graph

5053 Commits

Author SHA1 Message Date
Kevin Ansfield
47b441c41d Merge branch 'mega' 2019-11-27 12:15:09 +00:00
Rish
55cd5bbb32 Fixed lint 2019-11-27 13:21:16 +05:30
Kevin Ansfield
6aecfbfcce Fixed members count in confirm email modal
no issue

- the members count used to disable the email toggle and shown in the confirm modal was incorrect as it didn't take into account subscribed vs non-subscribed members
- adjusts the filter in the count query to only fetch subscribed members
2019-11-26 15:08:33 +00:00
Peter Zimon
5674323d2a Removed link to settings for admins in email error copy 2019-11-26 13:38:43 +01:00
Peter Zimon
e866808193 Updated email role restrictions
no issue.
Only admins and owners should have access to sending emails. Updated relevant templates
to restrict access to emails for non-admins/owners
2019-11-26 13:20:49 +01:00
Peter Zimon
727a38d5d1 Updated email copy 2019-11-26 12:10:51 +01:00
Peter Zimon
b06484553f Updated PSM/Email wording 2019-11-25 17:44:50 +01:00
Peter Zimon
8350098e45 Updated post list design for scheduled posts 2019-11-25 17:44:18 +01:00
Peter Zimon
1d78b9a903 Updated email error design in PSM 2019-11-25 17:03:54 +01:00
Kevin Ansfield
a3c17c2757 Added failed state with retry button to PSM email pane
no issue

- follow similar retry-then-poll behaviour as the confirm email modal
2019-11-25 13:20:16 +00:00
Renovate Bot
feecca2a1a Update ember testing 2019-11-25 03:28:12 +00:00
Renovate Bot
6f5c933cea Update dependency ember-source to v3.12.1 2019-11-25 02:28:22 +00:00
Renovate Bot
4c19c86fd7 Update dependency autoprefixer to v9.7.2 2019-11-25 01:31:45 +00:00
Peter Zimon
8a757cef9a 🐛 Fixed tooltip width
no issue.
- fixed a CSS bug that cut the width of tooltips
2019-11-23 10:27:22 +01:00
Peter Zimon
82ffc5a967 Updated email failure modal with dynamic error 2019-11-22 17:17:29 +01:00
Peter Zimon
5bedffdc00 Removing error box in email failure modal 2019-11-22 16:37:39 +01:00
Peter Zimon
8bf287d81e Refined email status on post list 2019-11-22 16:25:11 +01:00
Kevin Ansfield
c1039f929c Added ability to retry failed emails from the confirm modal (#1412)
no issue

- adds a `.retry()` method to the email model+adapter
- adds a retry email task to the publishmenu that follows the same retry-then-poll behaviour as the regular email confirmation
- show a retry button in the confirm email modal if the original send failed
- increases max "immediate failure" poll timeout to 15sec (an 8sec retry-to-failure time has been seen locally)
2019-11-22 15:09:48 +00:00
Peter Zimon
8be0c78c8e Refined email error modal 2019-11-22 14:31:03 +01:00
Kevin Ansfield
ca8c75b034 Removed "and sent to x members" from publish toast notification
no issue

- the toast notification occurs before polling for a successful email occurs so it was confusing to have different states represented in the UI simultaneously
2019-11-22 11:00:47 +00:00
Peter Zimon
0fef1f61e0 Getting rid of super-thin font weights 2019-11-22 11:53:57 +01:00
Kevin Ansfield
535f50ad9f Show "email failed" state in posts list 2019-11-20 23:37:37 +00:00
Kevin Ansfield
30b23f2a7c Added polling when confirming email to show immediate error
no issue

- when confirming email send, after initial save in, poll every second for a maximum of 10 seconds and check the status of the email
  - if it's `'success'` close the modal immediately
  - if it's `'failure'` switch the confirm modal to an error state
  - if the save fails for some other reason (validation, server error) close the modal immediately and let the normal editor error handling do it's thing
- fixed confirm modal not appearing when retrying a save after a post validation failed
- show email status in post status area
    - `"and sending to x members"` when email is pending or submitting
    - `"and sent to x members"` once email is fully submitted
2019-11-20 23:27:09 +00:00
renovate[bot]
31b5b9319d Lock file maintenance (#1393) 2019-11-18 11:13:39 +00:00
Renovate Bot
50dcc82c62 Update dependency @tryghost/kg-clean-basic-html to v0.1.4 2019-11-18 11:13:38 +00:00
Renovate Bot
f5aa02592f Update dependency @tryghost/timezone-data to v0.2.16 2019-11-18 11:13:38 +00:00
Renovate Bot
ec7ecab0a4 Update dependency @tryghost/kg-parser-plugins to v0.8.1 2019-11-18 11:13:38 +00:00
Renovate Bot
9c31616c75 Update dependency @tryghost/helpers to v1.1.19 2019-11-18 11:13:38 +00:00
Nazar Gargol
871dcd9ddc Version bump to 3.0.3 2019-11-18 11:13:38 +00:00
Renovate Bot
cb3c17e438 Update dependency reframe.js to v2.2.6 2019-11-18 11:13:38 +00:00
Renovate Bot
105f92d9b2 Update dependency glob to v7.1.6 2019-11-18 11:13:38 +00:00
Peter Zimon
d6c016e770 🐛 Fixed code injection input sizes when they have long lines (#1394)
no issue
2019-11-18 11:13:38 +00:00
Renovate Bot
abc0c1147a Update dependency autoprefixer to v9.7.1 2019-11-18 11:13:38 +00:00
Renovate Bot
38ae6be5d6 Update dependency @tryghost/timezone-data to v0.2.15 2019-11-18 11:13:38 +00:00
Renovate Bot
a001608d25 Update dependency @tryghost/helpers to v1.1.18 2019-11-18 11:13:38 +00:00
Peter Zimon
e936e04300 Updated copy for Mailgun error 2019-11-18 10:55:05 +01:00
renovate[bot]
f9e3e797f1 Lock file maintenance (#1393) 2019-11-18 09:51:42 +00:00
Renovate Bot
db7c492993 Update dependency @tryghost/kg-clean-basic-html to v0.1.4 2019-11-18 04:24:36 +00:00
Renovate Bot
bf04821f43 Update dependency @tryghost/timezone-data to v0.2.16 2019-11-18 03:11:52 +00:00
Renovate Bot
a8ab98cfe4 Update dependency @tryghost/kg-parser-plugins to v0.8.1 2019-11-18 02:24:31 +00:00
Renovate Bot
4da3bceb04 Update dependency @tryghost/helpers to v1.1.19 2019-11-18 01:29:23 +00:00
Peter Zimon
5305e53121 Fix power select visual bug in PSM 2019-11-16 16:44:30 +01:00
Peter Zimon
3a8b6f897b Fixed subject for email preview 2019-11-16 13:07:51 +01:00
Peter Zimon
a8dadc1a3b Fixed word wrapping bug in Members labs settings 2019-11-15 16:11:26 +01:00
Peter Zimon
ee4a61b021 Refined mailgun settings in Labs 2019-11-15 14:38:59 +01:00
Rish
c274b5fc35 Updated send test mail error for mailgun
no issue
2019-11-15 18:55:40 +05:30
Kevin Ansfield
a95f8182f8 Swapped baseUrl input for region selection for bulk email settings
no issue

- Mailgun makes it really difficult to find your baseUrl from their UI if you've previously sent emails on a domain
- use a dropdown with flag and region name instead to better match what you can see in their UI
2019-11-15 13:10:45 +00:00
Rish
813b15d1c5 Fixed custom subject not saving on post
no issue
2019-11-15 12:35:49 +05:30
Rish
8fb9710f33 Allowed pointer-events on prerview modal 2019-11-15 11:37:04 +05:30
Kevin Ansfield
6fe159c8d9 Updated handling of send_email_when_published
refs 5fd2b7fed1

- sends `?send_email_when_published=true` query param when scheduling/publishing a post with the toggle turned on
  - adds support to the posts adapter for handling the `adapterOptions` option
  - updates the editor `save` task to pass through the required adapter option when a post is being published or scheduled with the toggle checked
- moves state for the email toggle into the publish menu so that we don't try to toggle the model attribute which should only be fetched from the API
- prevent `post.send_email_when_published` being sent to the API via the serializer as it's now a read-only attribute
2019-11-14 17:33:35 +00:00
Kevin Ansfield
f49268c5fa Hid email toggle on scheduled state of publish menu if email already sent 2019-11-14 17:20:53 +00:00
Peter Zimon
8dcf5f8428 Updated copy on email confirmation popup 2019-11-14 18:05:45 +01:00
Peter Zimon
f977d32146 Reorder mailgun settings in labs 2019-11-14 16:05:37 +01:00
Peter Zimon
d5a9465ca5 Design for minimal email stats 2019-11-14 14:30:49 +01:00
Peter Zimon
61f9f6e380 Updated post list 2019-11-14 13:53:43 +01:00
Rish
db899a90f0 Updated mailgun check to use isEnabled from settings
no issue
2019-11-13 22:38:16 +05:30
Rish
6a972d8b9e Wired admin bulk email settings UI to read/write setting
no issue
2019-11-13 22:38:16 +05:30
Rish
0e43505db1 Added new top-level bulk email settings
no issue
2019-11-13 22:38:16 +05:30
Kevin Ansfield
3d1962622b Added "View email" button to view already-sent email
no issue

- refactored `renderEmailPreview` into separate fetch and render functions
- grab email info from an existing email resource if it exists on the post rather than fetching a preview
- added "View email" button the the email-sent state of the newsletter settings PSM section
2019-11-13 16:38:32 +00:00
Kevin Ansfield
11dc0f553b Fixed tests 2019-11-13 16:10:29 +00:00
Peter Zimon
dc9ad61bc7 Updated scheduled publishmenu to display email setting 2019-11-13 15:36:54 +01:00
Peter Zimon
e56b10a728 Remove GhScheduledPostCountdown component 2019-11-13 15:33:57 +01:00
Peter Zimon
f5dd75e2e5 Updated post status in editor 2019-11-13 15:31:42 +01:00
Kevin Ansfield
7351a962b7 Fixed email subject field not being disabled if mailgun is not configured
no issue

- changed `disabled=deliveredAction` to `disabled=mailgunError` so that it's switching on the correct property
- removed all references to the unused `deliveredAction` property
2019-11-13 11:17:36 +00:00
Kevin Ansfield
74cbcad362 Use logged-in-user's email as the default test email address
no issue

- removed unnecessary scratch value handling for a non-model property
- use [`oneWay`](https://api.emberjs.com/ember/release/functions/@ember%2Fobject%2Fcomputed/oneWay) to bind the logged in user's email address to the `testEmailAddress` property on the component - this allows for the default value to always be the logged in users email but changing the property value only changes the value on the component, not upstream on the user model
- use default two-way binding of the `<Input>` helper to avoid unnecessary boilerplate
- removed unnecessary usage of the `truncate` helper for the placeholder
2019-11-13 10:52:09 +00:00
Kevin Ansfield
3daf46dcf8 Display "all paid members" instead of incorrect count in email confirm modal 2019-11-13 10:17:00 +00:00
Rish
17ef3efcef Fixed tests for copy changes 2019-11-13 11:45:58 +05:30
Nazar Gargol
fe54d9566c Version bump to 3.0.3 2019-11-11 18:55:36 +07:00
Kevin Ansfield
fd26864c28 Fixed linting 2019-11-11 10:42:37 +00:00
Kevin Ansfield
875e495728 Fixed email icon not showing for scheduled posts in posts list 2019-11-11 10:37:44 +00:00
Renovate Bot
a17c9a760b Update dependency reframe.js to v2.2.6 2019-11-11 02:20:16 +00:00
Renovate Bot
597f0acfcf Update dependency glob to v7.1.6 2019-11-11 01:20:32 +00:00
Peter Zimon
829702db84 Refined email icon on post list 2019-11-08 17:17:37 +07:00
Kevin Ansfield
682c5e4190 Display basic info in PSM once an email has been sent 2019-11-08 17:07:47 +07:00
Peter Zimon
43feb624b7 Updated tag for email icon in post list 2019-11-08 16:50:07 +07:00
Peter Zimon
8532c13a12 Updated copy for scheduled posts 2019-11-08 16:46:10 +07:00
Peter Zimon
8c55d57593 Added link to mailgun domain 2019-11-08 16:46:10 +07:00
Kevin Ansfield
35b13abb98 Show email icon in posts list 2019-11-08 16:44:56 +07:00
Kevin Ansfield
1d79a1f191 Fix missed wording change from merge conflict 2019-11-08 16:17:36 +07:00
Kevin Ansfield
a54cb48e5f Fixed tests 2019-11-08 16:01:40 +07:00
Kevin Ansfield
2777856a29 Extracted PSM email settings into separate component 2019-11-08 15:56:56 +07:00
Kevin Ansfield
3fd2a8d62c Removed unnecessary post+email normalization 2019-11-08 15:42:57 +07:00
Peter Zimon
d6ad183948 Refined post status and email warning copy 2019-11-08 15:38:25 +07:00
Peter Zimon
9127c72df4 Refined member detail copy 2019-11-08 13:37:28 +07:00
Peter Zimon
aabbbdc858 Updated PSM copy 2019-11-08 13:19:19 +07:00
Peter Zimon
bd214fbf1d Refined publish menu 2019-11-08 11:46:45 +07:00
Kevin Ansfield
2106f27df6 Fixed linting 2019-11-08 11:25:00 +07:00
Kevin Ansfield
41e1cf3ecb Fixed tests 2019-11-08 11:14:04 +07:00
Rish
f74060b08b Removed subdirectory from blog host in email setting field
no issue
2019-11-07 17:47:34 +07:00
Kevin Ansfield
5aac467b3f Removed errant console.log 2019-11-07 17:40:48 +07:00
Peter Zimon
25237a2d6d Refined mailgun warning 2019-11-07 17:14:08 +07:00
Kevin Ansfield
f23703c8b0 Fixed scrolling and hid scrollbars in email preview 2019-11-07 17:11:53 +07:00
Rish
90a6fe8cbb Removed redundant email serialization on post
no issue
2019-11-07 16:13:23 +07:00
Rish
e3616f177c Fixed lint 2019-11-07 16:02:32 +07:00
Kevin Ansfield
79074bceaf Added temporary workaround on client for API sending email: {} 2019-11-07 16:00:46 +07:00
Kevin Ansfield
0c0da3813e Added confirmation modal and use email model in place of action 2019-11-07 15:56:41 +07:00
Peter Zimon
71ded80e8c Refined disabled states more 2019-11-07 15:49:49 +07:00
Peter Zimon
48449ee222 Refined disabled states and copy 2019-11-07 15:32:29 +07:00
Peter Zimon
e5271b534d Styled disabled email checkbox 2019-11-07 13:21:23 +07:00
Rish
2aa781eef1 Added error for incorrect mailgun config in publish and settings menu 2019-11-07 12:44:37 +07:00