313 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Taylor	4169e20c46	Fixed #58	2015-04-30 22:54:04 +01:00
Nathan Penney	f439da1574	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	45b3348b27	Merged in paperwork (pull request #30) ... Paperwork Changes	2015-04-28 14:46:51 +01:00
David Taylor	bd50e65e5b	Fix for edit item table issue on small screens	2015-04-28 01:39:50 +01:00
David Taylor	5c7d016dda	Removed VAT statement	2015-04-28 01:29:32 +01:00
David Taylor	03d8f67389	Swapped email/web with phone	2015-04-28 01:27:47 +01:00
Tom Price	20f2a644af	Fix with the correct up-to-date terms URL	2015-04-26 18:19:27 +00:00
Nathan Penney	d5390c6ccd	Merged in recaptcha (pull request #28) ... Add recaptcha to all public facing pages.	2015-04-26 19:12:28 +01:00
Nathan Penney	29a722f9b8	Merged in hotfixes (pull request #25) ... Hotfix for #83	2015-04-26 19:11:31 +01:00
Tom Price	b2b511e267	TESTING FAIL!	2015-04-25 23:33:09 +01:00
Tom Price	10fea0fa4e	Ignore files which have nothing to do with the production environment	2015-04-25 23:29:24 +01:00
Tom Price	39eae276a1	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	291e6d5c26	Add recaptcha to password reset form. ... This should be all public facing pages covered.	2015-04-25 17:04:15 +01:00
Tom Price	42e8de7d9d	Add recaptcha to login page	2015-04-25 16:54:01 +01:00
Tom Price	6b1ac008c5	Add recaptcha field to form	2015-04-25 16:30:42 +01:00
Tom Price	7596dcc08d	Add recaptcha library.	2015-04-25 16:28:11 +01:00
Tom Price	965833504b	Merged in heroku (pull request #27) ... Update master brance to Heroku	2015-04-25 16:16:51 +01:00
Tom Price	75a21e3027	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	871f507698	Actually correct SMTP settings	2015-04-25 00:19:21 +01:00
Tom Price	bff95d4955	Enable TLS on emails	2015-04-25 00:15:36 +01:00
Tom Price	7711cc59b2	Enable logging	2015-04-25 00:07:22 +01:00
Tom Price	920608f6ce	Added login requirement to view the rigboard.	2015-04-24 23:07:11 +01:00
Tom Price	2b53efc60c	Add updating sequences to importer.	2015-04-24 22:36:19 +01:00
Tom Price	7067853674	Add missing migration	2015-04-24 22:07:21 +01:00
Tom Price	9ae4a05e36	Disable debug again	2015-04-24 18:11:07 +01:00
Tom Price	d6a92d8574	Fix for incorrect base_dir	2015-04-24 18:09:26 +01:00
Tom Price	9e84588d92	Enable debug to get everything up and running	2015-04-24 18:06:00 +01:00
Tom Price	ece7ff4578	Readd definition for databases	2015-04-24 17:07:37 +01:00
Tom Price	3f29520496	Fix typo	2015-04-24 17:06:22 +01:00
Tom Price	7013811145	Readd settings line	2015-04-24 16:59:50 +01:00
David Taylor	824a5d2f07	Fixed UI issues by making tables responsive	2015-04-24 16:59:28 +01:00
Tom Price	2d0f8eeaa3	Setup ready for Heroku	2015-04-24 16:44:26 +01:00
Tom Price	53ad4f264e	Add Heroku requirements	2015-04-24 16:27:09 +01:00
Tom Price	06515366df	Merged in purchase-order (pull request #23) ... Added PO field to event form #82	2015-04-24 15:13:15 +01:00
Tom Price	b5fd509e61	Relocate new select scripts to in theory always load before ready() fires #83	2015-04-24 15:09:15 +01:00
Tom Price	19ecc8e0c4	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	ffb04f137f	Fixed typo	2015-04-24 14:24:48 +01:00
David Taylor	143f4ea454	Fixed midnight issues in ical, web calendar & event_table	2015-04-24 14:22:08 +01:00
David Taylor	b0d20081fa	Removed last trace of timezone	2015-04-24 13:55:32 +01:00
David Taylor	3b4547383d	Changed to PO in detail view	2015-04-24 01:24:03 +01:00
David Taylor	d2cc9b8460	Changed to 'PO' and corrected capitalisation in 'Collected by'	2015-04-24 01:22:46 +01:00
David Taylor	c242cec49f	Merge commit 'fb5173432e13d62f8fadabd58f6b969d9216049e' into purchase-order	2015-04-24 01:21:24 +01:00
Tom Price	fb5173432e	Merged in paginiation-ui (pull request #20) ... Fixed display in firefox #77	2015-04-24 00:47:58 +01:00
Tom Price	3c1bbc6c5d	Merged in invoice-ui (pull request #21) ... Requested additions to invoice_detail	2015-04-24 00:47:26 +01:00
Tom Price	e3279b2adc	Merged in ical-interface (pull request #19) ... Stripped out all timezone references & added help info	2015-04-24 00:46:54 +01:00
Tom Price	7b9f7d311d	Merged in js-datepicker (pull request #22) ... JS Datepicker - issue #79	2015-04-24 00:42:36 +01:00
Tom Price	da97f7eadc	Merged in autocomplete-ui (pull request #17) ... Made a nice new UI for autocompleting	2015-04-24 00:30:30 +01:00
David Taylor	0e7232a16c	Corrected comment	2015-04-24 00:10:14 +01:00
David Taylor	4560be158a	Added PO field to event form	2015-04-23 23:58:54 +01:00
David Taylor	d8b88cc792	Merge branch 'master' into autocomplete-ui	2015-04-22 18:38:07 +01:00