1319 Commits

Author SHA1 Message Date
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
David Taylor
e7c39c2b81 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
d9704b9407 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
e935e3bf8c 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
f190b9192b 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
2d1369dfe9 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
5ef5f3517c 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
2daca351d6 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
6641867803 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
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
d3c6dab29b Improved how events are selected for display on web-calendar 2015-06-29 14:42:53 +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
cc22392ef7 Added estimated VAT, as per issue #71 2015-06-29 13:51:37 +01:00
David Taylor
6405e123ff 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