587 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	9ebd1e3894	Update wrecker.yml to run all the tests	2015-09-09 00:44:43 +01:00
Tom Price	1794fdf148	Add wrecker config	2015-09-08 18:39:17 +01:00
David Taylor	653e02f6b1	Merge branch 'duplicate-event'	2015-09-04 21:47:15 +01:00
David Taylor	b316dde25d	Added comments to EventItem creation	2015-08-28 00:12:29 +01:00
David Taylor	ec844a446e	Merge branch 'master' into duplicate-event	2015-08-27 23:59:50 +01:00
David Taylor	d3aa14bacc	Merge branch 'registration-hotfix'	2015-08-27 23:43:34 +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	5a2b15d91c	Removed unnecessary username field definition	2015-08-27 01:48:10 +01:00
David Taylor	0436cbd8fb	Added missing email field to registration form	2015-08-27 01:36:44 +01:00
David Taylor	23408ffc57	Added data save check to registration (currently fails)	2015-08-27 01:35:27 +01:00
David Taylor	8517f4455a	Merge branch 'calendars'	2015-08-17 23:57:08 +01:00
David Taylor	31051990a3	Merge branch 'tooltips'	2015-08-17 23:47:14 +01:00
David Taylor	f352d71ca3	Merge branch 'paperwork'	2015-08-17 23:45:39 +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	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	e8265faf5d	Added tests for EventDuplicate	2015-08-16 20:04:59 +01:00
David Taylor	89f1edb100	EventDuplicate now presents an edit view before saving	2015-08-16 19:31:35 +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