1668 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Taylor	135f2a176a	Merge branch 'registration-hotfix'	2015-08-27 23:43:34 +01:00
David Taylor	d3aa14bacc	Merge branch 'registration-hotfix'	2015-08-27 23:43:34 +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
Tom Price	1f14c53f78	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	5a2b15d91c	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	0436cbd8fb	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	23408ffc57	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	8517f4455a	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	31051990a3	Merge branch 'tooltips'	2015-08-17 23:47:14 +01:00
David Taylor	258b484d7f	Merge branch 'paperwork'	2015-08-17 23:45:39 +01:00
David Taylor	f352d71ca3	Merge branch 'paperwork'	2015-08-17 23:45:39 +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	cde8efa213	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	cff970b774	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	e8265faf5d	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	89f1edb100	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	22879898e4	Added paperwork generation date, user & versioning	2015-07-29 22:06:44 +01:00
Tom Price	72ecec8860	Add vagrant related things to slugignore	2015-07-29 19:07:06 +01:00
Tom Price	dd9dea840a	Add vagrant related things to slugignore	2015-07-29 19:07:06 +01:00
Tom Price	d4b465259d	Merged in web-calendar (pull request #48) ... Web calendar	2015-07-29 19:01:04 +01:00
Tom Price	bac7afead7	Merged in web-calendar (pull request #48) ... Web calendar	2015-07-29 19:01:04 +01:00
David Taylor	e8aeb6aed7	Fixed time-travelling in the functional tests	2015-07-29 18:55:43 +01:00
David Taylor	6c54813280	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	9c7f6c0942	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	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	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	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	11e7cb3f42	Make sure foreman always provisions on up.	2015-07-29 18:12:57 +01:00
Tom Price	b75161af2a	Make sure foreman always provisions on up.	2015-07-29 18:12:57 +01:00
Tom Price	0948a0d30d	Merged in hotfixes (pull request #47) ... Hotfixes	2015-07-29 18:05:02 +01:00
Tom Price	dd92f5f2a1	Merged in hotfixes (pull request #47) ... Hotfixes	2015-07-29 18:05:02 +01:00
Tom Price	f619f83c09	Revert changes in 1fdeed7	2015-07-29 17:59:01 +01:00
Tom Price	317f9f27d3	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
Tom Price	2795c42fad	Merge branch 'vagrant' into hotfixes	2015-07-23 21:08:44 +01:00
Tom Price	0890a1ec01	Merge branch 'master' into vagrant	2015-07-21 21:26:14 +01:00
Tom Price	0e3fea8cd6	Merge branch 'master' into vagrant	2015-07-21 21:26:14 +01:00
Tom Price	9220363369	Enable vagrant env for development.	2015-07-21 21:24:58 +01:00
Tom Price	fa63328c42	Enable vagrant env for development.	2015-07-21 21:24:58 +01:00