Pete Herlihy
3eaeefbd37
Merge branch 'master' into hr
2017-12-12 16:38:08 +00:00
Pete Herlihy
7ee1cc56ae
Merge pull request #1704 from alphagov/119-120
...
119-120 for Home Office Tier 4 Premium
2017-12-12 16:34:38 +00:00
Pete Herlihy
13569bb7f8
119-120 for Home Office Tier 4 Premium
2017-12-12 15:06:53 +00:00
Venus Bailey
de23e9cb77
Merge pull request #1700 from alphagov/vb-callback-admin
...
Allow service to set callback url for notifications
2017-12-12 10:49:13 +00:00
venusbb
6f0ce3b33d
rewrite one of the obsolete test
2017-12-11 17:17:40 +00:00
Chris Hill-Scott
5b435c5457
Add undocumented support for <hr>s in emails
...
Implements:
- [x] https://github.com/alphagov/notifications-utils/pull/275/files
2017-12-11 16:36:03 +00:00
venusbb
3377efb267
Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-callback-admin
...
Some content change
Refractor api_integration to api_keys to reduce git difference.
2017-12-11 13:43:29 +00:00
Chris Hill-Scott
f156373e9a
Merge pull request #1685 from alphagov/comma-error
...
Update error message about commas in placeholders
2017-12-11 11:56:45 +00:00
venusbb
deda4e1d57
Merged
2017-12-11 11:44:29 +00:00
venusbb
482309af3b
fixed empty callback dict problem
2017-12-11 11:40:38 +00:00
chrisw
9c0d2c2a39
refactor of api callbacks admin work
2017-12-11 11:37:33 +00:00
chrisw
cd3d8edccd
Allowed custom attributes to be added to textbox component
2017-12-11 11:37:26 +00:00
chrisw
df383b5c0f
renamed api_keys file
2017-12-11 11:37:26 +00:00
chrisw
76117c148c
Allow service to set callback url for notifications
2017-12-11 11:37:26 +00:00
Chris Hill-Scott
eef66b70de
Reword because ‘inbetween’ isn’t a word
2017-12-11 11:19:33 +00:00
Chris Hill-Scott
242a216c1b
Update error message about commas in placeholders
...
We call the yellow things ‘double brackets’ on the frontend, not fields
or placeholders. This error message was a bit out of date.
Also refactored it to use the `Field` class; this code was probably
written before `Field` was factored out of `Template`.
2017-12-11 11:19:33 +00:00
Chris Hill-Scott
72dd0b369f
Merge pull request #1698 from alphagov/pyup-update-pyexcel-xls-0.5.4-to-0.5.5
...
Update pyexcel-xls to 0.5.5
2017-12-11 11:17:58 +00:00
pyup-bot
34aca4de5b
Update pyexcel-xls from 0.5.4 to 0.5.5
2017-12-11 10:41:20 +00:00
Pete Herlihy
58b999ec60
Merge pull request #1699 from alphagov/117-119
...
117-119 for Cash Service MK and HMCTS Small Claims Mediation
2017-12-11 10:38:51 +00:00
Pete Herlihy
79912166d7
117-119 for Cash Service MK and HMCTS Small Claims Mediation
...
50 - 51 orgs too
2017-12-11 10:25:23 +00:00
Chris Hill-Scott
8cc478f731
Merge pull request #1691 from alphagov/strip-spaces-sign-in
...
Strip spaces from email addresses when signing in
2017-12-08 16:21:26 +00:00
Chris Hill-Scott
bef8e8887b
Strip spaces from email addresses when signing in
...
If you copy and paste an email address into the sign in box, there’s a
chance you’ll also copy some leading or trailing spaces. This is
especially likely to happen if you’re doing this while using your
computer upside down.
If this happens, it never even gets as far as looking up the user,
because the form validation doesn’t consider a string with a leading
space to be a valid email address.
This commit makes sure that accidental spaces are handled, by removing
them before doing any validation or hitting the API to look up the user.
2017-12-08 16:17:45 +00:00
chrisw
71c9618a26
refactor of api callbacks admin work
2017-12-08 10:53:02 +00:00
chrisw
d812ff8b7c
Allowed custom attributes to be added to textbox component
2017-12-08 10:52:50 +00:00
chrisw
719dad375a
renamed api_keys file
2017-12-08 10:52:50 +00:00
chrisw
43c14fb756
Allow service to set callback url for notifications
2017-12-08 10:52:50 +00:00
kentsanggds
ac547623b1
Merge pull request #1694 from alphagov/ken-add-fast-smartypants
...
Add smartypants in requirements.txt
2017-12-07 16:21:59 +00:00
kentsanggds
3f76930dbe
Add smartypants in requirements.txt
2017-12-07 16:13:30 +00:00
kentsanggds
3742beee04
Merge pull request #1693 from alphagov/ken-fix-html5lib
...
Update requirements.txt to fix html5lib issue
2017-12-07 15:49:52 +00:00
kentsanggds
1c60a4cea2
Update requirements.txt
2017-12-07 15:07:44 +00:00
kentsanggds
a3a41cfe19
Update requirements.txt to fix html5lib issue
...
Update to latest version of notifications utils in order to fix issue in html5lib which is being used by bleach in utils.
2017-12-07 14:51:57 +00:00
Pete Herlihy
2f7694559f
Merge pull request #1692 from alphagov/115-117-and-48-50
...
115-117 and 48-50
2017-12-07 11:21:35 +00:00
Pete Herlihy
25600e3363
115-117 and 48-50
...
West Suffolk
Marine Management Organisation
Woo Hoo.
2017-12-07 10:26:12 +00:00
Leo Hemsted
8007650f3d
Merge pull request #1688 from alphagov/pyup-update-pytest-3.3.0-to-3.3.1
...
Update pytest to 3.3.1
2017-12-06 15:21:44 +00:00
pyup-bot
ee9c94e612
Update pytest from 3.3.0 to 3.3.1
2017-12-06 01:20:53 +00:00
Leo Hemsted
42f097a37d
Merge pull request #1683 from alphagov/billing-endpoints
...
Remove commented out line
2017-12-04 17:14:47 +00:00
Leo Hemsted
292350633f
update tests
2017-12-04 17:08:53 +00:00
Leo Hemsted
2a28278cb8
make sure service api client doesnt expect free sms fragment
2017-12-04 16:57:00 +00:00
Leo Hemsted
b9b3d7e9f3
remove other line
2017-12-04 16:45:12 +00:00
Leo Hemsted
c366e2e44b
Merge pull request #1682 from alphagov/billing-endpoints
...
update free sms fragment limit via billing client instead of service
2017-12-04 16:43:36 +00:00
Leo Hemsted
eb3d4acb45
update free sms fragment limit to go via billing client instead of service
2017-12-04 16:03:11 +00:00
Chris Hill-Scott
109832b090
Merge pull request #1680 from alphagov/no-features-signed-in
...
Remove features from top nav when signed in
2017-12-04 15:11:26 +00:00
Chris Hill-Scott
fc45acb2d4
Remove features from top nav when signed in
...
Features is a sales tool. Once you’re using the product already there’s
less of a need to see it. The pages are still accessible from the
footer, and for users who aren’t signed in.
2017-12-04 14:58:10 +00:00
Leo Hemsted
9c412a7f4e
Merge pull request #1679 from alphagov/ken-add-send_letters_as_pdf-setting
...
Add send letters as PDF service setting
2017-12-04 11:59:41 +00:00
Leo Hemsted
cab61a3d0a
Merge pull request #1665 from alphagov/change-csrf-token-status
...
Change the CSRF error from 400 to 403
2017-12-04 11:59:29 +00:00
Leo Hemsted
a3646254bc
Merge pull request #1678 from alphagov/pyup-update-flask-login-0.4.0-to-0.4.1
...
Update flask-login to 0.4.1
2017-12-04 11:59:21 +00:00
Leo Hemsted
4a110ac839
Merge pull request #1677 from alphagov/114-115
...
114-115 and 47-48 for CareCERT NHS Digital
2017-12-04 11:58:56 +00:00
pyup-bot
5f4e7ffe6a
Update flask-login from 0.4.0 to 0.4.1
2017-12-02 02:50:50 +00:00
Ken Tsang
8fb7f79e5e
Add send letters as PDF service setting
2017-12-01 19:12:22 +00:00
Pete Herlihy
212ac7c0ef
114-115 and 47-48 for CareCERT NHS Digital
2017-12-01 15:28:18 +00:00
