Commit Graph

1385 Commits

Author SHA1 Message Date
Nicholas Staples
2352b0f80d Fix issue with uppercase in the domain name. 2016-04-06 16:45:35 +01:00
catherineheywood
2ae33f0179 Add temporary doc content to edit 2016-04-06 15:44:02 +01:00
Adam Shimali
503f8d8cd6 Merge pull request #405 from alphagov/add-date-back-into-template-stats
Add date field back into template stats
2016-04-06 15:15:44 +01:00
Adam Shimali
2dbf522932 Add date field back into template stats 2016-04-06 15:06:02 +01:00
minglis
91de8c504d Merge pull request #402 from alphagov/fix-500-email-job
Fix exception on email job page
2016-04-06 14:10:58 +01:00
Chris Hill-Scott
aa3274440b Fix exception on email job page
For email jobs, the template needed to look up the service to work out
the email_from and from_name.

`service` used to be a variable passed through to the view. Now every
veiw gets `current_service` instead.

This is a quick fix to make things work.
2016-04-06 14:04:02 +01:00
Chris Hill-Scott
65860c458b Merge pull request #397 from alphagov/human-readable-phone-numbers
Make it easier to deal with phone numbers in spreadsheets
2016-04-06 11:44:32 +01:00
Chris Hill-Scott
39e94ac8ec Add row numbers to tables
When a table is showing the contents of a CSV file, it should look
something like a spreadsheet.

The minimally skeuomorphic way to do this is by adding row numbers.

This commit doesn’t
- make the row numbers monospace (it’s barely noticeable and doesn’t
  reflect what actual spreadsheets do)
- make the first column heading ‘Row’ (again, doesn’t reflect how actual
  spreadsheets work, and takes up more valuable space)
2016-04-06 11:31:37 +01:00
Chris Hill-Scott
2abc336a0c Make phone numbers human readable
- in the example table on the ‘send’ page
- in the example CSV files

Implements: https://github.com/alphagov/notifications-utils/pull/18
2016-04-06 11:31:37 +01:00
NIcholas Staples
584e63c1f6 Merge pull request #398 from alphagov/fix_email_whitelist_bug
Fixed email bug and added new exhaustive tests.
2016-04-06 11:07:29 +01:00
Nicholas Staples
f0b604084c Fixed email bug and added new exhaustive tests. 2016-04-06 11:01:37 +01:00
catherineheywood
1a309a64ff doc tweak, cut out a few words 2016-04-06 10:12:51 +01:00
catherineheywood
bcad27ed83 Merge pull request #382 from alphagov/docs-tweaks
Some proposed changes to the docs
2016-04-06 09:07:24 +01:00
Chris Hill-Scott
e85e68bc64 Merge pull request #394 from alphagov/tour-after-invite
When a user accepts an invite, show them the tour
2016-04-05 16:27:35 +01:00
Chris Hill-Scott
686493ed8f When a user accepts an invite, show them the tour
It’s jarring to be sent right into the dashboard.

We think the tour makes things less jarring.
2016-04-05 16:21:06 +01:00
Adam Shimali
8351d98289 Merge pull request #387 from alphagov/template-stats-on-dashboard
Template statistics now surfaced on dashboard.
2016-04-05 14:19:45 +01:00
Adam Shimali
dc7964efd7 Fix service id bug in template. Use current_service instead 2016-04-05 14:12:18 +01:00
Chris Hill-Scott
c5be08380e Merge pull request #391 from alphagov/fix-hidden-trial-mode-link
Fix hidden trial mode link
2016-04-05 13:59:42 +01:00
Adam Shimali
eade0ef971 Added test for template stats client.
Removed date column from recently used templates table.
2016-04-05 13:50:42 +01:00
Chris Hill-Scott
0e22c9b2e0 Fix hidden trial mode link
This link wasn’t styled, therefore it had, by default, the same colour
as its background (blue).

This commit explicitly sets it to be white, so it is visible against its
background.
2016-04-05 13:44:53 +01:00
Chris Hill-Scott
94987a26c8 Merge pull request #389 from alphagov/fix-broken-links-tour
Fix broken links on tour pages
2016-04-05 13:30:47 +01:00
Chris Hill-Scott
98ce65b825 Fix broken links on tour pages 2016-04-05 13:24:57 +01:00
Chris Hill-Scott
53883fc162 Merge pull request #384 from alphagov/fix-heading-send-page
Fix incorrect heading on send page
2016-04-05 12:14:26 +01:00
Chris Hill-Scott
07709ba3c8 Merge pull request #386 from alphagov/whitelist-bug-fix
Fix bug with whitelist
2016-04-05 12:08:25 +01:00
Chris Hill-Scott
9327f83411 Fix bug with whitelist
Implements https://github.com/alphagov/notifications-utils/pull/17
2016-04-05 11:59:17 +01:00
Adam Shimali
159fe60c1a Template statistics now surfaced on dashboard.
Job list removed.

