512 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	6c37095ec7	Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes	2015-05-18 23:43:57 +01:00
Tom Price	4e8cfb91d1	Re-enable timezones and add iCal converstion to UTC. ... This should work on Google Cal but won't be able to test till in production.	2015-05-18 23:41:17 +01:00
Nathan Penney	f4a99ed764	Changed font in fullcalendar.css to Open Sans from Courier New.	2015-05-18 22:45:32 +01:00
Tom Price	f4ea410900	Merge branch 'master' into timezone-fixes	2015-05-18 20:22:56 +01:00
Tom Price	42bfe39c2c	Change invoice icon #107.	2015-05-18 20:08:15 +01:00
Tom Price	6c52d35f35	Add pipe	2015-05-18 20:04:54 +01:00
Tom Price	ee0ffb9169	Major bugfix with new modal. Minified CSS.	2015-05-18 18:34:18 +01:00
Tom Price	e3e0f4855a	Fix incorrect location of .slugignore.	2015-05-18 18:01:10 +01:00
Tom Price	3970f66dd2	Merged in hotfixes (pull request #34) ... Various Hotfixes	2015-05-18 17:27:54 +01:00
Tom Price	9ea2512b3c	Add missing overflow	2015-05-18 17:10:46 +01:00
Tom Price	1714ccbcca	Add ... to long email addresses. #29	2015-05-18 17:06:06 +01:00
Tom Price	d7ec14b2c9	Change where the event title shows up.	2015-05-18 16:19:21 +01:00
Tom Price	8e102f7759	Add some new buttons #108	2015-05-18 16:12:48 +01:00
Tom Price	0cd6090e7b	Change datetime format to show correct format #110	2015-05-18 16:04:35 +01:00
Tom Price	a6836f8139	Change date format to match rest of system	2015-05-18 16:01:07 +01:00
Tom Price	7a8a147b7b	Change to using verbose names	2015-05-18 15:32:27 +01:00
Tom Price	f28b872500	Enable correct extending for ajax in history	2015-05-18 15:22:53 +01:00
Tom Price	9660c1dd83	Add event history view	2015-05-18 15:21:44 +01:00
Tom Price	c805705777	Tidy up version history file layout	2015-05-18 15:04:37 +01:00
Tom Price	b9170c52bf	Tidy up requirements. ... Removed duplicate entries	2015-05-18 14:37:23 +01:00
Tom Price	d794179fe6	Merge branch 'master' into revision-view	2015-05-18 14:36:23 +01:00
Tom Price	59fa1b2908	Merge branch 'master' into timezone-fixes	2015-05-18 14:22:15 +01:00
Tom Price	76a5d1c1b7	Merged in favicon (pull request #4) (at last) ... Added favicon and smartphone icon meta tags to template #18	2015-05-18 14:11:18 +01:00
Nathan Penney	4ae895aaae	Merged in hotfixes (pull request #32) ... Various fixes	2015-05-05 16:51:44 +01:00
David Taylor	0977bcb1ee	Merged master into hotfixes	2015-05-02 15:37:21 +01:00
Tom Price	60b7361a40	See diff	2015-04-30 23:27:31 +01:00
David Taylor	7492881c2f	Added save button to bottom of rig edit. Issue #95	2015-04-30 22:59:51 +01:00
David Taylor	2bd4733ae1	Fixed #58	2015-04-30 22:54:04 +01:00
Tom Price	4c09024a7c	Move to using enviromental variables for important settings. ... This makes it more difficult to fuck up.	2015-04-30 22:52:30 +01:00
Nathan Penney	28e7b75f85	Merged in mobile-ui (pull request #31) ... Fix for edit item table issue on small screens	2015-04-28 14:48:35 +01:00
Nathan Penney	eba4d20d09	Merged in paperwork (pull request #30) ... Paperwork Changes	2015-04-28 14:46:51 +01:00
David Taylor	48a5557080	Fix for edit item table issue on small screens	2015-04-28 01:39:50 +01:00
David Taylor	40373dce5f	Removed VAT statement	2015-04-28 01:29:32 +01:00
David Taylor	eef3ebe515	Swapped email/web with phone	2015-04-28 01:27:47 +01:00
David Taylor	252e398d9d	Stop stripping timezone info (no longer necessary)	2015-04-28 01:06:47 +01:00
David Taylor	7c384061a1	Add explicit timezone declaration to ical interface	2015-04-28 01:06:08 +01:00
David Taylor	6a3fac887c	Change timezone and turn off timezone support	2015-04-28 01:05:40 +01:00
Tom Price	100e39be65	Fix with the correct up-to-date terms URL	2015-04-26 18:19:27 +00:00
Nathan Penney	a56427d355	Merged in recaptcha (pull request #28) ... Add recaptcha to all public facing pages.	2015-04-26 19:12:28 +01:00
Nathan Penney	04271a9417	Merged in hotfixes (pull request #25) ... Hotfix for #83	2015-04-26 19:11:31 +01:00
Tom Price	cade0e0872	TESTING FAIL!	2015-04-25 23:33:09 +01:00
Tom Price	238dcd3b8d	Ignore files which have nothing to do with the production environment	2015-04-25 23:29:24 +01:00
Tom Price	ee527a4df8	Reconfigure various options in the settings. ... Add list of allowed hostnames Add list of admins Correctly setup logging	2015-04-25 23:27:19 +01:00
Tom Price	251e5417fc	EVent Item changelog rendering	2015-04-25 22:30:40 +01:00
Tom Price	11a6418848	Added logic for comparing eventitems	2015-04-25 20:47:27 +01:00
Tom Price	c8ef957367	Actually rename the correct line...	2015-04-25 19:54:22 +01:00
Tom Price	9eabc60d04	Rename EvenRevision EventDiff to be more concise.	2015-04-25 19:08:48 +01:00
Tom Price	b5b8b0918b	Basic diff between source -> HEAD or source -> dest.	2015-04-25 19:03:28 +01:00
Tom Price	7999378d71	Merge from master	2015-04-25 18:04:11 +01:00
Tom Price	c21a2229c1	Add recaptcha to password reset form. ... This should be all public facing pages covered.	2015-04-25 17:04:15 +01:00