Commit Graph

573 Commits

Author SHA1 Message Date
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
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
Nicholas Staples
e2f5d64695 Added get calls for service and templates, as this will be removed from client. 2016-01-19 10:23:08 +00:00
Nicholas Staples
a9fead0d82 Merge with master. 2016-01-19 09:49:01 +00:00
Nicholas Staples
609f5f0a8d Working service integration. 2016-01-18 17:35:28 +00:00
Nicholas Staples
6e19dd7c9c Added choose_service using services_dao. 2016-01-18 16:01:04 +00:00
Chris Hill-Scott
2ab8c473cb Even out spacing in navigation 2016-01-18 14:31:27 +00:00
Chris Hill-Scott
74f64d9d8e Merge pull request #82 from alphagov/npm-govuk-elements
Use NPM-published version of GOV.UK Elements
2016-01-18 12:58:26 +00:00
Chris Hill-Scott
a055c59050 Use NPM-published version of GOV.UK Elements
The version we want is available now:
https://www.npmjs.com/package/govuk-elements-sass
2016-01-18 11:56:59 +00:00
Nicholas Staples
a09ac6cbf5 Added choose_service using services_dao. 2016-01-18 11:15:14 +00:00
NIcholas Staples
2d97f496f6 Merge pull request #81 from alphagov/add-new-service
Page for adding a new service
2016-01-18 11:12:57 +00:00
Chris Hill-Scott
81d4230b61 Page for adding a new service
This page is exactly the same as the page for adding your first service, save
the heading text.

So all this commit does is:
- set up two routes (`/add-service`, `/add-service/first`) for each of the two
  journeys and change the existing journeys to use the `/add-service/first`
  route
- add logic to show different heading text depending on the journey
- add a link to the new (`/add-service`) route in the service chooser dropdown
2016-01-18 11:03:25 +00:00
NIcholas Staples
893378ef9f Merge pull request #80 from alphagov/api-page-design
API keys and documentation page
2016-01-18 09:19:38 +00:00
Chris Hill-Scott
0df399f11c Remove parts of the page that aren’t in the story
https://www.pivotaltracker.com/story/show/111614524

Not clear if we are going to have code examples on this page, or if the
documentation will be hosted somewhere else.

It seems unecessary to put documentation behind a log in, so I’d lean towards
this page just being links.
2016-01-17 09:40:05 +00:00
Chris Hill-Scott
e5585512c8 Integrate API key pattern into existing page 2016-01-17 09:40:05 +00:00