466 Commits

Author	SHA1	Message	Date
David Taylor	adf9b8ba75	Merge branch 'admin-users'	2015-10-16 11:44:56 +01:00
Tom Price	0a3a35bf1b	Setup useradminform correctly for profiles enabling admins to change passwords.	2015-10-15 13:38:24 +01:00
David Taylor	67dfc4bcab	Fixed changing between rig/non-rig	2015-10-11 11:39:49 +01:00
David Taylor	0b5936be90	Added test for rig/non-rig changing	2015-10-11 11:39:33 +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	0402dd44b2	Add a small delay to waiting for animations to cope with async threads sometimes misbehaving.	2015-09-09 13:09:13 +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
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	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
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	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
David Taylor	160c43f927	Merge branch 'ui-changes'	2015-07-21 00:19:32 +01:00
David Taylor	a7493d46b5	Updated tests to reflect model changes	2015-07-21 00:17:56 +01:00
David Taylor	41ed0c96a2	Merge branch 'validation'	2015-07-20 22:53:44 +01:00
David Taylor	f08d7ed430	Added functional test for date validation	2015-07-20 22:52:08 +01:00
David Taylor	163c77880b	Merge branch 'vat-rate'	2015-07-20 22:20:14 +01:00
David Taylor	c67eab3479	Escape HTML provided in form - issue #148	2015-07-20 22:02:08 +01:00
David Taylor	6b5693c10a	Upgraded modal.js bootstrap plugin. Fixes issue #147	2015-07-20 21:36:40 +01:00
David Taylor	c4eb855620	Removed id numbers from page titles for person, venue & organisation detail views	2015-07-19 16:25:41 +01:00
David Taylor	5641a998f3	Removed unnecessary variable & updated test	2015-07-19 16:14:40 +01:00
David Taylor	278864c7ea	Added ical tests, and upgraded selenium	2015-06-30 17:11:50 +01:00
David Taylor	8b5d8e6056	Only put params in URL if not default values	2015-06-30 15:05:35 +01:00
David Taylor	507823a26a	Added options to ical interface - issue #80	2015-06-30 14:31:28 +01:00
David Taylor	72bf28da53	Removed special characters from paperwork filenames - issue #103	2015-06-29 23:27:10 +01:00
David Taylor	6862bb5721	Added start/end date validation for events	2015-06-29 22:16:50 +01:00
David Taylor	3634c7c1e4	Streamlined ical logic, and fixed #75, again	2015-06-29 21:19:18 +01:00
David Taylor	8450c36971	Fixed some #timezoneIssues	2015-06-29 21:07:10 +01:00
David Taylor	90ed1c9c1d	Added additional selectors to events_in_bounds	2015-06-29 20:28:09 +01:00
David Taylor	68e624f460	Streamlined web-calendar logic, also fixed issue #94	2015-06-29 20:25:46 +01:00
David Taylor	c27960456e	Merge branch 'hotfixes' into web-calendar	2015-06-29 19:40:01 +01:00
David Taylor	6b40123f63	Added earliest_time property to event	2015-06-29 19:39:24 +01:00
David Taylor	3c21355375	Rewrote web calendar UI to have bootstrap interface. Also has go-to-date function - issue #109	2015-06-29 17:38:47 +01:00
David Taylor	d3c6dab29b	Improved how events are selected for display on web-calendar	2015-06-29 14:42:53 +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