1319 Commits

Author SHA1 Message Date
Tom Price
2324b82767 Add organisation, venue, start/end date/time 2015-06-02 00:48:00 +01:00
Tom Price
bd6d254557 Fix PEP8 fails 2015-06-02 00:15:26 +01:00
Tom Price
fe06db5e37 Fix PEP8 fails 2015-06-02 00:15:26 +01:00
Tom Price
d8c2bd9260 Fix OS X fails 2015-06-02 00:13:01 +01:00
Tom Price
7df44755f4 Fix OS X fails 2015-06-02 00:13:01 +01:00
Tom Price
faa678cbc0 Include editing a person when creating them. 2015-06-01 01:47:18 +01:00
Tom Price
5433cfe51b Include editing a person when creating them. 2015-06-01 01:47:18 +01:00
Tom Price
07ca052b28 Add another person and flick between them a couple of times. 2015-06-01 01:31:56 +01:00
Tom Price
8696321c61 Add another person and flick between them a couple of times. 2015-06-01 01:31:56 +01:00
Tom Price
000a7adfa2 Add script adding a person to test rig 2015-06-01 01:13:14 +01:00
Tom Price
14559f488b Add script adding a person to test rig 2015-06-01 01:13:14 +01:00
Tom Price
812fdbc3f1 Complete rigboard test.
Add basic story for RigCreate
Add start of RigCreate
2015-06-01 00:38:39 +01:00
Tom Price
64462778d5 Complete rigboard test.
Add basic story for RigCreate
Add start of RigCreate
2015-06-01 00:38:39 +01:00
Tom Price
4c2a181a33 Add event logic 2015-06-01 00:03:59 +01:00
Tom Price
c641a6649a Add event logic 2015-06-01 00:03:59 +01:00
Tom Price
b5910fb314 Workaround for captcha being hidden.
Updated to a few new changes
2015-05-31 23:43:11 +01:00
Tom Price
e3a4244674 Workaround for captcha being hidden.
Updated to a few new changes
2015-05-31 23:43:11 +01:00
Tom Price
5fae10294b Merge branch 'hotfixes' into testing 2015-05-31 23:30:35 +01:00
Tom Price
463f421fd2 Merge branch 'hotfixes' into testing 2015-05-31 23:30:35 +01:00
Tom Price
7aa6c05f96 Add missing username field *facepalms* 2015-05-31 23:30:09 +01:00
Tom Price
5ea9ba20ab Add missing username field *facepalms* 2015-05-31 23:30:09 +01:00
Tom Price
ff304ef84e Add logic needed for captcha checking 2015-05-31 23:24:28 +01:00
Tom Price
576f054ab1 Add logic needed for captcha checking 2015-05-31 23:24:28 +01:00
Tom Price
9c06f9f9f9 Remove uneeded linebreaks to make it easier to trace what is going on. 2015-05-31 23:04:59 +01:00
Tom Price
b92b1bdf78 Remove uneeded linebreaks to make it easier to trace what is going on. 2015-05-31 23:04:59 +01:00
Tom Price
ce0ac7f44b Add missing dry hire 11.
Suggest this logic gets looked at. Isn't broken, but not nessecarily correct.
2015-05-31 23:04:29 +01:00
Tom Price
f90191a53e Add missing dry hire 11.
Suggest this logic gets looked at. Isn't broken, but not nessecarily correct.
2015-05-31 23:04:29 +01:00
Tom Price
ec424f2db3 Fix for incorrect logic in current dry hires
Non booked dryhires never show up in the past even if not checked in.
2015-05-31 23:01:52 +01:00
Tom Price
37fe98b801 Fix for incorrect logic in current dry hires
Non booked dryhires never show up in the past even if not checked in.
2015-05-31 23:01:52 +01:00
Tom Price
e2b352557c Change the way current events are tested 2015-05-31 22:57:17 +01:00
Tom Price
381f646f8e Change the way current events are tested 2015-05-31 22:57:17 +01:00
Tom Price
f8e17da645 Merge master into testing 2015-05-31 22:37:20 +01:00
Tom Price
4d93e05257 Merge master into testing 2015-05-31 22:37:20 +01:00
Tom Price
a8331261f0 Merged in hotfixes (pull request #42)
Small UI fixes
2015-05-31 16:35:06 +01:00
Tom Price
6e62f3da48 Merged in hotfixes (pull request #42)
Small UI fixes
2015-05-31 16:35:06 +01:00
Tom Price
0bc97e1705 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes 2015-05-31 16:31:57 +01:00
Tom Price
64e2402ede Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes 2015-05-31 16:31:57 +01:00
Tom Price
6bfcbeb8aa Fix for #140 2015-05-31 16:31:38 +01:00
Tom Price
ec0e9652d5 Fix for #140 2015-05-31 16:31:38 +01:00
David Taylor
f42628d23f Fixed too many save buttons #99 2015-05-29 17:00:59 +01:00
David Taylor
1a24897411 Fixed too many save buttons #99 2015-05-29 17:00:59 +01:00
Tom Price
2da8980be4 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields 2015-05-29 15:59:08 +01:00
Tom Price
82ea08ad51 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields 2015-05-29 15:59:08 +01:00
Tom Price
0f2733c2f1 Merge branch 'hotfixes'
Rapid fix for incorrect addition
2015-05-29 15:48:29 +01:00
Tom Price
fea986dc91 Merge branch 'hotfixes'
Rapid fix for incorrect addition
2015-05-29 15:48:29 +01:00
Tom Price
3dc82e2de7 Add missing explicit fields definition django 1.8 realted 2015-05-29 15:45:14 +01:00
Tom Price
8345ab3228 Add missing explicit fields definition django 1.8 realted 2015-05-29 15:45:14 +01:00
Tom Price
bc14c0e33e Fix for changes to sum function 2015-05-29 15:42:57 +01:00
Tom Price
2899c684ac Fix for changes to sum function 2015-05-29 15:42:57 +01:00
Tom Price
8ed299f23f Fix for events without an MIC causing 500 errors for people with permission to view profiles. 2015-05-29 15:20:29 +01:00