1291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
David Taylor	160c43f927	Merge branch 'ui-changes'	2015-07-21 00:19:32 +01:00
David Taylor	66c5e359d4	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	2302cb1417	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	5de09342a4	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	a22e10a4f2	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	987cd51911	Merge branch 'vat-rate'	2015-07-20 22:20:14 +01:00
David Taylor	6f214028fd	Merge branch 'paperwork'	2015-07-20 22:10:26 +01:00
David Taylor	3c82c72822	Merge branch 'paperwork'	2015-07-20 22:10:26 +01:00
David Taylor	c67eab3479	Escape HTML provided in form - issue #148	2015-07-20 22:02:08 +01:00
David Taylor	9bc932807f	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	3029ac5dc2	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	796f4b29cb	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	0dd5a1d931	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	b74f1fc34e	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	25fd603612	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	36c3a5da35	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