Commit Graph

4840 Commits

Author SHA1 Message Date
pyup-bot
a914c2e783 Update pyexcel from 0.5.6 to 0.5.7 2018-01-15 13:53:10 +00:00
pyup-bot
b79cd42110 Update pyexcel-io from 0.5.5 to 0.5.6 2018-01-15 13:52:39 +00:00
pyup-bot
b4435e5b7f Update pytest-xdist from 1.21.0 to 1.22.0 2018-01-15 13:52:39 +00:00
Chris Hill-Scott
c79a439a05 Merge pull request #1775 from alphagov/link-to-callbacks
Add links to navigate to/from callbacks page
2018-01-15 13:49:04 +00:00
Chris Hill-Scott
67b54d850f Add link back to API integration from callbacks
Matches what we do on the API keys and whitelist pages.
2018-01-15 10:10:12 +00:00
Chris Hill-Scott
b3673a94a2 Link to callbacks from inbound page
If you’ve got an inbound number and are using the API you’ll probably
be interested in this new feature we’ve got. And if you do know about
it, you might not be able to find it because we’ve moved it.
2018-01-15 10:10:11 +00:00
Katie Smith
c45e0cbf05 Merge pull request #1774 from alphagov/500-on-letter-json-page
Fix 500 error from notifications/letter.json page
2018-01-15 10:05:09 +00:00
Katie Smith
7386d5ec1c Fix 500 error from notifications/letter.json page
The letters notification page makes ajax calls to update the status - these
were failing because it's making a POST request without a CSRF token.
(The email and SMS notification pages contain a search form that includes
the hidden CSRF input, so this was only occurring with the letters
page.)

This commit adds a hidden form for the letters page which just contains
the CSRF token.
2018-01-15 09:21:12 +00:00
Chris Hill-Scott
12df43ffb4 Merge pull request #1777 from alphagov/service-name-hint
Correct description of how service name appears
2018-01-12 17:00:54 +00:00
Chris Hill-Scott
ebd5721d42 Correct description of how service name appears
This has changed since we made prefixing text messages its own setting.
2018-01-12 16:55:54 +00:00
Rebecca Law
17573437a9 Merge pull request #1780 from alphagov/revert-download
Revert download link.
2018-01-12 16:21:18 +00:00
Rebecca Law
135b0ad131 Revert download link.
There is some inconsistencies about how it is working, that needs to be solved.
2018-01-12 16:15:53 +00:00
Rebecca Law
b5375d99d9 Merge pull request #1779 from alphagov/download_link-activity-page
Fix bug.
2018-01-12 14:23:43 +00:00
Rebecca Law
81241999fc Merge branch 'master' into download_link-activity-page 2018-01-12 14:05:27 +00:00
Rebecca Law
59ac514655 Fix bug. 2018-01-12 14:03:31 +00:00
Rebecca Law
7957b432bb Merge pull request #1765 from alphagov/download_link-activity-page
Download link activity page
2018-01-12 13:25:35 +00:00
Rebecca Law
b34dd98086 Merge branch 'download_link-activity-page' of github.com:alphagov/notifications-admin into download_link-activity-page 2018-01-12 12:06:52 +00:00
Rebecca Law
08e5f68461 A little refactoring 2018-01-12 12:06:07 +00:00
Rebecca Law
c520540790 Merge branch 'master' into download_link-activity-page 2018-01-11 09:49:13 +00:00
Rebecca Law
083d601207 Merge pull request #1762 from alphagov/pyup-update-awscli-1.14.16-to-1.14.22
Update awscli to 1.14.22
2018-01-10 17:04:44 +00:00
Rebecca Law
8242e5723f Merge branch 'master' into pyup-update-awscli-1.14.16-to-1.14.22 2018-01-10 16:54:05 +00:00
Rebecca Law
a7ac272137 Merge pull request #1761 from alphagov/pyup-update-boto3-1.5.6-to-1.5.12
Update boto3 to 1.5.12
2018-01-10 16:44:22 +00:00
Rebecca Law
8911660cb2 Merge branch 'master' into pyup-update-awscli-1.14.16-to-1.14.22 2018-01-10 16:40:16 +00:00
Rebecca Law
aa31d1b5eb Merge branch 'master' into pyup-update-boto3-1.5.6-to-1.5.12 2018-01-10 16:39:34 +00:00
Rebecca Law
6070e2e197 Merge branch 'master' into download_link-activity-page 2018-01-10 16:06:40 +00:00
Chris Waszczuk
c3fe2bb906 Merge pull request #1755 from gov-cjwaszczuk/master
Allow letter templates to select the a default template sender from service senders
2018-01-10 14:56:44 +00:00
chrisw
7271d4fbde Allow letter templates to select the default contact block from the list 2018-01-10 11:20:40 +00:00
Leo Hemsted
db2fad1a75 Merge pull request #1763 from alphagov/leohemsted-patch-1
derry strabane council email whitelist
2018-01-10 11:06:37 +00:00
Leo Hemsted
b27eacb03b oops 2018-01-10 10:56:21 +00:00
Leo Hemsted
224b9e5098 Update test_validators.py 2018-01-10 10:48:58 +00:00
Leo Hemsted
c780c94fb6 derry strabane council email whitelist 2018-01-10 10:47:40 +00:00
pyup-bot
666e1b16db Update awscli from 1.14.16 to 1.14.22 2018-01-09 23:23:30 +00:00
pyup-bot
1bef45ef17 Update boto3 from 1.5.6 to 1.5.12 2018-01-09 23:23:21 +00:00
Leo Hemsted
665c569db2 Merge pull request #1753 from alphagov/session-cookie
Replace cookie implementation with flask builtin secure cookie.
2018-01-09 17:18:43 +00:00
Leo Hemsted
b9f7fa1f6f Replace cookie implementation with flask builtin secure cookie.
However, by default, session cookies don't expire (only cleared out by
the end user's browser).

