arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity
1,240 Commits 54 Branches 0 Tags
1e81b718f671368a6d07725dab843b2ece6ee49e
Commit Graph

1240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Taylor
1e81b718f6 Merge branch 'deleting_duplicates' 2016-03-16 13:09:02 +00:00
David Taylor
551737b882 Merge branch 'master' into deleting_duplicates 2016-03-16 13:05:54 +00:00
David Taylor
77dd36d4b4 Merge branch 'web_calendar' 2016-03-16 12:55:26 +00:00
David Taylor
9bace9a6da Merge branch 'master' into web_calendar 2016-03-16 12:52:57 +00:00
David Taylor
c6b45da72c Made tests more reliable - wait for success page to load before checking item exists in database 2016-03-16 12:49:42 +00:00
David Taylor
0721d61bef Merge branch 'master' into web_calendar 2016-03-16 12:30:22 +00:00
David Taylor
ed552b402a Based on event with no MIC - closes #163 2016-03-10 11:56:09 +00:00
David Taylor
8279bec4bf Removed warning message at top - closes #203 2016-03-10 11:46:28 +00:00
David Taylor
67b2bc6d54 Applied migration to development database 2016-02-29 20:44:09 +00:00
David Taylor
e3adfecd17 Added database migration 2016-02-29 20:43:11 +00:00
David Taylor
1681ab8fee Allowed linking to specific views/dates on the calendar - closes #153 2016-02-29 20:35:53 +00:00
David Taylor
a77bc65d7b Changed delete condition to SET_NULL - closes #199 2016-02-29 20:12:41 +00:00
David Taylor
73517ed443 Revision history link on non-rigs - closes #186 2016-02-29 19:55:04 +00:00
David Taylor
f59e11ecc4 Updated VAT Registration Number - Closes #197 2016-02-29 19:37:59 +00:00
Tom Price
19f619b2d4 Merge pull request #194 from nottinghamtec/login-autofocus 
Made username field autofocus (using HTML5 Attribute). Fixes #193
 2016-02-12 16:46:10 +00:00
David Taylor
e0d03c2cc3 Made username field autofocus (using HTML5 Attribute). Fixes #193 2016-02-12 16:27:11 +00:00
Tom Price
69f7152dd6 Merge pull request #191 from samozzy/patch-1 
Update konami.js
 2016-02-01 17:11:20 +00:00
samozzy
581f28757a Update konami.js 
Disable Weirdness Factor 12 on devices without an 'escape' key.
 2016-02-01 17:10:06 +00:00
Tom Price
660a54d955 Merge pull request #177 from nottinghamtec/login 
Move captcha from login screen.

Close #176
 2016-01-20 13:45:26 +00:00
Tom Price
29126a558b Make the captcha Foxtrot Oscar from the functional tests 2016-01-04 23:38:17 +00:00
Tom Price
0a30a99e1f Absolish the captcha from the login page. 2016-01-04 23:37:11 +00:00
Tom Price
b7018d5c44 Refactor NoneType test to make use of the __str__ method thus including that method in the test as well. 2015-12-22 23:07:15 +00:00
Tom Price
48969ed95c Fix NoneType exception by only adding initials if they are set. 
Closes #171
 2015-12-22 23:03:30 +00:00
Tom Price
b933a5322f Add test to reproduce NoneType exception from #171 2015-12-22 23:01:30 +00:00
Tom Price
2743112f1b Reformat file to correct standard 2015-12-22 22:59:12 +00:00
Tom Price
aa76c6c775 Add missing raven js file. 2015-11-10 11:58:07 +00: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
b322335c09 Add missing deps 2015-11-10 11:08:39 +00:00
Tom Price
2e1ab96186 Add Sentry logging 2015-11-10 11:06:52 +00:00
Tom Price
887e932c64 Merge branch 'redacting' 
# Conflicts:
#	PyRIGS/settings.py
#	db.sqlite3
 2015-11-10 10:32:05 +00:00
Tom Price
9d39e2cdf2 Change sensitive variables to be fetched from the environment 2015-11-05 13:40:31 +00:00
Tom Price
643f5691a1 db.sqlite redacted and history rewritten. 
The new file is just an empty database with nothing in it.
 2015-10-28 20:57:29 +00:00
David Taylor
adf9b8ba75 Merge branch 'admin-users' 2015-10-16 11:44:56 +01:00
David Taylor
01b245ad6f Merge branch 'admin-users' 2015-10-16 11:44:56 +01:00
Tom Price
0a3a35bf1b Setup useradminform correctly for profiles enabling admins to change passwords. 2015-10-15 13:38:24 +01:00
Tom Price
9dad6bb773 Setup useradminform correctly for profiles enabling admins to change passwords. 2015-10-15 13:38:24 +01:00
David Taylor
6d18d6bc83 Merge branch 'rig_non_rig' 2015-10-11 12:02:55 +01:00
David Taylor
d1d389eeaf Merge branch 'rig_non_rig' 2015-10-11 12:02:55 +01:00
David Taylor
67dfc4bcab Fixed changing between rig/non-rig 2015-10-11 11:39:49 +01:00
David Taylor
932b4a6852 Fixed changing between rig/non-rig 2015-10-11 11:39:49 +01:00
David Taylor
0b5936be90 Added test for rig/non-rig changing 2015-10-11 11:39:33 +01:00
David Taylor
48b7e7cf18 Added test for rig/non-rig changing 2015-10-11 11:39:33 +01:00
Tom Price
0c11da4665 Add a careful reminder about booking rigs 2015-10-06 22:59:05 +01:00
Tom Price
ee361341c4 Add a careful reminder about booking rigs 2015-10-06 22:59:05 +01:00
Tom Price
2195f0a9e9 Add a license 2015-09-28 18:14:21 +01:00
Tom Price
a3f2f6587b Add a license 2015-09-28 18:14:21 +01:00
Tom Price
d0fe102dcd Refactor container ignores 2015-09-09 17:00:22 +01:00
Tom Price
d048f48740 Refactor container ignores 2015-09-09 17:00:22 +01:00
Tom Price
8fcacd7126 Update readme to have wercker status in it 2015-09-09 16:59:25 +01:00
Tom Price
4b6e05d11c Update readme to have wercker status in it 2015-09-09 16:59:25 +01:00