Adam Shimali
167c7b0f13
Fixed some tests. Some broken mocked tests commented out until later
2016-01-21 12:31:09 +00:00
Adam Shimali
ee23df2c73
some tests fixed
2016-01-21 12:12:06 +00:00
Adam Shimali
856b6adb56
First slice full sign in flow
2016-01-21 11:33:53 +00:00
NIcholas Staples
33075178e8
Merge pull request #94 from alphagov/verify-user
...
Verify activate and login user with sms and email code
2016-01-21 09:45:19 +00:00
Adam Shimali
4e28410794
Temporarily comment out tests that are timing out until mocking sorted
2016-01-20 17:24:17 +00:00
Nicholas Staples
39cc76947f
Bumped version of notifications-python-client.
2016-01-20 17:12:57 +00:00
Adam Shimali
6a1cc32fd3
Merge pull request #93 from alphagov/send-sms-page-2
...
Put message previews on ‘Send SMS’ page
2016-01-20 16:36:34 +00:00
Adam Shimali
7af53761d9
fixed some mocks in test
2016-01-20 16:36:06 +00:00
Adam Shimali
fcedae5fe1
Merge conflicts and test fixes
2016-01-20 15:40:06 +00:00
Adam Shimali
ca3d3240a6
Verify activate and login user with sms and email code
2016-01-20 15:34:42 +00:00
Adam Shimali
5924500f3e
Merge pull request #95 from alphagov/implement_send_sms_and_email
...
Implement send sms and email
2016-01-20 15:24:29 +00:00
Nicholas Staples
75d7110642
Updated to send email through the client send_email.
2016-01-20 14:45:50 +00:00
Chris Hill-Scott
b6390b02a3
Remove old template picker
2016-01-20 13:20:16 +00:00
Chris Hill-Scott
9c8dca4487
Add example of template picker to styleguide
2016-01-20 13:19:28 +00:00
Chris Hill-Scott
f36a1bb6c9
Make SMS templates plausible for hack day
...
This commit replaces the previous SMS templates.
I’ve written a couple of new ones which are plausible for developers on the
hack day:
- one with placeholders
- one without
2016-01-20 13:12:21 +00:00
Chris Hill-Scott
a20b52b12b
Remove ‘create template’ link
...
Again, because the users of this page are probably not the same ones responsible
for creating templates, and we shouldn’t be encouraging users to create new
templates for each job (defeats the object of having templates).
2016-01-20 13:12:20 +00:00
Chris Hill-Scott
482abb97d5
Put message previews on ‘Send SMS’ page
...
A previous commit removed these to differentiate between this page and the
manage templates page. It turns out that we do want previews on this page
because:
- the users for the two pages might be different—they might only be allowed to
do one or the other depending what permissions they have
- it’s useful to see what the placeholders in the message are before uploading
a CSV, to make sure the CSV has the correct column headings
This commit re-adds the message preview with a simpler UI. Discussed with
@antimega and we both agreed that the speech bubble tails on the messages should
go.
2016-01-20 13:12:20 +00:00
Nicholas Staples
ae781bc58d
Merge remote-tracking branch 'origin/master' into implement_send_sms_and_email
2016-01-20 11:46:57 +00:00
Nicholas Staples
2cc9dc6995
Work in progress.
2016-01-20 11:46:39 +00:00
NIcholas Staples
596da7016c
Merge pull request #92 from alphagov/requirements-fix
...
move to proper version of api client library
2016-01-20 10:49:19 +00:00
Adam Shimali
3895280d52
move to proper version of api client library
2016-01-20 10:22:53 +00:00
NIcholas Staples
6cbeeb0eb6
Merge pull request #91 from alphagov/user-register-via-api
...
User registration now creates user via api.
2016-01-20 09:50:56 +00:00
Nicholas Staples
9266c14f46
Merge remote-tracking branch 'origin/master' into implement_send_sms_and_email
2016-01-20 09:48:25 +00:00
Nicholas Staples
4a73e9315c
Implemented send_sms from client.
2016-01-20 09:46:48 +00:00
Adam Shimali
422b1fb5c2
uncomment accidentally commented out tests
2016-01-20 09:43:38 +00:00
Adam Shimali
b5cdf86b40
User registration now creates user via api.
...
Verification flow is still to be completed.
Foreign key constraint on verify codes to user table removed.
2016-01-19 22:49:46 +00:00
Martyn Inglis
35b711f956
No db updates on admin app
2016-01-19 21:54:31 +00:00
Martyn Inglis
ca36b56d4c
Run start/stop as ubuntu
2016-01-19 21:26:45 +00:00
Martyn Inglis
26b44f61e3
Merge branch 'master' of github.com:alphagov/notifications-admin
2016-01-19 21:11:04 +00:00
Martyn Inglis
b8af89f131
Run start/stop as ubuntu
2016-01-19 21:10:52 +00:00
Nicholas Staples
e73e4ac934
Use new version of client.
2016-01-19 17:23:17 +00:00
Adam Shimali
0304838a2f
Merge pull request #88 from alphagov/integrate_template_api
...
Mapped template actions to the api and mocked tests.
2016-01-19 16:47:35 +00:00
NIcholas Staples
4cd6ea6d09
Merge pull request #90 from alphagov/rename-config-url
...
Rename NOTIFY_DATA_API_URL to API_HOST_NAME.
2016-01-19 16:45:59 +00:00
Rebecca Law
28658c6cc4
Rename NOTIFY_API_URL to API_HOST_NAME.
...
The NOTIFY_API_URL will point to the alpha api.
2016-01-19 16:39:04 +00:00
Nicholas Staples
f6f4fe15b2
Merge with master.
2016-01-19 16:35:52 +00:00
Rebecca Law
4a7f8213bd
Merge pull request #89 from alphagov/add-user-via-api
...
Add user via api
2016-01-19 16:26:39 +00:00
Adam Shimali
c86b53f7f1
Add user via api
...
Leave original user object in for this slice. Remove on next
2016-01-19 16:07:44 +00:00
Rebecca Law
762ab8e394
Merge pull request #85 from alphagov/remove-placeholder-data
...
Remove placeholder logs of notifications sent
2016-01-19 16:05:40 +00:00
Rebecca Law
bc7ad75899
Add default config
2016-01-19 16:04:08 +00:00
Rebecca Law
e98eacf661
Add admin client user name and secret (used to call into the API)
2016-01-19 16:02:24 +00:00
Nicholas Staples
cfb3f96b01
Mapped template actions to the api and mocked tests.
2016-01-19 15:54:12 +00:00
Martyn Inglis
fb77052585
Merge branch 'master' of github.com:alphagov/notifications-admin
2016-01-19 15:44:26 +00:00
Martyn Inglis
a74c78ebd5
Reorded the inits - so logging gets done first
2016-01-19 15:44:12 +00:00
minglis
d7e6e6ab0c
Merge pull request #87 from alphagov/reordered-config-overrides
...
Reorderd to override from env over credstash over config
2016-01-19 15:08:57 +00:00
Martyn Inglis
19ea0de766
Reorderd to override from env over credstash over config
2016-01-19 15:01:45 +00:00
NIcholas Staples
6c46d92dd4
Merge pull request #86 from alphagov/use-html5-details-for-switcher
...
Use HTML5 details element for the service switcher
2016-01-19 12:09:42 +00:00
Chris Hill-Scott
ba0c9ac6c1
Remove placeholder logs of notifications sent
...
From the:
- dashboard
- activity page
This info will be confusing for users at the hack day, because it will say
they’ve already sent messages when they first sign up.
This involved changing the table macro to have a nice ‘no rows’ message.
2016-01-19 12:04:18 +00:00
Adam Shimali
e74e591ca6
Merge pull request #84 from alphagov/integrate-python-client
...
Integrate python client
2016-01-19 11:57:33 +00:00
Chris Hill-Scott
a08089a47d
Use HTML5 details element for the service switcher
...
The previous service switcher was built purely in Javascript, which meant that,
for the purposes of progressive enhancement, it had to load in the open state.
Setting it to the closed state with Javascript happened a fraction of a second
after page load. This caused an unpleasant flicker as the whole page shifted up
and down as it loaded.
This commit changes the switcher to use the native HTML5 `details` and
`summary` elements[1].
This commit adds a polyfill from GOV.UK Elements for browsers which don’t
support `details`/`summary`.
1. http://html5doctor.com/the-details-and-summary-elements/
2016-01-19 11:45:18 +00:00
Adam Shimali
a90f575671
Merge pull request #83 from alphagov/even-out-navigation-spacing
...
Even out spacing in navigation
2016-01-19 11:29:00 +00:00