227 Commits

Author	SHA1	Message	Date
David Taylor	ec844a446e	Merge branch 'master' into duplicate-event	2015-08-27 23:59:50 +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	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	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	9c7f6c0942	Merge branch 'master' into web-calendar	2015-07-29 18:39:36 +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
David Taylor	66c5e359d4	Merge branch 'ui-changes'	2015-07-21 00:19:32 +01:00
David Taylor	987cd51911	Merge branch 'vat-rate'	2015-07-20 22:20:14 +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	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	f190b9192b	Fixed some #timezoneIssues	2015-06-29 21:07:10 +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
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	6405e123ff	Added estimated VAT, as per issue #71	2015-06-29 13:51:37 +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	167549e584	Added bottom swoosh & swoosh to subsequent pages	2015-06-29 13:09:35 +01:00
David Taylor	42bbf51390	Changed Terms of hire wording - Issue #111	2015-06-29 12:57:12 +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	2ab27daaab	Rewrote venue detail UI, and added 3-phase to detail & forms	2015-06-29 02:52:39 +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	d5da0e90d8	Fixed date formatting issue #141	2015-06-29 00:44:34 +01:00
David Taylor	51b28662e5	Paperwork emergency contacts "or" to "and"	2015-06-28 23:29:06 +01:00
David Taylor	346f3a9194	Added dry hire indicator to event_detail - issue #144	2015-06-28 23:26:02 +01:00
David Taylor	1a24897411	Fixed too many save buttons #99	2015-05-29 17:00:59 +01:00
Tom Price	c867ce49ef	Fix for events without an MIC causing 500 errors for people with permission to view profiles.	2015-05-29 15:20:29 +01:00
Tom Price	e0f80c38fc	Add links to user page in events	2015-05-29 01:32:07 +01:00
David Taylor	346ee19862	Added profile Modals & links from activity feed	2015-05-29 01:28:36 +01:00
David Taylor	3b6e905881	Added days of week	2015-05-29 00:38:00 +01:00
Tom Price	622b44d5ba	Stop emails falling of the end of the world #122	2015-05-29 00:36:47 +01:00
Tom Price	252d48a3e1	Add item description class for indents on new items.	2015-05-29 00:29:12 +01:00
Tom Price	7dd9dd021e	Add appropriate linebreaks #130. ... Issue #130 details how it is only in notes. Inadvertantly, this has also been fixed for item descriptions.	2015-05-28 23:38:20 +01:00
Tom Price	c4715df341	Change line about PyRIGS #127	2015-05-28 23:34:11 +01:00
Tom Price	7fd1bc6e7c	Add note about contracts not being invoices.	2015-05-28 23:33:05 +01:00
Tom Price	19aef5f204	Fix merge fail. DAVID!	2015-05-26 17:57:43 +01:00
David Taylor	0e1237c67e	Merge branch 'revision-view' into hotfixes	2015-05-26 15:45:09 +01:00
David Taylor	d0f3dc4bec	Moved grouping logic to view, and added time to stream	2015-05-26 04:34:23 +01:00
David Taylor	83a4b414ad	Animated loading	2015-05-26 03:43:35 +01:00
David Taylor	a836a2f1c8	Added various permission checks for links	2015-05-26 03:17:20 +01:00
Tom Price	8714d4d24c	Add loading animation to recent changes feed. ... This is quite a quick spinner, not sure it really fits with the themeing, but worth experimenting with anyway.	2015-05-26 01:09:19 +01:00
Tom Price	314111d6bd	Change list-groups to be surrounded by pannels	2015-05-26 00:51:11 +01:00
Tom Price	25f301bc8f	Change to using SCSS instead of inline CSS	2015-05-26 00:40:45 +01:00
Tom Price	d7d2a647d7	Remove nsbp	2015-05-26 00:20:57 +01:00
Tom Price	644c12bc55	Move selection logic from template to view ... Required adding some extra data to the dict directly. In theory this should produce better performance.	2015-05-26 00:20:09 +01:00