arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity
1,557 Commits 54 Branches 0 Tags
ce4e0f5630b08c6bde0001a6b08905a6263a560a
Commit Graph

84 Commits

Author SHA1 Message Date
David Taylor
f9389e3996 PEP8 all the things 2017-09-22 14:57:14 +01:00
David Taylor
3035320e82 Run through 2-to-3 converter. This is not in a working state 2017-09-04 23:19:22 +01:00
David Taylor
36d258253f Fix issues caused by dependency upgrades 2017-05-12 21:32:17 +01:00
David Taylor
f8aaf9f36e Merge branch 'master' into feature/online-auth 
# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
 2017-05-12 20:53:00 +01:00
David Taylor
d916c1ca19 Update all the things, and fix some upgrade issues 2017-05-10 20:05:36 +01:00
David Taylor
9b1cc965c7 Update to Django 1.10 2017-05-10 18:41:17 +01:00
David Taylor
83028418fe Fix deprecation warnings for django 1.10 2017-05-10 18:30:17 +01:00
David Taylor
7ac9eef7a2 Merge master into python-deps 
# Conflicts:
#	PyRIGS/settings.py
#	RIGS/admin.py
#	RIGS/models.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
#	wercker.yml
 2017-05-10 17:32:21 +01:00
David Taylor
286e4314f5 Require users to have nottinghamtec.co.uk address before allowing them to send messages to clients 2017-05-10 15:39:13 +01:00
Tom Price
97b11eabbd Add test for sending emails. 
Add backup email if there isn't an MIC
 2017-04-10 19:28:35 +01:00
David Taylor
0e72c3f896 Made pretty, and made embedding accessible to non-keyholders 2016-10-08 21:38:12 +01:00
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
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
4b94ea7ef2 Made login redirect JS for event detail 2016-10-06 12:02:44 +01:00
davidtaylorhq
fc6db5bff2 Heroku Staging Setup (#250) 
Heroku Staging Setup

Includes data generation
 2016-07-13 23:19:31 +01:00
David Taylor
eaf5c9687e Fixed typo, closes #174 2016-05-29 20:21:23 +01:00
David Taylor
aa79f3628e Only redirect to HTTPS in production 2016-05-28 15:27:38 +01:00
David Taylor
000351d884 Redirect all requests to https 2016-05-28 15:20:15 +01:00
Tom Price
463c4d147c Update settings for django10 support 
Allow env.EMAIL_PORT to be None without error

Change template context preprocessor in favour of the new syntax.
 2016-03-31 15:14:54 +01:00
Tom Price
d43e4b2465 Update settings and urls to fix new deprecations 2016-03-31 12:33:46 +01:00
Tom Price
cd2aed00d7 Update login URL in settings so redirects work correctly. 2016-03-31 12:09:04 +01:00
Tom Price
96ea649304 Remove auto calculation of git version as this doesn't work on heroku. 2015-11-10 11:11:12 +00:00
Tom Price
2e1ab96186 Add Sentry logging 2015-11-10 11:06:52 +00:00
Tom Price
9d39e2cdf2 Change sensitive variables to be fetched from the environment 2015-11-05 13:40:31 +00:00
Tom Price
ba66a418d0 Change to using manifest static files as a cachebuster. 
This was far too easy, and will be dealt with automatically on each deployment.
 2015-05-29 02:02:23 +01:00
Tom Price
894234f167 Remove MySQL import 
This was legacy and isn't needed any more.
 2015-05-28 21:44:59 +01:00
David Taylor
6754064ebc Scrap that - bad idea! 2015-05-28 20:00:46 +01:00
David Taylor
e8c2589790 Explicitly imported django.contrib.sites 2015-05-28 19:48:20 +01:00
David Taylor
16b2b71979 Remove legacy database 2015-05-28 19:32:05 +01:00
Tom Price
d92462324b Merge branch 'master' into revision-view 2015-05-25 22:13:33 +01:00
Tom Price
aa648412a1 Merged in timezone-fixes (pull request #40) 
Timezone Fixes
 2015-05-25 22:06:20 +01:00
David Taylor
82041d413c Merge branch 'master' into revision-view 2015-05-24 12:24:21 +01:00
David Taylor
7e8f8687d6 Removed now un-necessary date format stuff (from revisions stuff) 2015-05-23 17:03:58 +01:00
David Taylor
c5e1bc93cb Set default date formats 2015-05-23 16:57:45 +01:00
David Taylor
77139a8821 More UI improvements 2015-05-23 03:20:27 +01:00
David Taylor
2a93d48ca1 More refactoring & improvements 2015-05-23 02:23:31 +01:00
Tom Price
49db64ee93 Change adding extra user data to on a signal instead. 
Not sure if this data is clean or not.
 2015-05-21 21:45:01 +01:00
Tom Price
6e9e54c83c Working saving of registration data, need this doesn't create the required registration profile though. 
Might need to find a way to invoke automatically then just append the new user data to the end.
 2015-05-21 16:04:12 +01:00
Tom Price
4e8cfb91d1 Re-enable timezones and add iCal converstion to UTC. 
This should work on Google Cal but won't be able to test till in production.
 2015-05-18 23:41:17 +01:00
Tom Price
f4ea410900 Merge branch 'master' into timezone-fixes 2015-05-18 20:22:56 +01:00
Tom Price
e3e0f4855a Fix incorrect location of .slugignore. 2015-05-18 18:01:10 +01:00
Tom Price
59fa1b2908 Merge branch 'master' into timezone-fixes 2015-05-18 14:22:15 +01:00
Tom Price
4c09024a7c Move to using enviromental variables for important settings. 
This makes it more difficult to fuck up.
 2015-04-30 22:52:30 +01:00
David Taylor
6a3fac887c Change timezone and turn off timezone support 2015-04-28 01:05:40 +01:00
Tom Price
100e39be65 Fix with the correct up-to-date terms URL 2015-04-26 18:19:27 +00:00
Nathan Penney
a56427d355 Merged in recaptcha (pull request #28) 
Add recaptcha to all public facing pages.
 2015-04-26 19:12:28 +01:00
Tom Price
cade0e0872 TESTING FAIL! 2015-04-25 23:33:09 +01:00