Commit Graph

1535 Commits

Author SHA1 Message Date
David Taylor
ac7e85c24a PEP8 and comments 2016-10-08 17:30:23 +01:00
David Taylor
73b8ce4add Revert "Added decorator for X-Frame header"
This reverts commit 8a838aa4bd.
2016-10-08 17:19:35 +01:00
David Taylor
511ce554b1 Revert "Try allow-from header (limited browser support)"
This reverts commit 3f4c362bfa.
2016-10-08 17:19:27 +01:00
David Taylor
536842971d Revert "Try just removing the header, this should work in all browsers"
This reverts commit 3e224a33a7.
2016-10-08 17:19:18 +01:00
David Taylor
3e224a33a7 Try just removing the header, this should work in all browsers 2016-10-08 17:14:29 +01:00
David Taylor
3f4c362bfa Try allow-from header (limited browser support) 2016-10-08 17:01:37 +01:00
David Taylor
8a838aa4bd Added decorator for X-Frame header 2016-10-07 02:51:08 +01:00
David Taylor
7e379b33db Fixed login autofocus and error messages 2016-10-07 02:24:24 +01:00
David Taylor
5e9f7e2c63 More prettying 2016-10-06 17:00:45 +01:00
David Taylor
3f752cd7b7 Made embed prettier 2016-10-06 16:48:19 +01:00
David Taylor
25a3ef3f0c Don't login in new window 2016-10-06 16:15:53 +01:00
David Taylor
1b28efb6af Allow the embedded login to be embedded (useful feature) 2016-10-06 16:10:51 +01:00
David Taylor
441a2be0b8 Added embedded login, and all iframe links open in new tab 2016-10-06 16:08:01 +01:00
David Taylor
1bdc4bd293 Fixed description = none in embed 2016-10-06 13:22:47 +01:00
David Taylor
f0bb4c5b02 Move exemption to urls.py (cleaner) 2016-10-06 13:13:09 +01:00
David Taylor
4660322964 Remove hardcoded URL 2016-10-06 13:04:33 +01:00
David Taylor
59efc2c485 Fixed JSON 2016-10-06 12:59:37 +01:00
David Taylor
69b0ff9fae Made embed page, with clickjacking protection turned off 2016-10-06 12:52:33 +01:00
David Taylor
4b94ea7ef2 Made login redirect JS for event detail 2016-10-06 12:02:44 +01:00
David Taylor
0244f5cfca Restored login security to events 2016-10-05 10:42:49 +01:00
David Taylor
17c7a3c524 Made embed tag use absolute URL 2016-10-05 10:39:50 +01:00
David Taylor
a02087bf2a Fixed fail 2016-10-04 21:11:43 +01:00
David Taylor
585f909d3f Escape JSON 2016-10-04 21:05:07 +01:00
David Taylor
eb10c8e21f Add meta to detail page 2016-10-03 23:13:25 +01:00
David Taylor
f7ea0cb834 Remove security from event detail (for testing in staging) 2016-10-03 23:09:57 +01:00
David Taylor
64f3842a13 Added iframe to embed 2016-10-03 23:02:19 +01:00
David Taylor
6370679b62 Initial proof of concept 2016-10-03 22:45:57 +01:00
David Taylor
e77728c52c Merge pull request #260 from nottinghamtec/subhire-form
Looks good, merging
2016-09-22 13:40:05 +01:00
Sam Osborne
92f4e26883 Added link to subhire form
Until such a point that subhire on RIGS actually happens, it's useful to have this link here.
2016-09-22 12:58:43 +01:00
davidtaylorhq
024f08562b Merge pull request #254 from nottinghamtec/hotfix/newrig-overflow
Fix for MIC field overflowing the bottom of the panel #218
2016-07-14 08:21:21 +01:00
Tom Price
b4246fe170 Fix for MIC field overflowing the bottom of the panel #218 2016-07-14 00:04:09 +01:00
davidtaylorhq
fc6db5bff2 Heroku Staging Setup (#250)
Heroku Staging Setup

Includes data generation
2016-07-13 23:19:31 +01:00
davidtaylorhq
c5d3e7c0f2 Merge pull request #252 from nottinghamtec/hotfix/register-emails
Fix special characters in registration email subject
2016-07-12 23:18:19 +01:00
Tom Price
10b57adb37 Merge branch 'master' into hotfix/register-emails 2016-07-11 23:35:49 +01:00
Tom Price
4f839d05f9 Fix issues with special characters in registration email subject.
Closes #251
2016-07-11 23:28:15 +01:00
Tom Price
84393e9e4a Modify user creation test to replicate special character issue in #251 2016-07-11 23:26:43 +01:00
Tom Price
b94cef92d2 Update selenium due to OS X based firefox issue 2016-07-11 23:26:12 +01:00
David Taylor
10c04be051 Merge branch 'feature/heroku-review'
(needs to be in master)
2016-07-11 20:17:21 +01:00
David Taylor
7ecd6212ac Initial commit of app.json (for heroku review apps) 2016-07-11 20:15:48 +01:00
Tom Price
11180e507c Merged branch develop into master 2016-07-11 13:11:37 +01:00
Tom Price
1c90ce5b41 Merged feature/invoiceDelete into develop 2016-07-11 13:08:47 +01:00
Tom Price
11dd9ad02f Add tmp directory to gitignore 2016-07-11 13:08:05 +01:00
Tom Price
27c0deaba3 Add codeclimit coverage reporting 2016-07-11 12:44:47 +01:00
Tom Price
4c09258566 Enable code climate 2016-07-11 12:40:39 +01:00
Tom Price
7d14429d84 Update status badges 2016-07-11 12:38:43 +01:00
Tom Price
190825f5ef Tidy up coverage to use a .coveragerc file instead of having it .travis.yml 2016-07-11 12:34:51 +01:00
Tom Price
021edfd39d Filter coverage down to just our code 2016-07-11 12:27:00 +01:00
Tom Price
3052f28329 Enable coveralls reporting 2016-07-11 12:15:17 +01:00
Tom Price
4cec20e357 Add collect static command 2016-07-11 12:07:19 +01:00
Tom Price
8a0cbe32bd Remove erroneous travis pip command.
I hate setting up travis
2016-07-11 12:03:21 +01:00