Leo Hemsted
d26f7ac441
Merge branch 'master' of github.com:alphagov/notifications-admin into deactivate-services-plat-admin
2016-11-14 17:15:05 +00:00
imdadahad
6a9973d1b6
Merge pull request #1025 from alphagov/show-email-sms-stats-platform-admin
...
Show email and sms counts for each service on platform admin
2016-11-14 16:56:00 +00:00
imdadahad
49082ab646
Revert user_profile back original
...
This change shouldn't be in this PR and got in somehow :(
2016-11-14 16:49:25 +00:00
Imdad Ahad
5ce0cbe1db
Refactor stats into a macro and add format number red on failure
2016-11-14 16:42:08 +00:00
Imdad Ahad
eaa246bd26
Use SASS var for border colour and correct closing tbody tag
2016-11-14 16:00:45 +00:00
Imdad Ahad
dbbb2f7848
Fix comment
2016-11-14 14:50:36 +00:00
Imdad Ahad
c1649e85a6
Ensure stats shown on platform admin are correct and refactor original test for new layout
2016-11-14 14:46:52 +00:00
Imdad Ahad
7e269a454a
Show more granular email & sms counts on platform admin page
2016-11-14 14:46:26 +00:00
Imdad Ahad
ec7ec77b69
Return the email and sms stats instead of summing them
2016-11-14 14:45:41 +00:00
Chris Hill-Scott
620b0cf9ee
Merge pull request #1021 from alphagov/fix-page-title-send-test
...
Fix page title on send test page
2016-11-14 15:04:52 +01:00
Chris Hill-Scott
e164c4d5b1
Merge pull request #1023 from alphagov/sms-sender-fix
...
Fix errant service name in text messages
2016-11-14 15:04:25 +01:00
Chris Hill-Scott
b68ebbb107
Fix errant service name in text messages
...
Was missed as part of:
https://github.com/alphagov/notifications-admin/pull/905
2016-11-14 13:08:27 +00:00
Leo Hemsted
63de598d31
Merge pull request #1008 from alphagov/deactivate-service
...
Deactivate service
2016-11-14 11:41:13 +00:00
Leo Hemsted
fb85877c75
add tests for platform admin list ordering
2016-11-14 11:33:39 +00:00
Chris Hill-Scott
df6899b6e5
Merge pull request #1020 from alphagov/optional-content
...
Add guidance for optional content into template pages
2016-11-11 16:15:29 +01:00
Chris Hill-Scott
e1e2bec746
Refine content
2016-11-11 14:57:48 +00:00
imdadahad
115cbe67e5
Merge pull request #1011 from alphagov/update-user-profile
...
Update user profile
2016-11-11 14:47:13 +00:00
Chris Hill-Scott
46eae17c85
Remove redundant word
2016-11-11 14:46:00 +00:00
Chris Hill-Scott
e0cee58346
Add full stop to example
2016-11-11 14:43:56 +00:00
Chris Hill-Scott
047fb943db
Use typographic quotes
2016-11-11 14:38:15 +00:00
Chris Hill-Scott
00438e5363
Wrap content to 80 chars
2016-11-11 14:37:50 +00:00
Chris Hill-Scott
d9f273ab86
Fix page title on send test page
2016-11-11 12:47:26 +00:00
Pete Herlihy
ab345c0871
Added optional content guidance on edit sms template view
2016-11-11 11:44:48 +00:00
Pete Herlihy
50e2cd5863
Added optional content guidance to email template view
2016-11-11 11:43:56 +00:00
Pete Herlihy
22c5b44c4c
Added some guidance around using optional placeholders
2016-11-11 11:42:26 +00:00
Chris Hill-Scott
ac2b18d95a
Merge pull request #1019 from alphagov/quis-patch-1
...
Remove external link icon on info security link
2016-11-11 11:26:53 +01:00
Chris Hill-Scott
cd03cb70d3
Remove external link icon on info security link
...
It’s an internal link now
2016-11-11 10:26:35 +00:00
Chris Hill-Scott
e27bab48db
Merge pull request #1018 from alphagov/infosec-link
...
Point information security link at new URL
2016-11-11 11:15:57 +01:00
Imdad Ahad
1da498164f
Use POST req to update a user attr
2016-11-10 12:10:01 +00:00
Chris Hill-Scott
3b85afc095
Point information security link at new URL
...
We’re publishing it in the app now. No more Google doc. 🎉
2016-11-10 11:12:19 +00:00
imdadahad
910a6adef1
Merge pull request #1013 from alphagov/install-reqs-from-wheels
...
Use python wheels to speed up deployments
2016-11-10 10:49:10 +00:00
Imdad Ahad
e5ea81b184
Fix pep issues and refactor tests
2016-11-10 10:45:09 +00:00
Chris Hill-Scott
0803f900ab
Merge pull request #1017 from alphagov/quis-patch-1
...
Remove links from example URLs
2016-11-10 11:12:49 +01:00
Chris Hill-Scott
2750dc9b61
Remove links from example URLs
2016-11-10 10:10:43 +00:00
Chris Hill-Scott
253780f262
Merge pull request #1016 from SheryllGDS/patch-2
...
Update information-security.html
2016-11-09 16:06:34 +01:00
Chris Hill-Scott
5391c4aec0
Smart quotes
2016-11-09 15:06:26 +00:00
Imdad Ahad
f3ca33dad3
Revert original update user method and add new attribute update (with strict checking)
2016-11-09 15:06:02 +00:00
Chris Hill-Scott
8524ed0ae0
Smart quotes
2016-11-09 15:05:59 +00:00
Imdad Ahad
c28aea2de1
Update user profile attributes with new method
2016-11-09 15:05:06 +00:00
SheryllGDS
267b7f579c
Update information-security.html
2016-11-09 14:55:38 +00:00
Chris Hill-Scott
87368af338
Merge pull request #1015 from SheryllGDS/patch-1
...
Information security edits
2016-11-09 14:07:45 +01:00
SheryllGDS
23f52aae31
Update information-security.html
2016-11-09 12:45:55 +00:00
SheryllGDS
49ef6f22ff
Update information-security.html
2016-11-09 11:52:52 +00:00
Leo Hemsted
defa93809a
show archived label on platform admin page, and sort last
2016-11-08 15:00:44 +00:00
Leo Hemsted
7a48e25dbb
flash up prompt when archiving a service
...
same way as we do when deleting templates
(also rename button from deactivate -> archive)
2016-11-08 14:33:53 +00:00
Imdad Ahad
75854d91fc
Use python wheels to speed up deployments
2016-11-07 17:56:08 +00:00
Chris Hill-Scott
edfa9d4382
Merge pull request #1012 from alphagov/keys-and-trial-mode
...
Make relationship between keys, whitelist, trial mode and team clearer
2016-11-04 15:11:19 +01:00
Chris Hill-Scott
12248d32f7
Tell users when their service is live
...
Seen it a few times in research where people are like “so it’s live now
… I think. Is it?”
Let’s tell them exactly what’s happened. Also a chance to get @minglis’
idea about showing the daily limit.
2016-11-04 14:05:33 +00:00
Chris Hill-Scott
a36f38edb8
Remove banner for trial mode message
...
The yellow banner didn’t make this information much more noticeable,
and it made some people miss the request to go live link because it
wasn’t blue.
This commit brings the design back to where it was as of this PR:
https://github.com/alphagov/notifications-admin/pull/904
2016-11-04 14:05:32 +00:00
Chris Hill-Scott
dae10429e6
Use radio button desc. pattern on go live page
...
Nicer than using en dashes.
2016-11-04 14:05:31 +00:00