Template statistics retrieved at same time as
notification stats.
2016-04-05 11:47:24 +01:00
NIcholas Staples
ff3dd857ec Merge pull request #385 from alphagov/filter_history_bug
Bug fixed, links now work. All tests passing.
2016-04-05 11:42:00 +01:00
Nicholas Staples
359d1c29cb Bug fixed, links now work. All tests passing. 2016-04-05 11:29:24 +01:00
Chris Hill-Scott
7153be1fc6 Fix incorrect heading on send page
Accidentally reverted here: f84797e6d5 (diff-f7abe60b3b6c55859d983b3e19008838L14)

Matches the link on the choose template page.
2016-04-05 11:20:52 +01:00
Chris Hill-Scott
18633c0574 Force Travis to redeploy
This is an empty commit.

Travis missed the last merge onto master because Github was having an
outage.

Seems like the only way to force it to redploy is to update the branch.
2016-04-05 10:45:34 +01:00
Chris Hill-Scott
69e868f454 Merge pull request #380 from alphagov/svg-images-tour
Use SVG images for tour
2016-04-05 10:28:26 +01:00
Adam Shimali
c6bb4d11a3 Some proposed changes to the docs 2016-04-05 10:24:58 +01:00
Chris Hill-Scott
2652e6abee Merge pull request #377 from alphagov/sort-out-help-pages
Split Help page into Trial Mode and Pricing pages
2016-04-05 10:20:57 +01:00
Chris Hill-Scott
b912fa3f66 Merge pull request #376 from alphagov/dont-accepted-csv-with-restricted-recipients
Show error if restricted service uploads real CSV
2016-04-05 10:16:20 +01:00
catherineheywood
6ad3c8a6ed minor changes to doc 2016-04-05 10:16:03 +01:00
Chris Hill-Scott
a7849bf166 Merge pull request #381 from alphagov/fix-csv-reupload
Fix re-uploading of CSV files
2016-04-05 10:09:04 +01:00
Chris Hill-Scott
c95123914a Fix re-uploading of CSV files
The problem
---

1. Upload a CSV with problems
2. See the validation errors on the page
3. Try to re-upload the file
4. Get this error:

> Method Not Allowed
> The method is not allowed for the requested URL.

https://www.pivotaltracker.com/story/show/116882241

The cause
---
The POST route for the check page (where you see errors in your files)
was removed here:
f3fd5f6b15 (diff-1dd8b3bf53dfd9382c7721051f3d930dR280)

The fix
---
This commit adds:
- a simple route which re-calls the initial ‘I have uploaded a file’ route
- a test to make sure that both of these routes are POSTed to
2016-04-05 09:02:52 +01:00
Chris Hill-Scott
7a0a81c07c Show error if restricted service uploads real CSV
Implements: https://github.com/alphagov/notifications-utils/pull/16

Also changes a bunch of the mocked phone numbers to be real-looking so
that the tests are checking for the right kind of error.
2016-04-04 17:17:52 +01:00
NIcholas Staples
6992041027 Merge pull request #369 from alphagov/remember_last_used_service_in_session
All tests working and home page is now dependent on the service in th…
2016-04-04 17:09:37 +01:00
Chris Hill-Scott
0a3567ec48 Add page <title>s to tour pages 2016-04-04 17:08:30 +01:00
Nicholas Staples
c31c55666b Added current_service to flask context and template context.
Fix all tests and conflicts.

Removed comment line.
2016-04-04 17:01:20 +01:00
Chris Hill-Scott
47b86e70df Use SVG images for tour
SVG images will look sharper and scale more cleanly. However they are
not supported on older browsers[1]

> The <picture> element allows for fallback images when the browser
> doesn't support a specified image format.

`<picture>` is supported in the latest versions of Chrome, Firefox, IE
(Edge), Safari and Android, so all these browsers will get the SVG
version.

Older browsers will fall back to the PNG version.

[1] http://caniuse.com/#feat=svg
[2] https://css-tricks.com/a-complete-guide-to-svg-fallbacks/#fallback-svg-as-img-picture
[3] http://caniuse.com/#feat=SVG
2016-04-04 16:55:06 +01:00
NIcholas Staples
f444284580 Merge pull request #379 from alphagov/filter_notifications_page
Working functionality for filtering notifications and all tests passing.
2016-04-04 16:43:57 +01:00
Nicholas Staples
a41dda8884 Working functionality for filtering notifications and all tests passing. 2016-04-04 16:34:06 +01:00
Henry Hadlow
e51f7066e4 Merge branch 'sort-out-help-pages' of github.com:alphagov/notifications-admin into sort-out-help-pages
* 'sort-out-help-pages' of github.com:alphagov/notifications-admin:
  Split Help page into Trial Mode and Pricing pages
2016-04-04 16:30:55 +01:00
Henry Hadlow
19c01101c3 Remove commented content -- still in git history 2016-04-04 16:28:21 +01:00
Henry Hadlow
ac576c6529 Split Help page into Trial Mode and Pricing pages
- Add routes
- Add footer links
- Make heading size consistent on Cookies page
2016-04-04 16:03:52 +01:00
Henry Hadlow
c23e22a0df Fix tests -- update link on Request to go live page 2016-04-04 15:29:54 +01:00
Henry Hadlow
246023616a Split Help page into Trial Mode and Pricing pages
- Add routes
- Add footer links
- Make heading size consistent on Cookies page
2016-04-04 15:23:24 +01:00
catherineheywood
dc5c552f5f Doc changes 2016-04-04 14:37:35 +01:00