1639 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	381f646f8e	Change the way current events are tested	2015-05-31 22:57:17 +01:00
Tom Price	f8e17da645	Merge master into testing	2015-05-31 22:37:20 +01:00
Tom Price	4d93e05257	Merge master into testing	2015-05-31 22:37:20 +01:00
Tom Price	a8331261f0	Merged in hotfixes (pull request #42) ... Small UI fixes	2015-05-31 16:35:06 +01:00
Tom Price	6e62f3da48	Merged in hotfixes (pull request #42) ... Small UI fixes	2015-05-31 16:35:06 +01:00
Tom Price	0bc97e1705	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-31 16:31:57 +01:00
Tom Price	64e2402ede	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-31 16:31:57 +01:00
Tom Price	6bfcbeb8aa	Fix for #140	2015-05-31 16:31:38 +01:00
Tom Price	ec0e9652d5	Fix for #140	2015-05-31 16:31:38 +01:00
David Taylor	f42628d23f	Fixed too many save buttons #99	2015-05-29 17:00:59 +01:00
David Taylor	1a24897411	Fixed too many save buttons #99	2015-05-29 17:00:59 +01:00
Tom Price	2da8980be4	Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields	2015-05-29 15:59:08 +01:00
Tom Price	82ea08ad51	Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields	2015-05-29 15:59:08 +01:00
Tom Price	0f2733c2f1	Merge branch 'hotfixes' ... Rapid fix for incorrect addition	2015-05-29 15:48:29 +01:00
Tom Price	fea986dc91	Merge branch 'hotfixes' ... Rapid fix for incorrect addition	2015-05-29 15:48:29 +01:00
Tom Price	3dc82e2de7	Add missing explicit fields definition django 1.8 realted	2015-05-29 15:45:14 +01:00
Tom Price	8345ab3228	Add missing explicit fields definition django 1.8 realted	2015-05-29 15:45:14 +01:00
Tom Price	bc14c0e33e	Fix for changes to sum function	2015-05-29 15:42:57 +01:00
Tom Price	2899c684ac	Fix for changes to sum function	2015-05-29 15:42:57 +01:00
Tom Price	8ed299f23f	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	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	187ba9113e	Merge branch 'hotfixes'	2015-05-29 02:06:58 +01:00
Tom Price	9fc5555a00	Merge branch 'hotfixes'	2015-05-29 02:06:58 +01:00
Tom Price	e8e2178e49	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-29 02:02:33 +01:00
Tom Price	86b570e3e8	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-29 02:02:33 +01:00
Tom Price	713197b986	Change to using manifest static files as a cachebuster. ... This was far too easy, and will be dealt with automatically on each deployment.	2015-05-29 02:02:23 +01:00
Tom Price	ba66a418d0	Change to using manifest static files as a cachebuster. ... This was far too easy, and will be dealt with automatically on each deployment.	2015-05-29 02:02:23 +01:00
David Taylor	c6d15c5fca	Fixed impending static files fail	2015-05-29 02:02:11 +01:00
David Taylor	4b5d55c840	Fixed impending static files fail	2015-05-29 02:02:11 +01:00
Tom Price	4846d858aa	Prevent modal inception	2015-05-29 01:46:12 +01:00
Tom Price	9063a5d0f7	Prevent modal inception	2015-05-29 01:46:12 +01:00
Tom Price	ac106ef864	Add links to user page in events	2015-05-29 01:32:07 +01:00
Tom Price	e0f80c38fc	Add links to user page in events	2015-05-29 01:32:07 +01:00
David Taylor	be7fe9ee9b	Added profile Modals & links from activity feed	2015-05-29 01:28:36 +01:00
David Taylor	346ee19862	Added profile Modals & links from activity feed	2015-05-29 01:28:36 +01:00
Tom Price	a2bba0895b	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-29 01:17:30 +01:00
Tom Price	d556ebabc4	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-29 01:17:30 +01:00
Tom Price	a1591004d7	Increase contrast in navbar	2015-05-29 00:57:04 +01:00
Tom Price	fff913fffe	Increase contrast in navbar	2015-05-29 00:57:04 +01:00
David Taylor	7da332ed9d	Added days of week	2015-05-29 00:38:00 +01:00
David Taylor	3b6e905881	Added days of week	2015-05-29 00:38:00 +01:00
Tom Price	e684ee0b2d	Stop emails falling of the end of the world #122	2015-05-29 00:36:47 +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	e72b76f972	Add item description class for indents on new items.	2015-05-29 00:29:12 +01:00
Tom Price	252d48a3e1	Add item description class for indents on new items.	2015-05-29 00:29:12 +01:00
Tom Price	ca3cae4af8	Change 'Collected by' to lowercase so it shows up correctly in the activity feed ... Incidently, this is corrected by forms to have sentence case.	2015-05-29 00:19:25 +01:00
Tom Price	3f373d807a	Change 'Collected by' to lowercase so it shows up correctly in the activity feed ... Incidently, this is corrected by forms to have sentence case.	2015-05-29 00:19:25 +01:00
Tom Price	cb0151fd23	Change profile to use the correct user display name.	2015-05-29 00:12:26 +01:00
Tom Price	e3e1bf6892	Change profile to use the correct user display name.	2015-05-29 00:12:26 +01:00
Tom Price	d5fac0d146	Add translating choice fields to correct values.	2015-05-29 00:06:06 +01:00