darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-13 09:50:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,854 Commits 59 Branches 61 Tags
3b5bd0bd9aeef1a6dcd2834c0350de7ef390039d
Commit Graph

5854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
3b5bd0bd9a Centre text in pill navigation 
Now the text is smaller (fewer words) it looks a bit wrong bunched up
on the left. the only other page this affects is ‘API integration’.
 2018-08-09 11:56:14 +01:00
Chris Hill-Scott
bcf538fa10 Remove separation between upload and send 
Now that you can access upload from within the send one off message
flow, it doesn’t need its own linkbutton on the template page.
 2018-08-09 11:56:14 +01:00
Chris Hill-Scott
3bd62c2aef Offer link to upload 
‘Upload recipients’ and ‘Send to one recipient’ have always been
slightly clunky phrases.

Now that basic view jumps straight into the ‘Send to one recipient’
flow there’s no way for users to get to the ‘Upload recipients’ flow.

By adding a link to it from the ‘Send to one recipient’ flow it’s
possible for users of basic view to access it.

But we don’t want to introduce too much inconsistency between basic view
and admin view because users will be migrating from one to another. They
might also be talking to their manager, who wouldn’t be able to tell
them where to click if they were looking at two completely different
interfaces.

This also means that we can keep the left-hand navigation in basic view
nice and simple with the two options (‘Templates’ and ‘Sent messages’),
rather than trying to introduce something like ‘Send one message’ and
‘Send lots of messages’ later on.
 2018-08-09 11:56:13 +01:00
Chris Hill-Scott
2dde1ad36f Merge pull request #2193 from alphagov/pyup-update-notifications-python-client-4.10.0-to-5.0.0 
Update notifications-python-client to 5.0.0
 2018-08-09 09:38:22 +01:00
Chris Hill-Scott
b9b0d0870b Merge pull request #2210 from alphagov/revert-track-basic-view 
Revert "Track event when someone previews basic view"
 2018-08-09 09:37:54 +01:00
Chris Hill-Scott
015d656d34 Merge pull request #2208 from alphagov/label-message-type-search 
Label the search box dependent on message type
 2018-08-09 09:37:01 +01:00
Chris Hill-Scott
4256c56b7a Merge pull request #2202 from alphagov/hide-branding-request-api-permission 
Hide email branding change link if the user doesn’t have the manage service permission
 2018-08-09 09:36:54 +01:00
Tom Byers
75d04a38db Merge pull request #2211 from alphagov/pin-govuk-elements-sass 
Pin patch version of govuk-elements-sass
 2018-08-08 16:44:30 +01:00
Tom Byers
f69bf3357b Merge pull request #2213 from alphagov/fix-test-breaking-on-url-format 
Change test on URL to use urllib methods
 2018-08-08 16:39:55 +01:00
Tom Byers
dcc0eb1e52 Change test on URL to use urllib methods 
Checking the raw string was breaking the test
sometimes due to it expecting the query parameters
to be in a different order.
 2018-08-08 16:24:52 +01:00
Tom Byers
155f6b9626 Merge pull request #2209 from alphagov/add-email-branding-preview 
Preview the email branding before setting it
 2018-08-08 15:25:25 +01:00
Chris Hill-Scott
214bfa9873 Label the search box dependent on message type 
It doesn’t make sense to say ‘Search by email address or phone number’
when you’re only looking at emails.
 2018-08-08 14:58:58 +01:00
Chris Hill-Scott
bb4c77fd59 Merge pull request #2212 from alphagov/domains-update 
Added a few contract / MOU to the signed list
 2018-08-08 14:49:53 +01:00
Tom Byers
d931966e5a Add CSS for email preview iframe 2018-08-08 14:23:38 +01:00
Pete Herlihy
f9cacf606c Added a few contract / MOU to the signed list 2018-08-08 12:30:07 +01:00
Katie Smith
fb95e08f97 Pin patch version of govuk-elements-sass 
Version 3.1.3 changed heading classes to display block - https://github.com/alphagov/govuk_elements/pull/552
This is a breaking change for us since we are using the heading classes
to make font bold - 3.1.3 adds line breaks in places where we don't want
them and causes some functional tests to fail.

Since we will be replacing govuk-elements with the new design system,
this commit pins the version of govuk-elements instead of updating all
the code to work with the lastest version.
 2018-08-08 11:21:39 +01:00
Tom Byers
e7ead052ce Add tests for /_email page 2018-08-08 11:21:30 +01:00
Chris Hill-Scott
7b1d4136bf Revert "Track event when someone previews basic view" 
This reverts commit 77d96032bf.
 2018-08-08 08:55:06 +01:00
Tom Byers
d8d48ea801 Add tests for preview step 
Includes moving code that tests an API call to
update the service with the new branding to the
preview step submission.

Also includes a change to the HTTP params sent by
the set-email-branding step. Think it was missed
out of this PR:

https://github.com/alphagov/notifications-admin/pull/1843

...so was never changed to 'branding_style'.
 2018-08-07 17:05:30 +01:00
Tom Byers
eb72f43b3f Fixes for tests broken by changes 
- corrects target page for set_email_branding to
  new preview step instead of itself
- removed check for helper method being called in
  email page test
- updates expected result for test of global
  headers to include changes to `frame-src`
- updates navigation config with brand preview page
 2018-08-07 16:56:37 +01:00
Tom Byers
386105954e Add JS to embed email preview into page 2018-08-07 16:56:37 +01:00
Tom Byers
c7610f359a improve range of params email page can take 
Can now deal with no query params and has a
default format of the GOV.UK branding.
 2018-08-07 16:56:37 +01:00
