204 Commits

Author	SHA1	Message	Date
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	ab516c2f90	Fixed TZ issue #146 ... (MomentJS wasn't being supplied with timezone info)	2015-06-29 12:09:31 +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
Tom Price	155eb29dfa	Remove uneeded comma. Nathan will probably clarify this.	2015-05-26 00:08:21 +01:00
Tom Price	1d9eddfe6d	Removed scrolling from activity. ... With the changed UI, I don't think this is as needed. Can control the height better by limiting the number of changes shown. For more info, see how bitbucket do this.	2015-05-26 00:05:28 +01:00
Tom Price	b4a237b3cd	Move activity loading into the feed file to be more semantic	2015-05-26 00:00:40 +01:00
Tom Price	bc2db608fb	Improve grouping with correct spacing	2015-05-25 23:37:08 +01:00
Tom Price	d7de69abfc	Redesigned activity feed to "group" by user	2015-05-25 23:31:39 +01:00
Tom Price	60d418ef19	Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view	2015-05-25 22:34:40 +01:00
Tom Price	b7c1853bff	Add block tags to make it more semantic	2015-05-25 22:31:36 +01:00
David Taylor	a8ee56c4f5	Fixed fail (removed unnecessary css)	2015-05-25 22:20:50 +01:00
Tom Price	d92462324b	Merge branch 'master' into revision-view	2015-05-25 22:13:33 +01:00
David Taylor	c6037c44ce	Fixed MIC photo logic	2015-05-24 14:21:24 +01:00
David Taylor	faedce316c	More UI Improvements	2015-05-24 12:54:29 +01:00
David Taylor	82041d413c	Merge branch 'master' into revision-view	2015-05-24 12:24:21 +01:00
David Taylor	76f72157f6	Fixed linebreaks in paperwork descriptions	2015-05-24 12:09:20 +01:00
David Taylor	8367bf169e	Fixed deleted event errors	2015-05-24 03:01:01 +01:00
David Taylor	bef497c08b	Fixed icon typo	2015-05-23 23:16:28 +01:00
David Taylor	cd97490e06	Redesigned homepage	2015-05-23 23:03:41 +01:00
David Taylor	d4b0187ecc	Add links to detail pages	2015-05-23 18:51:50 +01:00
David Taylor	7e8f8687d6	Removed now un-necessary date format stuff (from revisions stuff)	2015-05-23 17:03:58 +01:00
David Taylor	3ed95d6687	More work on other model support	2015-05-23 16:49:54 +01:00
David Taylor	6ab0715376	Made it work for other models	2015-05-23 14:57:29 +01:00
David Taylor	0ac49b5d04	Fixed the error that made it not work at all	2015-05-23 13:51:45 +01:00
David Taylor	bf33607967	More UI stuff, and pagination on activity stream	2015-05-23 04:53:17 +01:00
David Taylor	77139a8821	More UI improvements	2015-05-23 03:20:27 +01:00