Commit Graph

657 Commits

Author SHA1 Message Date
Nicholas Staples
2d35f5f36a All tests passing and merged with master. 2016-01-27 16:30:33 +00:00
NIcholas Staples
68891d8eb8 Merge pull request #112 from alphagov/post-hack-day
Show all links in side navigation again
2016-01-27 12:25:00 +00:00
NIcholas Staples
8ff5ee9ffb Merge pull request #113 from alphagov/real-templates
Use real templates when sending text messages
2016-01-27 12:24:52 +00:00
NIcholas Staples
0858cec438 Merge pull request #114 from alphagov/no-service-hint
Remove hint from choose service page
2016-01-27 12:24:44 +00:00
NIcholas Staples
14c49eaac1 Merge pull request #115 from alphagov/temporarily-suspend
Show correct default state on service settings page
2016-01-27 12:24:35 +00:00
Nicholas Staples
6959d695d3 Working tests, hopefully all code changes done. 2016-01-27 12:22:32 +00:00
Chris Hill-Scott
3a864ad132 Use real templates when sending text messages
Sets the value of `template` to the ID of the chosen template when submitting
the form.
2016-01-26 17:17:46 +00:00
Chris Hill-Scott
a6d19ff45b Show correct default state on service settings page
By default a service should be active (ie keys not suspended). For some reason
the API is returning the opposite.

This commit reverses the logic to make it look right for hack day.
2016-01-26 17:16:24 +00:00
Chris Hill-Scott
5637e62493 Remove hint from choose service page
We might want this one day, but for now nothing is better than non-real-looking
text.
2016-01-26 17:12:28 +00:00
Chris Hill-Scott
e03813ceef Make 'API key was revoked' banner green 2016-01-26 16:26:08 +00:00
Chris Hill-Scott
4e158e203c Update styleguide 2016-01-26 16:20:57 +00:00
Chris Hill-Scott
86bdd0ad86 Show all links in side navigation again
These were temporarily hidden for hack day, to not distract participants.
2016-01-26 15:50:55 +00:00
Rebecca Law
1c9b71a750 Fix bug with user model. Removed is_locked from serialized method. 2016-01-26 14:34:21 +00:00
NIcholas Staples
54a322bb7a Merge pull request #111 from alphagov/sign-in-cleanup
Incrementing of failed logins happens on api side
2016-01-26 12:44:12 +00:00
Adam Shimali
b394a18b4e Incrementing of failed logins happens on api side 2016-01-26 12:36:05 +00:00
NIcholas Staples
d89174f322 Merge pull request #108 from alphagov/test-cleanup
Test cleanup
2016-01-26 10:53:49 +00:00
NIcholas Staples
b0acbb3497 Merge pull request #109 from alphagov/add-test-for-template-repopulation
Add test for template page repopulation
2016-01-26 10:53:27 +00:00
Nicholas Staples
ce81a6f540 Work in progress. 2016-01-25 10:47:27 +00:00
Adam Shimali
74edaee90c Merge remote-tracking branch 'origin/fix-keyboard-mashing' into test-cleanup 2016-01-25 08:20:04 +00:00
Chris Hill-Scott
46a7410839 Add test for template page repopulation
A bug was found whereby the body of a template was not being shown in the
on the page when returning to edit an existing template. This bug was caused
by renaming the field in some places, but not in the `Form` class.

