David Taylor
d5da0e90d8
Fixed date formatting issue #141
2015-06-29 00:44:34 +01:00
David Taylor
51b28662e5
Paperwork emergency contacts "or" to "and"
2015-06-28 23:29:06 +01:00
David Taylor
346f3a9194
Added dry hire indicator to event_detail - issue #144
2015-06-28 23:26:02 +01:00
David Taylor
d497e6729f
Fixed API permissions, and removed unnecessary data from the events api (it now only gives information available to non-keyholders - the rest wasn't used anyway).
...
This now means the web-calendar view works for non-keyholders
2015-06-28 22:54:58 +01:00
David Taylor
338694248e
Fix logout/login infinite loop
...
(Since there are now no pages accessible without login, there is no need for the login link to have the "next" parameter)
2015-06-28 22:35:52 +01:00
David Taylor
452b56c54b
Fixed ordering of event archive
2015-06-28 20:46:15 +01:00
David Taylor
212b09d202
Merge branch 'master' into hotfixes
2015-06-28 20:37:27 +01:00
David Taylor
30f235be22
Merge branch 'testing'
2015-06-28 19:58:55 +01:00
David Taylor
ab54809776
Fixed testEventDetail
2015-06-28 19:02:18 +01:00
David Taylor
ebb22e687a
Fix testRigCreate (wait for animations)
2015-06-28 18:44:32 +01:00
David Taylor
cbaf72c435
Fixed registration test
2015-06-28 16:40:22 +01:00
Tom Price
18689db23c
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
987721a247
Start work on an EventDetail test
2015-06-04 06:42:01 +01:00
Tom Price
89bdb3937b
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
34aa607ccc
Finish testing the remaining parts of adding an event
2015-06-04 06:26:43 +01:00
Tom Price
10553bc367
Add small value checks, saving and checking error is displayed correctly.
2015-06-04 06:00:11 +01:00
Tom Price
204d92dda5
Enable checking newly added item has worked
2015-06-04 05:40:41 +01:00
Tom Price
493c290b25
Enable adding an event item
2015-06-04 05:08:14 +01:00
Tom Price
2324b82767
Add organisation, venue, start/end date/time
2015-06-02 00:48:00 +01:00
Tom Price
fe06db5e37
Fix PEP8 fails
2015-06-02 00:15:26 +01:00
Tom Price
7df44755f4
Fix OS X fails
2015-06-02 00:13:01 +01:00
Tom Price
5433cfe51b
Include editing a person when creating them.
2015-06-01 01:47:18 +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
14559f488b
Add script adding a person to test rig
2015-06-01 01:13:14 +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
c641a6649a
Add event logic
2015-06-01 00:03:59 +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
463f421fd2
Merge branch 'hotfixes' into testing
2015-05-31 23:30:35 +01:00
Tom Price
5ea9ba20ab
Add missing username field *facepalms*
2015-05-31 23:30:09 +01:00
Tom Price
576f054ab1
Add logic needed for captcha checking
2015-05-31 23:24:28 +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
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
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
381f646f8e
Change the way current events are tested
2015-05-31 22:57:17 +01:00
Tom Price
4d93e05257
Merge master into testing
2015-05-31 22:37:20 +01:00
Tom Price
6e62f3da48
Merged in hotfixes (pull request #42 )
...
Small UI fixes
2015-05-31 16:35:06 +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
ec0e9652d5
Fix for #140
2015-05-31 16:31:38 +01:00
David Taylor
1a24897411
Fixed too many save buttons #99
2015-05-29 17:00:59 +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
fea986dc91
Merge branch 'hotfixes'
...
Rapid fix for incorrect addition
2015-05-29 15:48:29 +01:00
Tom Price
8345ab3228
Add missing explicit fields definition django 1.8 realted
2015-05-29 15:45:14 +01:00
Tom Price
2899c684ac
Fix for changes to sum function
2015-05-29 15:42:57 +01:00
Tom Price
c867ce49ef
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
9fc5555a00
Merge branch 'hotfixes'
2015-05-29 02:06:58 +01:00
Tom Price
86b570e3e8
Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes
2015-05-29 02:02:33 +01:00
Tom Price
ba66a418d0
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
4b5d55c840
Fixed impending static files fail
2015-05-29 02:02:11 +01:00
Tom Price
9063a5d0f7
Prevent modal inception
2015-05-29 01:46:12 +01:00
Tom Price
e0f80c38fc
Add links to user page in events
2015-05-29 01:32:07 +01:00
