571 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Taylor	f352d71ca3	Merge branch 'paperwork'	2015-08-17 23:45:39 +01:00
David Taylor	22879898e4	Added paperwork generation date, user & versioning	2015-07-29 22:06:44 +01:00
Tom Price	dd9dea840a	Add vagrant related things to slugignore	2015-07-29 19:07:06 +01:00
Tom Price	bac7afead7	Merged in web-calendar (pull request #48) ... Web calendar	2015-07-29 19:01:04 +01:00
David Taylor	6c54813280	Fixed time-travelling in the functional tests	2015-07-29 18:55:43 +01:00
Tom Price	9c7f6c0942	Merge branch 'master' into web-calendar	2015-07-29 18:39:36 +01:00
Tom Price	8b3b896ffe	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	8a4b3c1a31	Merged in html-escape (pull request #50) ... Escape HTML provided in form - issue #148	2015-07-29 18:31:11 +01:00
Tom Price	b75161af2a	Make sure foreman always provisions on up.	2015-07-29 18:12:57 +01:00
Tom Price	dd92f5f2a1	Merged in hotfixes (pull request #47) ... Hotfixes	2015-07-29 18:05:02 +01:00
Tom Price	317f9f27d3	Revert changes in 1fdeed7	2015-07-29 17:59:01 +01:00
Tom Price	2795c42fad	Merge branch 'vagrant' into hotfixes	2015-07-23 21:08:44 +01:00
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	9bc932807f	Escape HTML provided in form - issue #148	2015-07-20 22:02:08 +01:00
David Taylor	3029ac5dc2	Upgraded modal.js bootstrap plugin. Fixes issue #147	2015-07-20 21:36:40 +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	b74f1fc34e	Added ical tests, and upgraded selenium	2015-06-30 17:11:50 +01:00
David Taylor	25fd603612	Only put params in URL if not default values	2015-06-30 15:05:35 +01:00
David Taylor	36c3a5da35	Added options to ical interface - issue #80	2015-06-30 14:31:28 +01:00
David Taylor	e7c39c2b81	Removed special characters from paperwork filenames - issue #103	2015-06-29 23:27:10 +01:00
David Taylor	d9704b9407	Added start/end date validation for events	2015-06-29 22:16:50 +01:00
David Taylor	e935e3bf8c	Streamlined ical logic, and fixed #75, again	2015-06-29 21:19:18 +01:00
David Taylor	f190b9192b	Fixed some #timezoneIssues	2015-06-29 21:07:10 +01:00
David Taylor	2d1369dfe9	Added additional selectors to events_in_bounds	2015-06-29 20:28:09 +01:00
David Taylor	5ef5f3517c	Streamlined web-calendar logic, also fixed issue #94	2015-06-29 20:25:46 +01:00
David Taylor	2daca351d6	Merge branch 'hotfixes' into web-calendar	2015-06-29 19:40:01 +01:00
David Taylor	6641867803	Added earliest_time property to event	2015-06-29 19:39:24 +01:00
David Taylor	f78f20e4ab	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	0b63bbcc5b	Improved how events are selected for display on web-calendar	2015-06-29 14:42:53 +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	ab516c2f90	Fixed TZ issue #146 ... (MomentJS wasn't being supplied with timezone info)	2015-06-29 12:09:31 +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	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