darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-03 23:51:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,200 Commits 49 Branches 59 Tags
fec79380b68a0cceff6b41cebdc59d94bc01ed64
Commit Graph

11200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Thorner
e23daa205c Revert "Scheduled weekly dependency update for week 07" 2021-02-16 14:25:43 +00:00
Ben Thorner
6e04313c18 Merge pull request #3802 from alphagov/pyup-scheduled-update-2021-02-15 
Scheduled weekly dependency update for week 07
 2021-02-16 13:46:54 +00:00
pyup-bot
e28f7da5bf Update xlrd from 1.2.0 to 2.0.1 2021-02-15 13:55:20 +00:00
pyup-bot
44b66ccfe6 Update urllib3 from 1.26.2 to 1.26.3 2021-02-15 13:55:20 +00:00
pyup-bot
30662b123e Update s3transfer from 0.3.3 to 0.3.4 2021-02-15 13:55:20 +00:00
pyup-bot
9f97cc5c45 Update rsa from 4.5 to 4.7 2021-02-15 13:55:19 +00:00
pyup-bot
f46b616b2e Update pyyaml from 5.3.1 to 5.4.1 2021-02-15 13:55:19 +00:00
pyup-bot
b0f772a2cf Update pyjwt from 2.0.0 to 2.0.1 2021-02-15 13:55:19 +00:00
pyup-bot
a0d7cfa904 Update phonenumbers from 8.12.15 to 8.12.18 2021-02-15 13:55:18 +00:00
pyup-bot
123ff1d1a4 Update packaging from 20.8 to 20.9 2021-02-15 13:55:17 +00:00
pyup-bot
087cebb363 Update openpyxl from 3.0.5 to 3.0.6 2021-02-15 13:55:17 +00:00
pyup-bot
c29f67b3f2 Update idna from 2.10 to 3.1 2021-02-15 13:55:16 +00:00
pyup-bot
3e6eccc8fe Update greenlet from 0.4.17 to 1.0.0 2021-02-15 13:55:16 +00:00
pyup-bot
f9198cfc09 Update docutils from 0.15.2 to 0.16 2021-02-15 13:55:16 +00:00
pyup-bot
9bb21c7819 Update dnspython from 1.16.0 to 2.1.0 2021-02-15 13:55:15 +00:00
pyup-bot
678fcc3f7b Update colorama from 0.4.3 to 0.4.4 2021-02-15 13:55:15 +00:00
pyup-bot
a397d5045c Update cachetools from 4.2.0 to 4.2.1 2021-02-15 13:55:15 +00:00
pyup-bot
631171c9f3 Update botocore from 1.19.51 to 1.20.7 2021-02-15 13:55:14 +00:00
pyup-bot
f52a9a83eb Update boto3 from 1.16.51 to 1.17.7 2021-02-15 13:55:14 +00:00
pyup-bot
3304d25ebf Update awscli from 1.18.211 to 1.19.7 2021-02-15 13:55:14 +00:00
pyup-bot
dcde359deb Update requests-mock from 1.7.0 to 1.8.0 2021-02-15 13:55:13 +00:00
pyup-bot
56e67ce3a0 Update flake8-print from 3.1.4 to 4.0.0 2021-02-15 13:55:13 +00:00
pyup-bot
f04de93e74 Update flake8-bugbear from 19.8.0 to 20.11.1 2021-02-15 13:55:12 +00:00
pyup-bot
098397457f Update flake8 from 3.7.9 to 3.8.4 2021-02-15 13:55:12 +00:00
pyup-bot
b7dd7bf6f7 Update freezegun from 0.3.12 to 1.1.0 2021-02-15 13:55:12 +00:00
pyup-bot
1d3b4e9cb8 Update beautifulsoup4 from 4.8.1 to 4.9.3 2021-02-15 13:55:11 +00:00
pyup-bot
8aae790a72 Update pytest-xdist from 1.31.0 to 2.2.1 2021-02-15 13:55:11 +00:00
pyup-bot
292e0ad358 Update pytest-mock from 1.11.2 to 3.5.1 2021-02-15 13:55:11 +00:00
pyup-bot
298259a591 Update pytest from 5.3.2 to 6.2.2 2021-02-15 13:55:10 +00:00
pyup-bot
c7112c0e69 Update isort from 4.3.21 to 5.7.0 2021-02-15 13:55:10 +00:00
pyup-bot
baabff6284 Update notifications-python-client from 5.7.1 to 6.0.2 2021-02-15 13:55:09 +00:00
pyup-bot
d70e5bb104 Update notifications-python-client from 5.7.1 to 6.0.2 2021-02-15 13:55:09 +00:00
pyup-bot
ab4466e66f Update eventlet from 0.30.0 to 0.30.1 2021-02-15 13:55:09 +00:00
pyup-bot
e017aa6c9a Update eventlet from 0.30.0 to 0.30.1 2021-02-15 13:55:08 +00:00
pyup-bot
c4cc0b9674 Update pytz from 2020.5 to 2021.1 2021-02-15 13:55:08 +00:00
pyup-bot
aa0394f2d1 Update pytz from 2020.5 to 2021.1 2021-02-15 13:55:07 +00:00
Chris Hill-Scott
5a53f28747 Merge pull request #3800 from alphagov/reduce-default-broadcast-expiry 
Reduce default broadcast expiry time
 2021-02-15 11:19:24 +00:00
