598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	f8e17da645	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	0bc97e1705	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
David Taylor	f42628d23f	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	0f2733c2f1	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	bc14c0e33e	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	187ba9113e	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	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
David Taylor	c6d15c5fca	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	ac106ef864	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
Tom Price	a2bba0895b	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
David Taylor	7da332ed9d	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	e72b76f972	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	cb0151fd23	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
Tom Price	480cd0b820	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	ab905d8063	Change line about PyRIGS #127	2015-05-28 23:34:11 +01:00
Tom Price	e14ce1424e	Add note about contracts not being invoices.	2015-05-28 23:33:05 +01:00
Tom Price	6f84b8ecc1	Merge branch 'django-update'	2015-05-28 23:02:59 +01:00
Tom Price	585c47b38c	Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update	2015-05-28 22:59:19 +01:00
David Taylor	6763f371d4	Workaround for context bug	2015-05-28 22:41:02 +01:00
Tom Price	7310c8fe3a	Fix import error changed in Django 1.8	2015-05-28 22:28:01 +01:00
David Taylor	148bf399ca	Added explicit field declarations to edit & update views	2015-05-28 22:20:48 +01:00
Tom Price	85f9801f23	Remove MySQL import ... This was legacy and isn't needed any more.	2015-05-28 21:44:59 +01:00
David Taylor	67d0d755f7	Removed static widget_tweaks and added to requirements	2015-05-28 20:20:59 +01:00
David Taylor	ceae2acf61	Removed url import all-together	2015-05-28 20:17:58 +01:00
David Taylor	f78ce621d5	Removed "from future" for url imports	2015-05-28 20:07:45 +01:00
David Taylor	cbe49fc9dd	Scrap that - bad idea!	2015-05-28 20:00:46 +01:00
David Taylor	284604e4a4	Explicitly imported django.contrib.sites	2015-05-28 19:48:20 +01:00
David Taylor	ad4784ff15	Explicitly set redirect view permanent/temporary	2015-05-28 19:42:05 +01:00
David Taylor	f55adc0c40	Removed unnecessary select_related	2015-05-28 19:36:30 +01:00
David Taylor	ec0d959f73	Remove legacy database	2015-05-28 19:32:05 +01:00
David Taylor	1d9014ce97	Updated requirements	2015-05-28 17:03:27 +01:00
David Taylor	f4c882bc95	Fixed moronity	2015-05-28 16:26:27 +01:00
David Taylor	7a0f845284	Added easter egg event tracking	2015-05-28 16:21:47 +01:00
David Taylor	d883f4b66e	Implemented project ship	2015-05-27 02:36:30 +01:00
Tom Price	bb0a5e4b1e	Fix merge fail. DAVID!	2015-05-26 17:57:43 +01:00
David Taylor	1e61d760fa	Add invoice menu icons	2015-05-26 15:47:39 +01:00
David Taylor	749e5a4289	Merge branch 'revision-view' into hotfixes	2015-05-26 15:45:09 +01:00
David Taylor	4d76786f28	Moved grouping logic to view, and added time to stream	2015-05-26 04:34:23 +01:00