This bug has since been fixed, but this commit adds a test to make sure that it
doesn’t happen again.
2016-01-25 07:20:13 +00:00
Martyn Inglis
6e95e4dd3b Updated the link to the API code 2016-01-24 21:04:24 +00:00
Martyn Inglis
f040d85a94 Updated documentation for api keys and for the developer documentation page. 2016-01-24 21:03:00 +00:00
Adam Shimali
3d14296ae0 Re introduced some tests. Moved update email from db to api. 2016-01-24 15:00:50 +00:00
Adam Shimali
4674bd6b68 Reintroduce some tests. A bit of cleanup of mocks.
User object fields made a bit clearer and simple test to
verify user added.
2016-01-23 23:14:50 +00:00
Martyn Inglis
e279d8f98c Removed dodgy symbols from link text 2016-01-22 23:21:15 +00:00
Chris Hill-Scott
1f497282e7 Fix keyboard mashing 2016-01-22 20:55:42 +00:00
Adam Shimali
ba0d0d49e1 Fixed tests 2016-01-22 19:32:08 +00:00
Adam Shimali
f8fc8e951a If user is logged in and visits / /sign-in or /register they will
be redirected to choose service.
2016-01-22 17:24:14 +00:00
NIcholas Staples
f11f50b4a5 Merge pull request #105 from alphagov/fix-get-services
Able to get services by user id
2016-01-22 16:56:06 +00:00
Rebecca Law
6ef9becf8f Able to get services by user id 2016-01-22 16:46:59 +00:00
Nicholas Staples
96d38b8189 Added check for password on service change page, work in progress. 2016-01-22 16:34:36 +00:00
Nicholas Staples
81cd0cc7c3 Fix for updating service name. 2016-01-22 15:26:56 +00:00
NIcholas Staples
44cb480375 Merge pull request #104 from alphagov/session-expiry
Sessions expire after one hour
2016-01-22 15:13:46 +00:00
Nicholas Staples
323a17952b Update pip requirements. 2016-01-22 15:08:33 +00:00
Adam Shimali
4d130fed01 Sessions expire after one hour 2016-01-22 15:05:13 +00:00
NIcholas Staples
820e78409f Merge pull request #103 from alphagov/visual-tweaks
Various fixes
2016-01-22 14:58:44 +00:00
Chris Hill-Scott
396f8415c6 SKIRMISH MODE 2016-01-22 14:51:01 +00:00
Chris Hill-Scott
cd38d54be7 Make ‘template type’ radio buttons not <select>
Because burn your select tags[1]

This commit hard codes the markup for the time being until I can work out how
to get WTForms outputting the markup I want.

1. https://www.youtube.com/watch?v=CUkMCQR4TpY
2016-01-22 14:51:00 +00:00
Chris Hill-Scott
9ee8610da0 Rename content to template content
WTForms sets the `id` of a `textarea` element to the variable name to which the
form control is assigned.

This conflicts with the page container, which is styled by targeting `#content`.
2016-01-22 14:51:00 +00:00
Chris Hill-Scott
48c0ae0140 Fix banner copy 2016-01-22 13:14:50 +00:00
Chris Hill-Scott
b00f9d5821 Fix spcing on empty table 2016-01-22 13:14:50 +00:00
Martyn Inglis
fb3b6510c4 Added template ID to template page, to allow users to identity required data for API calls. 2016-01-22 12:44:19 +00:00
Rebecca Law
d7f3cccbc5 Merge pull request #102 from alphagov/templates_add_edit_fix
Templates add edit fix
2016-01-22 11:57:14 +00:00
Nicholas Staples
f34d744425 Merge with master. 2016-01-22 11:38:16 +00:00
Nicholas Staples
5d5505bbff Delete template fix. 2016-01-22 11:36:49 +00:00
Adam Shimali
b2432791d1 Merge pull request #100 from alphagov/restricted-mode-banner
Add restricted mode warning
2016-01-22 11:27:18 +00:00
Adam Shimali
086e0fdd64 Merge pull request #101 from alphagov/fix-max-login
Fix bug with variable names
2016-01-22 11:25:58 +00:00
Nicholas Staples
dc7504b5a9 Edit form now populated correctly. 2016-01-22 11:24:33 +00:00
Rebecca Law
fd11e863da Fix bug with variable names 2016-01-22 11:21:30 +00:00
Nicholas Staples
ac433835f0 Fixed viewing templates. 2016-01-22 11:20:39 +00:00