1289 Commits

Author SHA1 Message Date
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
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
be698d7899 Added bottom swoosh & swoosh to subsequent pages 2015-06-29 13:09:35 +01:00
David Taylor
167549e584 Added bottom swoosh & swoosh to subsequent pages 2015-06-29 13:09:35 +01:00
David Taylor
ddb6bade0e Changed Terms of hire wording - Issue #111 2015-06-29 12:57:12 +01:00
David Taylor
42bbf51390 Changed Terms of hire wording - Issue #111 2015-06-29 12:57:12 +01:00
David Taylor
f5879e6f19 Merge branch 'master' into paperwork 2015-06-29 12:56:25 +01:00
David Taylor
b21492113b Merge branch 'master' into paperwork 2015-06-29 12:56:25 +01:00
David Taylor
0089c7d36f Fixed TZ issue #146
(MomentJS wasn't being supplied with timezone info)
2015-06-29 12:09:31 +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
616c9b9e75 Rewrote venue detail UI, and added 3-phase to detail & forms 2015-06-29 02:52:39 +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
4c07298e5e 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
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
c6e442b422 Fixed date formatting issue #141 2015-06-29 00:44:34 +01:00
David Taylor
d5da0e90d8 Fixed date formatting issue #141 2015-06-29 00:44:34 +01:00
David Taylor
44c1704f75 Paperwork emergency contacts "or" to "and" 2015-06-28 23:29:06 +01:00
David Taylor
51b28662e5 Paperwork emergency contacts "or" to "and" 2015-06-28 23:29:06 +01:00
David Taylor
1fdeed7da3 Added dry hire indicator to event_detail - issue #144 2015-06-28 23:26:02 +01:00
David Taylor
346f3a9194 Added dry hire indicator to event_detail - issue #144 2015-06-28 23:26:02 +01:00
David Taylor
73ba535efb 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
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
0a55d373f2 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
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
David Taylor
a0467300e3 Fixed ordering of event archive 2015-06-28 20:46:15 +01:00
David Taylor
452b56c54b Fixed ordering of event archive 2015-06-28 20:46:15 +01:00
David Taylor
baa321ed0d Merge branch 'master' into hotfixes 2015-06-28 20:37:27 +01:00
David Taylor
212b09d202 Merge branch 'master' into hotfixes 2015-06-28 20:37:27 +01:00
David Taylor
5b3bc591b8 Merge branch 'testing' 2015-06-28 19:58:55 +01:00
David Taylor
30f235be22 Merge branch 'testing' 2015-06-28 19:58:55 +01:00
David Taylor
8ee76a9a75 Fixed testEventDetail 2015-06-28 19:02:18 +01:00