Tom Byers
a2a02a5185 Add preview step to branding selection flow 
Gives platform admins a chance to preview the
combination of brand type and custom brand
(coloured banner and logo) set for service before
saving.
 2018-08-07 16:56:37 +01:00
Tom Byers
7b955ffad2 Add 'self' to 'frame-src' header 
Allows iframes to contain pages from the same
domain as the parent page.
 2018-08-07 16:56:36 +01:00
Rebecca Law
6a06d4d714 Merge pull request #2171 from alphagov/flexible-data-retention 
Flexible data retention
 2018-08-07 14:27:31 +01:00
Chris Hill-Scott
c07a36b283 Merge pull request #2206 from alphagov/insolvency.gov.uk 
Mark agreement signed by The Insolvency Service
 2018-08-07 09:49:53 +01:00
Chris Hill-Scott
367dc05952 Mark agreement signed by The Insolvency Service 
Crown according to: http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/uk-crown-bodies/#azi

Signed agreement: https://drive.google.com/open?id=0ByP6zL-gKn64NEpHWEdxWnYySnJVZnkyd2RDMDByaEkwT1Nj
 2018-08-07 09:27:05 +01:00
Rebecca Law
18750585c4 Reduced the size of the pull request by only dealing with adding the data retention form. 2018-08-06 16:04:31 +01:00
Rebecca Law
ae1f1c95d6 Merge branch 'master' into flexible-data-retention 2018-08-06 15:37:11 +01:00
Rebecca Law
b0da7887a8 Merge branch 'master' of github.com:alphagov/notifications-admin 2018-08-06 15:32:14 +01:00
Chris Hill-Scott
4f7388f9b6 Merge pull request #2203 from alphagov/corby.gov.uk 
Mark agreement signed by Corby borough council
 2018-08-06 12:06:18 +01:00
Chris Hill-Scott
f4c96d5d54 Mark agreement signed by Corby borough council 2018-08-06 11:42:47 +01:00
Chris Hill-Scott
cecfe86e73 Hide email branding change if not manage service 
If you have the API keys permission you can see the settings page. But you 
can’t change or request stuff, like email branding. So we shouldn’t show the 
link that suggests you can.
 2018-08-06 11:25:19 +01:00
Chris Hill-Scott
84b05ab29c make freeze-requirements 2018-08-03 16:13:41 +01:00
Chris Hill-Scott
b93d5a2c6f Merge pull request #2200 from alphagov/pyup-update-pytest-3.7.0-to-3.7.1 
Update pytest to 3.7.1
 2018-08-03 16:11:55 +01:00
pyup-bot
77d43b8fed Update notifications-python-client from 4.10.0 to 5.0.0 2018-08-03 16:10:57 +01:00
Chris Hill-Scott
776d54ed54 Merge pull request #2201 from alphagov/bump-utils-29.3.4 
Bump utils to 29.3.4
 2018-08-03 15:05:30 +01:00
Chris Hill-Scott
55054b81b5 Include test key data by default on platform admin 
This is the existing behaviour. It’s broken by this issue in WTForms
2.2.1: https://github.com/wtforms/wtforms/issues/401

This commit hand-crafts the default value, because WTForms is ignoring
the `default` argument on the form object attribute.

Not really sure how this ever worked 🤔
 2018-08-03 14:53:40 +01:00
Chris Hill-Scott
0d2de75e84 Bump utils to 29.3.4 
https://github.com/alphagov/notifications-utils/compare/29.3.2...bullet-for-bullet
 2018-08-03 13:57:55 +01:00
pyup-bot
8d95673349 Update pytest from 3.7.0 to 3.7.1 2018-08-02 20:47:56 +01:00
Chris Hill-Scott
dd2364654a Merge pull request #2166 from alphagov/basic-view-description 
Revise how we talk about what basic view is
 2018-08-02 17:41:26 +01:00
Chris Hill-Scott
26823b6122 Fix straight apostrophe 2018-08-02 17:35:37 +01:00
karlchillmaid
8eaf7caa05 Updated hint text 
Updated hint text
 2018-08-02 17:31:16 +01:00
Chris Hill-Scott
6d7c47111c Merge pull request #2198 from alphagov/basic-event-keys 
Fix broken keys for basic view event tracking
 2018-08-02 17:13:48 +01:00
karlchillmaid
48ddce8410 Removed reference to 'their' sent messages 
Removed reference to 'their' sent messages – because users will be able to see all sent messages
 2018-08-02 17:09:20 +01:00
karlchillmaid
5c5fe54cb4 Updated content to include next steps 
Updated content to explain what users need to do next.

Includes explicit instructions and a repetition of 'team members'.
 2018-08-02 16:58:43 +01:00
Chris Hill-Scott
cabb0a74c1 Fix broken keys for basic view event tracking 
Bad copy/paste…
 2018-08-02 16:44:15 +01:00
Chris Hill-Scott
d92340b7cf Merge pull request #2197 from alphagov/track-basic-view 
Track onboarding of basic view in Google Analytics
 2018-08-02 16:17:14 +01:00
Chris Hill-Scott
c655826b17 Merge pull request #2195 from alphagov/geo.gov.uk 
Add Government Equalities Office to domain list
 2018-08-02 15:24:30 +01:00
Chris Hill-Scott
fc5f3ee132 Merge pull request #2192 from alphagov/jobs-one-off 
Show uploaded files in basic view
 2018-08-02 15:23:58 +01:00