537 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	0e3fea8cd6	Merge branch 'master' into vagrant	2015-07-21 21:26:14 +01:00
Tom Price	fa63328c42	Enable vagrant env for development.	2015-07-21 21:24:58 +01:00
David Taylor	66c5e359d4	Merge branch 'ui-changes'	2015-07-21 00:19:32 +01:00
David Taylor	2302cb1417	Updated tests to reflect model changes	2015-07-21 00:17:56 +01:00
David Taylor	5de09342a4	Merge branch 'validation'	2015-07-20 22:53:44 +01:00
David Taylor	a22e10a4f2	Added functional test for date validation	2015-07-20 22:52:08 +01:00
David Taylor	987cd51911	Merge branch 'vat-rate'	2015-07-20 22:20:14 +01:00
David Taylor	3c82c72822	Merge branch 'paperwork'	2015-07-20 22:10:26 +01:00
David Taylor	796f4b29cb	Removed id numbers from page titles for person, venue & organisation detail views	2015-07-19 16:25:41 +01:00
David Taylor	0dd5a1d931	Removed unnecessary variable & updated test	2015-07-19 16:14:40 +01:00
David Taylor	d9704b9407	Added start/end date validation for events	2015-06-29 22:16:50 +01:00
David Taylor	6405e123ff	Added estimated VAT, as per issue #71	2015-06-29 13:51:37 +01:00
David Taylor	91f364dccb	Removed maxheight of event description ... (Stops text getting squished when the description is long)	2015-06-29 13:10:55 +01:00
David Taylor	167549e584	Added bottom swoosh & swoosh to subsequent pages	2015-06-29 13:09:35 +01:00
David Taylor	42bbf51390	Changed Terms of hire wording - Issue #111	2015-06-29 12:57:12 +01:00
David Taylor	b21492113b	Merge branch 'master' into paperwork	2015-06-29 12:56:25 +01:00
David Taylor	2ab27daaab	Rewrote venue detail UI, and added 3-phase to detail & forms	2015-06-29 02:52:39 +01:00
David Taylor	d3f7ab8fbb	Rewrote UI for person and organisation detail pages - now matches design of event_detail and is generally much prettier. Also happens to fix issue #6	2015-06-29 02:25:53 +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