314 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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	c21a2229c1	Add recaptcha to password reset form. ... This should be all public facing pages covered.	2015-04-25 17:04:15 +01:00
Tom Price	ed4a0e4478	Add recaptcha to login page	2015-04-25 16:54:01 +01:00
Tom Price	269f9af081	Add recaptcha field to form	2015-04-25 16:30:42 +01:00
Tom Price	722ecb30f7	Add recaptcha library.	2015-04-25 16:28:11 +01:00
Tom Price	fa16e7e1a1	Merged in heroku (pull request #27) ... Update master brance to Heroku	2015-04-25 16:16:51 +01:00
Tom Price	16fb238a24	Merged in table-responsive (pull request #26) ... Fixed UI issues by making tables responsive #84	2015-04-25 15:59:49 +01:00
Tom Price	409ba21fc3	Actually correct SMTP settings	2015-04-25 00:19:21 +01:00
Tom Price	6cbfc469a9	Enable TLS on emails	2015-04-25 00:15:36 +01:00
Tom Price	b0244143ef	Enable logging	2015-04-25 00:07:22 +01:00
Tom Price	82e8a0e121	Added login requirement to view the rigboard.	2015-04-24 23:07:11 +01:00
Tom Price	47f479ad96	Add updating sequences to importer.	2015-04-24 22:36:19 +01:00
Tom Price	830ac42fcb	Add missing migration	2015-04-24 22:07:21 +01:00
Tom Price	bb14a217fc	Disable debug again	2015-04-24 18:11:07 +01:00
Tom Price	abf9ce8b92	Fix for incorrect base_dir	2015-04-24 18:09:26 +01:00
Tom Price	ae0836e497	Enable debug to get everything up and running	2015-04-24 18:06:00 +01:00
Tom Price	10053540c7	Readd definition for databases	2015-04-24 17:07:37 +01:00
Tom Price	dc425122e6	Fix typo	2015-04-24 17:06:22 +01:00
Tom Price	dbf89ad7f9	Readd settings line	2015-04-24 16:59:50 +01:00
David Taylor	8d92a5490f	Fixed UI issues by making tables responsive	2015-04-24 16:59:28 +01:00
Tom Price	6954501496	Setup ready for Heroku	2015-04-24 16:44:26 +01:00
Tom Price	024c6c253b	Add Heroku requirements	2015-04-24 16:27:09 +01:00
Tom Price	0ffb79c7e8	Merged in purchase-order (pull request #23) ... Added PO field to event form #82	2015-04-24 15:13:15 +01:00
Tom Price	d239a55fb6	Relocate new select scripts to in theory always load before ready() fires #83	2015-04-24 15:09:15 +01:00
Tom Price	56d20ead75	Merged in ical-interface (pull request #24) ... Removed last trace of timezone. Fixed start/end time.	2015-04-24 15:02:50 +01:00
David Taylor	4f615d7158	Fixed typo	2015-04-24 14:24:48 +01:00
David Taylor	e48619c15a	Fixed midnight issues in ical, web calendar & event_table	2015-04-24 14:22:08 +01:00
David Taylor	c3cc546d60	Removed last trace of timezone	2015-04-24 13:55:32 +01:00
David Taylor	39eea79ee5	Changed to PO in detail view	2015-04-24 01:24:03 +01:00
David Taylor	937f7e2f1c	Changed to 'PO' and corrected capitalisation in 'Collected by'	2015-04-24 01:22:46 +01:00
David Taylor	75bbe58a37	Merge commit '289556771efd2d74f51afa16ce504ab00a9ee40c' into purchase-order	2015-04-24 01:21:24 +01:00
Tom Price	c9063d6327	Merged in paginiation-ui (pull request #20) ... Fixed display in firefox #77	2015-04-24 00:47:58 +01:00
Tom Price	3f2c06bf25	Merged in invoice-ui (pull request #21) ... Requested additions to invoice_detail	2015-04-24 00:47:26 +01:00
Tom Price	16fc9841bf	Merged in ical-interface (pull request #19) ... Stripped out all timezone references & added help info	2015-04-24 00:46:54 +01:00