This is dumb. You'd think, given that there's
`config['PERMANENT_SESSION_LIFETIME']`, that you'd enable permanent
sessions in the config too - but no, you have to declare it for each
request. session.permanent is also, helpfully, a way of saying that the
session isn't permanent - in that, it will expire on its own, as
opposed to being controlled by the browser's session. Because session
is a proxy, it's only accessible from within a request context, so we
need to set this before every request 🙄

http://flask.pocoo.org/docs/0.12/api/#flask.session
https://stackoverflow.com/questions/34118093/flask-permanent-session-where-to-define-them
2018-01-09 16:45:48 +00:00
Alexey Bezhan
08dca5b879 Merge pull request #1758 from alphagov/generate-manifest-env
Add generate_manifest.py script and update deployment tasks
2018-01-09 16:41:25 +00:00
Alexey Bezhan
0088d588e1 Use VCAP_APPLICATION to detect CloudFoundry environment
VCAP_SERVICES is not set on PaaS if no services are bound to the
application, so we need to check for VCAP_APPLICATION to parse the
application name and environment.
2018-01-09 14:50:41 +00:00
Alexey Bezhan
945c967250 Don't parse AWS credentials from VCAP_SERVICES in run_app_paas
AWS credentials are provided in the environment variables directly,
so we don't need to parse them from VCAP_SERVICES
2018-01-09 14:20:18 +00:00
Alexey Bezhan
8346e1b8be Remove VCAP_SERVICES parsing code
We're no longer using user-provided services for application secrets
so we can remove the cloudfoundry_config code responsible for parsing
VCAP_SERVICES.
2018-01-09 14:18:32 +00:00
Alexey Bezhan
c550c686d1 Replace manifest user-provided services with environment variables
Variable values are populated from the credentials by the `generate-manifest`
make target.
2018-01-09 14:17:03 +00:00
Alexey Bezhan
ab55bf49b2 Add generate_manifest.py script and update deployment tasks
Brings in the new environment variables deployment process introduced
in alphagov/notifications-api#1543.

The script is a copy of the API one and make steps are modified to
fit with the existing admin deployment targets.
2018-01-09 14:14:47 +00:00
Chris Hill-Scott
8c55dba2a7 Merge pull request #1754 from alphagov/pre-next-update
Update previous/next navigation to match GOV.UK
2018-01-09 10:23:50 +00:00
Chris Hill-Scott
17ea920be4 Update previous/next navigation to match GOV.UK
The pagination pattern on GOV.UK changed in:
https://github.com/alphagov/static/pull/1051

We should update ours to match because:
- consistency
- the new icons looks better
2018-01-08 15:59:55 +00:00
Chris Waszczuk
24d73a2471 Merge pull request #1750 from alphagov/make-content-links-in-notify-consistent
Make content links in notify consistent
2018-01-08 11:43:55 +00:00
chrisw
79355d42fb Merge branch 'master' of https://github.com/alphagov/notifications-admin into make-content-links-in-notify-consistent 2018-01-08 11:23:38 +00:00
chrisw
0a7fe52e83 make content links in Notify consistent 2018-01-05 14:45:19 +00:00
Chris Hill-Scott
9265101b11 Merge pull request #1749 from alphagov/pyup-update-pytest-3.3.1-to-3.3.2
Update pytest to 3.3.2
2018-01-05 12:59:42 +00:00
pyup-bot
3e9e45ee29 Update pytest from 3.3.1 to 3.3.2 2018-01-05 12:46:24 +00:00
Chris Hill-Scott
291e55efa6 Merge pull request #1747 from alphagov/128-131
128-131 and 53 to 55
2018-01-05 12:46:05 +00:00
Pete Herlihy
9e70924042 128-131 and 53 to 55
* ABCi - Aneurin Bevan UHB – Aneurin Bevan University Health Board
* Research – Driver & Vehicle Standards Agency
* Tunbridge Wells Borough Council	 – Tunbridge Wells Borough Council
2018-01-05 12:32:34 +00:00