506 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	7df44755f4	Fix OS X fails	2015-06-02 00:13:01 +01:00
Tom Price	5433cfe51b	Include editing a person when creating them.	2015-06-01 01:47:18 +01:00
Tom Price	8696321c61	Add another person and flick between them a couple of times.	2015-06-01 01:31:56 +01:00
Tom Price	14559f488b	Add script adding a person to test rig	2015-06-01 01:13:14 +01:00
Tom Price	64462778d5	Complete rigboard test. ... Add basic story for RigCreate Add start of RigCreate	2015-06-01 00:38:39 +01:00
Tom Price	c641a6649a	Add event logic	2015-06-01 00:03:59 +01:00
Tom Price	e3a4244674	Workaround for captcha being hidden. ... Updated to a few new changes	2015-05-31 23:43:11 +01:00
Tom Price	463f421fd2	Merge branch 'hotfixes' into testing	2015-05-31 23:30:35 +01:00
Tom Price	5ea9ba20ab	Add missing username field *facepalms*	2015-05-31 23:30:09 +01:00
Tom Price	576f054ab1	Add logic needed for captcha checking	2015-05-31 23:24:28 +01:00
Tom Price	b92b1bdf78	Remove uneeded linebreaks to make it easier to trace what is going on.	2015-05-31 23:04:59 +01:00
Tom Price	f90191a53e	Add missing dry hire 11. ... Suggest this logic gets looked at. Isn't broken, but not nessecarily correct.	2015-05-31 23:04:29 +01:00
Tom Price	37fe98b801	Fix for incorrect logic in current dry hires ... Non booked dryhires never show up in the past even if not checked in.	2015-05-31 23:01:52 +01:00
Tom Price	381f646f8e	Change the way current events are tested	2015-05-31 22:57:17 +01:00
Tom Price	4d93e05257	Merge master into testing	2015-05-31 22:37:20 +01:00
Tom Price	6e62f3da48	Merged in hotfixes (pull request #42) ... Small UI fixes	2015-05-31 16:35:06 +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	ec0e9652d5	Fix for #140	2015-05-31 16:31:38 +01:00
David Taylor	1a24897411	Fixed too many save buttons #99	2015-05-29 17:00:59 +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	fea986dc91	Merge branch 'hotfixes' ... Rapid fix for incorrect addition	2015-05-29 15:48:29 +01:00
Tom Price	8345ab3228	Add missing explicit fields definition django 1.8 realted	2015-05-29 15:45:14 +01:00
Tom Price	2899c684ac	Fix for changes to sum function	2015-05-29 15:42:57 +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	9fc5555a00	Merge branch 'hotfixes'	2015-05-29 02:06:58 +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	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	4b5d55c840	Fixed impending static files fail	2015-05-29 02:02:11 +01:00
Tom Price	9063a5d0f7	Prevent modal inception	2015-05-29 01:46:12 +01:00
Tom Price	e0f80c38fc	Add links to user page in events	2015-05-29 01:32:07 +01:00
David Taylor	346ee19862	Added profile Modals & links from activity feed	2015-05-29 01:28:36 +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	fff913fffe	Increase contrast in navbar	2015-05-29 00:57:04 +01:00
David Taylor	3b6e905881	Added days of week	2015-05-29 00:38:00 +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	252d48a3e1	Add item description class for indents on new items.	2015-05-29 00:29:12 +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	e3e1bf6892	Change profile to use the correct user display name.	2015-05-29 00:12:26 +01:00
Tom Price	e37431dddc	Add translating choice fields to correct values.	2015-05-29 00:06:06 +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	c4715df341	Change line about PyRIGS #127	2015-05-28 23:34:11 +01:00
Tom Price	7fd1bc6e7c	Add note about contracts not being invoices.	2015-05-28 23:33:05 +01:00
Tom Price	390a15c56e	Merge branch 'django-update'	2015-05-28 23:02:59 +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	5802696229	Workaround for context bug	2015-05-28 22:41:02 +01:00
Tom Price	e9bbf08c87	Fix import error changed in Django 1.8	2015-05-28 22:28:01 +01:00
David Taylor	3d6d19ffd9	Added explicit field declarations to edit & update views	2015-05-28 22:20:48 +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	a0569ae4bc	Removed static widget_tweaks and added to requirements	2015-05-28 20:20:59 +01:00
David Taylor	02601bed9d	Removed url import all-together	2015-05-28 20:17:58 +01:00