302 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	aadb8db022	Basic diff between source -> HEAD or source -> dest.	2015-04-25 19:03:28 +01:00
Tom Price	9afc7177c1	Merge from master	2015-04-25 18:04: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	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	c15aba0288	Improved backend & logging associated items	2015-04-23 02:29:47 +01:00
David Taylor	6408416c7c	Working revision view	2015-04-23 00:57:58 +01:00
David Taylor	7978de5a99	Merge branch 'master' into revision-view	2015-04-22 21:08:15 +01:00
David Taylor	d8b88cc792	Merge branch 'master' into autocomplete-ui	2015-04-22 18:38:07 +01:00
David Taylor	0a8759240a	Fixed by not loading transition.js (conflicts with JQuery UI). We can make do without an animated date picker	2015-04-22 18:29:01 +01:00
David Taylor	9494f00dd0	Working date picker fallback. This breaks item modals because... no idea	2015-04-22 18:14:21 +01:00
David Taylor	307618df31	Requested additions to invoice_detail	2015-04-22 17:18:13 +01:00
David Taylor	da37904000	Fixed display in firefox	2015-04-22 17:01:10 +01:00
David Taylor	3397bb772d	Don't serve cancelled rigs	2015-04-22 16:11:11 +01:00
David Taylor	a464c210dd	Better help info	2015-04-22 15:57:00 +01:00
David Taylor	88c67054b6	Back to 12 month query	2015-04-22 15:31:50 +01:00
David Taylor	53c804cfc6	Apparently google doesn't work without www.	2015-04-22 15:29:17 +01:00
David Taylor	70d887f91b	Added more help	2015-04-22 14:54:42 +01:00
David Taylor	551e1117eb	Added google calendar instructions	2015-04-22 14:41:06 +01:00
David Taylor	2a67e9d8b2	Stripped out all timezone references. Also reduced query to past 3 months	2015-04-22 14:35:05 +01:00
Tom Price	d3180c2998	Merged in button-ui (pull request #18) ... Fixed merge issues & added labels	2015-04-22 14:16:48 +01:00