350 Commits

Author	SHA1	Message	Date
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
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	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	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
David Taylor	1c95f7ef8b	Fixed linebreaks in paperwork descriptions	2015-05-24 12:09:20 +01:00
David Taylor	383760d9a2	Made index login_required	2015-05-24 03:14:13 +01:00
David Taylor	96f5353c8e	Fixed deleted event errors	2015-05-24 03:01:01 +01:00
David Taylor	ce6e044b8c	Fixed icon typo	2015-05-23 23:16:28 +01:00
David Taylor	2bfa9321a3	Redesigned homepage	2015-05-23 23:03:41 +01:00
Tom Price	b3a3aef167	Merged in paperwork (pull request #41) ... Added invoice paperwork functionality	2015-05-23 22:19:32 +01:00
Tom Price	005bd90975	Merge registration into master, pull request #38.	2015-05-23 22:12:17 +01:00
David Taylor	47e08eed4f	Add links to detail pages	2015-05-23 18:51:50 +01:00
David Taylor	85a7a37280	Added urls for other models	2015-05-23 18:34:35 +01:00
David Taylor	16cfc9c9ba	Removed now un-necessary date format stuff (from revisions stuff)	2015-05-23 17:03:58 +01:00
David Taylor	3c47b4a64b	More work on other model support	2015-05-23 16:49:54 +01:00
David Taylor	5f2fde3ecc	Made it work for other models	2015-05-23 14:57:29 +01:00
David Taylor	e5a7da3d7d	Fixed the error that made it not work at all	2015-05-23 13:51:45 +01:00
David Taylor	0eb9317fc2	More UI stuff, and pagination on activity stream	2015-05-23 04:53:17 +01:00
David Taylor	7d0e89eb18	More UI improvements	2015-05-23 03:20:27 +01:00
David Taylor	c0dfbb760d	Delete un-used file	2015-05-23 02:27:31 +01:00
David Taylor	4e5ddee31c	More refactoring & improvements	2015-05-23 02:23:31 +01:00
David Taylor	82c814cdd7	Added comments	2015-05-23 00:08:47 +01:00