Commit Graph

394 Commits

Author SHA1 Message Date
Martyn Inglis
bd4829f451 Setting s3 etag to be git commit 2016-01-11 10:54:04 +00:00
Martyn Inglis
0369670f93 Setting s3 etag to be git commit 2016-01-11 10:49:04 +00:00
minglis
060093f30f Merge pull request #54 from alphagov/credstash-integration
Integrated credstash as a live properties setting in the app.py class
2016-01-11 10:11:24 +00:00
Martyn Inglis
7efa513777 Ensured credstash is located only with the wsgi/gunicorn code. 2016-01-11 09:59:31 +00:00
Martyn Inglis
42b62ce7cd Removed secrets setup from db script 2016-01-11 09:50:12 +00:00
Martyn Inglis
ba4dac051b Integrated credstash as a live properties setting in the app.py class
- initial versions kept it out of this class but updated as lots of duplication and errors as config
set up in multiple places and not all picking up credstash.
2016-01-11 09:32:49 +00:00
Martyn Inglis
63c87f10e7 Needed own file for db scripts. Need to compartmentalise running the app and the db upgrades into differing scripts. 2016-01-10 22:16:26 +00:00
Martyn Inglis
60f6601845 Copy the db upgrade command into WSGI script.
In there currently as wsgi has the credstash which we don't won't to apply in non-awe environments. This will need a refactor to better handle code duplication.
2016-01-10 21:53:41 +00:00
minglis
3406d3036f Merge pull request #53 from alphagov/setup-credstash
Incorporate credstash in production wsgi scripts.
2016-01-10 21:41:56 +00:00
Martyn Inglis
af713b1583 Removed flask config property lookup. 2016-01-10 21:38:53 +00:00
Martyn Inglis
2c2d236e85 Incorporate credstash in production wsgi scripts. 2016-01-10 21:33:04 +00:00
minglis
3579a4ea94 Merge pull request #52 from alphagov/change-aws-keys
Changed keys used for deployment to a specific user with just these p…
2016-01-08 16:10:56 +00:00
Martyn Inglis
2666c967e3 Changed keys used for deployment to a specific user with just these permissions. 2016-01-08 16:07:15 +00:00
Chris Hill-Scott
a289335661 Merge pull request #49 from alphagov/error-pages
Error pages
2016-01-08 15:13:44 +00:00
Adam Shimali
1d038c1021 Better page title 2016-01-08 09:44:00 +00:00
Chris Hill-Scott
750c23e805 Merge pull request #48 from alphagov/dont_deploy_assets_II
Delete from current directory before deploying
2016-01-07 17:36:58 +00:00
Martyn Inglis
35fe1ae5a3 Live was set to debug mode 2016-01-07 16:24:10 +00:00
Martyn Inglis
cd1af56548 Fix python3/2 issues 2016-01-07 16:13:25 +00:00
Martyn Inglis
5cf3259dbf Fix python3/2 issues 2016-01-07 16:12:34 +00:00
Adam Shimali
dfbcfa9d49 Removed redundant return of None 2016-01-07 16:12:29 +00:00
Rebecca Law
548d086cbf Merge pull request #47 from alphagov/integrate-logging
Integrated logging from the utils repo
2016-01-07 15:58:05 +00:00
Adam Shimali
479ecbd699 pep8 suggested name change 2016-01-07 15:55:55 +00:00
Adam Shimali
d64e3b81fb Add basic error pages 2016-01-07 15:54:05 +00:00
Martyn Inglis
684230370f Tests run in debug mode 2016-01-07 15:52:56 +00:00
Chris Hill-Scott
80f214e0fa Delete from current directory before deploying
Does what https://github.com/alphagov/notifications-admin/pull/45 intended to do
2016-01-07 15:52:49 +00:00
Martyn Inglis
55534522e0 updated config with logging properties 2016-01-07 15:42:16 +00:00
Rebecca Law
afd03ea5bf Merge pull request #46 from alphagov/add-useful-headers
Add some useful owasp suggested headers
2016-01-07 15:39:51 +00:00
Martyn Inglis
ef8964284c Integrated logging from the utils repo 2016-01-07 15:39:36 +00:00
Rebecca Law
cce3c91c4a Merge pull request #44 from alphagov/provide_logout_link
Provide logout link
2016-01-07 15:39:25 +00:00
Adam Shimali
4345eea9f9 Revert addition to ignore after learning of a better way 2016-01-07 15:32:17 +00:00
Adam Shimali
78b8aed96b Add some useful owasp suggested headers 2016-01-07 13:58:38 +00:00
Nicholas Staples
7001d8261d Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised. 2016-01-07 12:43:10 +00:00
Chris Hill-Scott
30a5b771e2 Merge pull request #45 from alphagov/dont_deploy_assets
Don’t package raw front end assets for deployment
2016-01-07 12:25:13 +00:00
Chris Hill-Scott
f350f070b3 Don’t package raw front end assets for deployment
None of these files are used by the app when it’s running them.

Having them in the deployed blob only makes the deploy slower and 
the logs massive.
2016-01-07 11:46:15 +00:00
Chris Hill-Scott
1c99a88588 Merge pull request #43 from alphagov/fix-missing-jquery
Fix missing jQuery
2016-01-07 11:06:28 +00:00
Nicholas Staples
10c2978f85 Merge with master and test fix. 2016-01-06 17:17:02 +00:00
Nicholas Staples
0a4ea6ca2e Merge branch 'master' into provide_logout_link 2016-01-06 17:06:04 +00:00
NIcholas Staples
c7f130e503 Merge pull request #40 from alphagov/form_views_refactor
Form views refactor
2016-01-06 17:03:36 +00:00
Nicholas Staples
52df795743 Review fix. 2016-01-06 17:00:01 +00:00
Nicholas Staples
79c15ec9cf Code checks and all tests passing. 2016-01-06 16:51:35 +00:00
Nicholas Staples
5905229714 Logout functionality and test added. 2016-01-06 16:40:38 +00:00
Chris Hill-Scott
5d44a29c05 Fix missing jQuery
Somewhere in the many rebases the bits of code that add jQuery to the production
Javascript got lost.

This caused Javascript to fail on all pages.

This commit re-adds that missing code.
2016-01-06 14:50:02 +00:00
Martyn Inglis
03d81e5b47 Unicoded the £ sign and the ' needed to render the job page. 2016-01-06 13:22:15 +00:00
Martyn Inglis
416fa30929 Make the £ string a unicode string 2016-01-06 12:57:09 +00:00
Nicholas Staples
34bf03bae2 Readded git submodules. 2016-01-06 12:36:04 +00:00
Nicholas Staples
546b0b68b2 Merge branch 'master' into form_views_refactor 2016-01-06 11:46:58 +00:00
Martyn Inglis
260e1bad85 Removed build to heroku 2016-01-06 11:44:13 +00:00
Nicholas Staples
6fc39d1814 Add in macro import to our template, not govuk_template 2016-01-06 11:37:59 +00:00
Martyn Inglis
f92a46f419 updated readme 2016-01-06 11:37:37 +00:00
Rebecca Law
43a423b027 Update README.md
Added instructions to install n for node version management
2016-01-06 11:14:04 +00:00