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
Tom Price
0c11da4665
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
d0fe102dcd
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
93b2d37727
Manually undo 28f5158 and move the session wide implicitly_wait to setUp methods.
2015-09-09 16:56:45 +01:00
Tom Price
28f51589d3
Add implicit_delay's everywhere they MIGHT be needed (where a request is made)
2015-09-09 16:33:29 +01:00
Tom Price
d372b09778
Run collect static to prevent the manifest being out of date, resulting in tests failing
2015-09-09 16:13:54 +01:00
Tom Price
60d4d7d1ca
Tidy up repo by adding wercker files to .gitignore and removing .idea/ files from the repo (despite them being in .gitignore already)
2015-09-09 15:33:30 +01:00
Tom Price
cb9611c164
Revert to using sqlite as tests just fail instantly with postgres due to incorrect number formatting when >= 10
2015-09-09 15:30:12 +01:00
Tom Price
0402dd44b2
Add a small delay to waiting for animations to cope with async threads sometimes misbehaving.
2015-09-09 13:09:13 +01:00
Tom Price
79438fd13b
Update wrecker.yml to run all the tests
2015-09-09 00:44:43 +01:00
Tom Price
620df4a721
Add wrecker config
2015-09-08 18:39:17 +01:00
David Taylor
34e4273647
Merge branch 'duplicate-event'
2015-09-04 21:47:15 +01:00
David Taylor
d2464012ad
Added comments to EventItem creation
2015-08-28 00:12:29 +01:00
David Taylor
0eb820000c
Merge branch 'master' into duplicate-event
2015-08-27 23:59:50 +01:00
David Taylor
135f2a176a
Merge branch 'registration-hotfix'
2015-08-27 23:43:34 +01:00
Tom Price
8e478dd7a9
Remove implicit fields as these are not needed in the form definition.
...
Passes all tests.
2015-08-27 22:46:50 +01:00
David Taylor
91866b3a57
Removed unnecessary username field definition
2015-08-27 01:48:10 +01:00
David Taylor
c7585f6bbb
Added missing email field to registration form
2015-08-27 01:36:44 +01:00
David Taylor
0cf62f983f
Added data save check to registration (currently fails)
2015-08-27 01:35:27 +01:00
David Taylor
04d389dce5
Merge branch 'calendars'
2015-08-17 23:57:08 +01:00
David Taylor
6c5e520a9f
Merge branch 'tooltips'
2015-08-17 23:47:14 +01:00
David Taylor
258b484d7f
Merge branch 'paperwork'
2015-08-17 23:45:39 +01:00
David Taylor
63cb5022df
Added helpful tooltips for each input field in event_form
2015-08-16 23:24:02 +01:00
David Taylor
c36a90ba37
Added a day to end dates, if there is no end time (ical and fullcalendar.js use non-inclusive end dates). Issue #154
2015-08-16 21:06:32 +01:00
David Taylor
26697759d0
Added tests for EventDuplicate
2015-08-16 20:04:59 +01:00
David Taylor
26d671ea0d
EventDuplicate now presents an edit view before saving
2015-08-16 19:31:35 +01:00
David Taylor
6944d98c4e
Added paperwork generation date, user & versioning
2015-07-29 22:06:44 +01:00
Tom Price
72ecec8860
Add vagrant related things to slugignore
2015-07-29 19:07:06 +01:00
Tom Price
d4b465259d
Merged in web-calendar (pull request #48 )
...
Web calendar
2015-07-29 19:01:04 +01:00
David Taylor
e8aeb6aed7
Fixed time-travelling in the functional tests
2015-07-29 18:55:43 +01:00
Tom Price
9bbdb9fbe0
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +01:00
Tom Price
4d86125c70
Merged in modal-scroll (pull request #49 )
...
Upgraded modal.js bootstrap plugin. Fixes issue #147
2015-07-29 18:38:06 +01:00
Tom Price
8f688a6a6b
Merged in html-escape (pull request #50 )
...
Escape HTML provided in form - issue #148
2015-07-29 18:31:11 +01:00
Tom Price
11e7cb3f42
Make sure foreman always provisions on up.
2015-07-29 18:12:57 +01:00
Tom Price
0948a0d30d
Merged in hotfixes (pull request #47 )
...
Hotfixes
2015-07-29 18:05:02 +01:00
Tom Price
f619f83c09
Revert changes in 1fdeed7
2015-07-29 17:59:01 +01:00
Tom Price
5bb7283f2d
Merge branch 'vagrant' into hotfixes
2015-07-23 21:08:44 +01:00
Tom Price
0890a1ec01
Merge branch 'master' into vagrant
2015-07-21 21:26:14 +01:00
