1319 Commits

Author SHA1 Message Date
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
Tom Price
e37431dddc 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
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
ab905d8063 Change line about PyRIGS #127 2015-05-28 23:34:11 +01:00
Tom Price
c4715df341 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
7fd1bc6e7c 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
390a15c56e 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
Tom Price
b1ed77b235 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
David Taylor
5802696229 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
Tom Price
e9bbf08c87 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
David Taylor
3d6d19ffd9 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
Tom Price
894234f167 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