David Taylor
163c77880b
Merge branch 'vat-rate'
2015-07-20 22:20:14 +01:00
David Taylor
6f214028fd
Merge branch 'paperwork'
2015-07-20 22:10:26 +01:00
David Taylor
5641a998f3
Removed unnecessary variable & updated test
2015-07-19 16:14:40 +01:00
David Taylor
cc22392ef7
Added estimated VAT, as per issue #71
2015-06-29 13:51:37 +01:00
David Taylor
16e088c155
Removed maxheight of event description
...
(Stops text getting squished when the description is long)
2015-06-29 13:10:55 +01:00
David Taylor
be698d7899
Added bottom swoosh & swoosh to subsequent pages
2015-06-29 13:09:35 +01:00
David Taylor
ddb6bade0e
Changed Terms of hire wording - Issue #111
2015-06-29 12:57:12 +01:00
David Taylor
f5879e6f19
Merge branch 'master' into paperwork
2015-06-29 12:56:25 +01:00
David Taylor
5b3bc591b8
Merge branch 'testing'
2015-06-28 19:58:55 +01:00
David Taylor
8ee76a9a75
Fixed testEventDetail
2015-06-28 19:02:18 +01:00
David Taylor
65a8b43dbf
Fix testRigCreate (wait for animations)
2015-06-28 18:44:32 +01:00
David Taylor
e96b36e533
Fixed registration test
2015-06-28 16:40:22 +01:00
Tom Price
6b2df1b9f4
TestEventDetail does not work.
...
Changd name to prevent it from running a full suite of tests.
The issue appears to be with trying to access events without a
reversion history for that sepecific event.
2015-06-04 07:04:01 +01:00
Tom Price
8666dcc9a4
Start work on an EventDetail test
2015-06-04 06:42:01 +01:00
Tom Price
abdbad14d6
Add using the pk of the event rather than a static for atomicity when running other tests.
2015-06-04 06:30:47 +01:00
Tom Price
6180fdf7a4
Finish testing the remaining parts of adding an event
2015-06-04 06:26:43 +01:00
Tom Price
1f6e624cd9
Add small value checks, saving and checking error is displayed correctly.
2015-06-04 06:00:11 +01:00
Tom Price
e132bb2b9d
Enable checking newly added item has worked
2015-06-04 05:40:41 +01:00
Tom Price
92795754b1
Enable adding an event item
2015-06-04 05:08:14 +01:00
Tom Price
85e827cd51
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
d8c2bd9260
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
07ca052b28
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
812fdbc3f1
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
b5910fb314
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
7aa6c05f96
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
9c06f9f9f9
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
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
e2b352557c
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
a8331261f0
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
6bfcbeb8aa
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
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
0f2733c2f1
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
bc14c0e33e
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
Tom Price
187ba9113e
Merge branch 'hotfixes'
2015-05-29 02:06:58 +01:00
Tom Price
e8e2178e49
Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes
2015-05-29 02:02:33 +01:00
Tom Price
713197b986
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
David Taylor
c6d15c5fca
Fixed impending static files fail
2015-05-29 02:02:11 +01:00
Tom Price
4846d858aa
Prevent modal inception
2015-05-29 01:46:12 +01:00