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,238 Commits 54 Branches 0 Tags
ee4bd832fa3a827a8e845870f6f353285bc4e7dd
Commit Graph

1238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Price
ee4bd832fa Merge branch 'login' into training 2016-01-04 23:58:01 +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
8c231b931d Deleted left over incorrect .idea/ files. 2015-12-23 01:07:36 +00:00
Tom Price
c5970d2542 A first view that shows a user their current training status. 2015-12-23 01:06:18 +00:00
Tom Price
1922992633 Merge branch 'master' into training 2015-12-22 23:08:02 +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
ec4e033745 Merge branch 'master' into training 
# Conflicts:
#	.idea/dataSources.ids
#	db.sqlite3
 2015-11-10 12:18:53 +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
Tom Price
9379050e15 Add basic detail view for training record. 
Only committing because I have other things to do
 2015-10-28 17:41:02 +00:00
Tom Price
4689775a5f Several changes to models 
Add __str__ methods with unicode compatibility.

Make trainer fields optional as they should be.
Include these migrations and apply to DB.

Install some test data in the DB.
 2015-10-22 13:54:26 +01:00
Tom Price
32aabe14c7 Add training models to admin interface 2015-10-22 13:40:42 +01:00
Tom Price
697a5977c8 Add the unique together constraint to TrainingRecord model and actually commit the migration this time. 2015-10-22 00:19:05 +01:00
Tom Price
80ba59c3ba Fix models and create migration 2015-10-21 17:51:59 +01:00
Tom Price
c60e3fb9fe Add training app to installed apps 2015-10-21 17:03:46 +01:00
Tom Price
9beb7c1612 Update to allow pycharm to access the local postgres db 2015-10-21 17:00:03 +01:00
Tom Price
227b63e689 Add a sensible data structure. 
This is sensible to the current structure but there are a few changes. These were done to maintain the same functionality, but to reduce the number of DB rows used.
 2015-10-21 16:59:17 +01:00
Tom Price
fa231887d2 Add local postgres database for training to settings 2015-10-21 16:08:17 +01:00
Tom Price
37e5549736 Convert the export scripts from generic SQL to usable postgres including relationships 2015-10-21 15:57:47 +01:00
Tom Price
adbcd0733d Add initial data exported from access 2015-10-21 13:52:33 +01:00
Tom Price
0b35965fa1 Start the conversion of the training database as a priority. 
Also includes a script to export access to SQL
 2015-10-21 13:32:25 +01: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
Tom Price
93b2d37727 Manually undo 28f5158 and move the session wide implicitly_wait to setUp methods. 2015-09-09 16:56:45 +01:00
Tom Price
6d306dc224 Manually undo 28f5158 and move the session wide implicitly_wait to setUp methods. 2015-09-09 16:56:45 +01:00