Chris Hill-Scott
276644f504 Reduce default broadcast expiry time to 4 hours 
We don’t think we need to broadcast longer than this to validate that
the system is working.
 2021-02-12 17:43:11 +00:00
Chris Hill-Scott
32e60ab507 Merge pull request #3799 from alphagov/alternative-product-image-desktop-only 
Only show the alternative product image on desktop
 2021-02-12 15:08:51 +00:00
Chris Hill-Scott
691e1396f3 Merge pull request #3776 from alphagov/utils-polygons 
Replace polygons module with the one from utils
 2021-02-12 15:08:46 +00:00
Chris Hill-Scott
769b85ff25 Replace polygons module with the one from utils 
We moved it in https://github.com/alphagov/notifications-utils/pull/818/files
 2021-02-12 14:52:53 +00:00
Chris Hill-Scott
e193358f78 Only show the alternative product image on desktop 
This matches what we do with the regular product image, to make sure the
text doesn’t overlap it.
 2021-02-12 14:28:19 +00:00
Chris Hill-Scott
f83a8b49f1 Merge pull request #3797 from alphagov/optimise-product-image-js 
Progressively enhance the proposition illustration
 2021-02-11 17:10:03 +00:00
Chris Hill-Scott
7463510378 Progressively enhance the proposition illustration 
When users with Javascript enabled request it we can show a higher
quality SVG image which will look better in certain circumstances.
 2021-02-11 17:03:13 +00:00
David McDonald
70b606a2d4 Merge pull request #3795 from alphagov/drop-go-live-link 
Remove text about service is live or in trial mode
 2021-02-11 12:01:35 +00:00
David McDonald
dc69fa5a90 Remove text about service is live or in trial mode 
This is not relevant for broadcast services. This information is
given in the heading bar next to the service name. There is no process
to request to go live and it is not necessary to tell you again that the
service is live
 2021-02-10 15:35:48 +00:00
Ben Thorner
0abc143147 Merge pull request #3790 from alphagov/show-from-reply-to 
Fix not showing 'From' / 'Reply to' after sending
 2021-02-10 14:40:54 +00:00
Ben Thorner
486393962e Show 'From' / 'Reply to' on all sending screens 
This makes the preview of the email / SMS to send consistent with
the final screen, which we previously changed to show the "reply
to" text irrespective of whether the user had selected anything.
 2021-02-10 10:43:29 +00:00
Ben Thorner
933d5bf68e Show 'From' / 'Reply To' if set for notification 
Previously when a service had multiple "reply to" entries setup for
email or SMS, we would show the one that was selected on all screens
[1][2] except the final one, where the notification is actually sent.
This fixes that, with the caveat that it will also show for services
with only one "reply to" entry (see notes below) - we will look at
making this consistent on the previous screens in the next commit.

Here's a bit more detail on how this works:

- If a service has multiple "reply to" entries, the journey to send a
  one-off message starts with a screen to select the "sender_id", which
  is otherwise "None" [3].

- The "sender_id" is subsequently resolved to an actual email / phone
  number by calling an API [4] and plucking it out of the response JSON.

- The email / phone number then get rendered as part of the preview
  template [5][6].

- Unfortunately the "sender_id" is removed from the session by the time
  we get to the "view_notification" view [7].

- However, we can get back the equivalent text from the notification
  JSON, which is set by the API when the notification is created [8],
  give or take a bit of validation code [9][10].

- But the "reply_to_text" field is also set by the API when the service
  only has one "reply to" entry, so it will show then as well.

We could add look at the number of "reply to" entries for the service,
in order to consistently only show it when there is more the one. But
it seems more useful to show it on previous screens, since it provides
more information than is currently show (esp. for emails).

[1]: 93226ec5d6/app/main/views/send.py (L441-L442)
[2]: 93226ec5d6/app/main/views/send.py (L966-L967)
[3]: 93226ec5d6/app/main/views/send.py (L247)
[4]: 93226ec5d6/app/main/views/send.py (L1071-L1082)
[5]: 93226ec5d6/app/templates/views/notifications/notification.html (L80)
[6]: https://github.com/alphagov/notifications-utils/blob/master/notifications_utils/jinja_templates/sms_preview_template.jinja2
[7]: 93226ec5d6/app/main/views/send.py (L1059)
[8]: f8b4c9151c/app/service/send_notification.py (L87-L93)
[9]: f8b4c9151c/app/models.py (L653)
[10]: https://github.com/alphagov/notifications-utils/blob/master/notifications_utils/recipients.py#L482
 2021-02-10 10:43:27 +00:00
Rebecca Law
b8f652cb2e Merge pull request #3793 from alphagov/update-utils-address-validation 
Update utils to version 43.8.
 2021-02-10 09:56:41 +00:00