464 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
David Taylor	e70b2bdd74	Animated loading	2015-05-26 03:43:35 +01:00
David Taylor	67f8ae9fc7	Added various permission checks for links	2015-05-26 03:17:20 +01:00
Tom Price	c844fe8b34	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	faa04bccc8	Change list-groups to be surrounded by pannels	2015-05-26 00:51:11 +01:00
Tom Price	6d1feec59b	Change to using SCSS instead of inline CSS	2015-05-26 00:40:45 +01:00
Tom Price	57bd1b75c0	Remove nsbp	2015-05-26 00:20:57 +01:00
Tom Price	1eb7ea1181	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	a866aaa148	Remove uneeded comma. Nathan will probably clarify this.	2015-05-26 00:08:21 +01:00
Tom Price	84b74d373f	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	229138723b	Change to select and order more accurately ... Select by revision and order by revision date	2015-05-26 00:01:23 +01:00
Tom Price	16ccf9c116	Move activity loading into the feed file to be more semantic	2015-05-26 00:00:40 +01:00
Tom Price	3d44633554	Improve grouping with correct spacing	2015-05-25 23:37:08 +01:00
Tom Price	ac7690bdf1	Redesigned activity feed to "group" by user	2015-05-25 23:31:39 +01:00
Tom Price	d4256b1c8b	Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view	2015-05-25 22:34:40 +01:00
Tom Price	1f3bf96494	Add block tags to make it more semantic	2015-05-25 22:31:36 +01:00
David Taylor	fc6ce30ad0	Fixed fail (removed unnecessary css)	2015-05-25 22:20:50 +01:00
Tom Price	6ed2ceb04e	Merge branch 'master' into revision-view	2015-05-25 22:13:33 +01:00
Tom Price	90c92c255f	Merged in timezone-fixes (pull request #40) ... Timezone Fixes	2015-05-25 22:06:20 +01:00
David Taylor	fb0fc3506b	Fixed MIC photo logic	2015-05-24 14:21:24 +01:00
David Taylor	623e8017e7	More UI Improvements	2015-05-24 12:54:29 +01:00
David Taylor	a66c7a79db	Merge branch 'master' into revision-view	2015-05-24 12:24:21 +01:00
David Taylor	06f9bf6eec	Uncommented captcha	2015-05-24 12:14:43 +01:00