132 Commits

Author	SHA1	Message	Date
Tom Price	b8c7e718f2	Change date format to match rest of system	2015-05-18 16:01:07 +01:00
Tom Price	295032639e	Enable correct extending for ajax in history	2015-05-18 15:22:53 +01:00
Tom Price	ab558c1ccc	Add event history view	2015-05-18 15:21:44 +01:00
Tom Price	0898e91fcb	Tidy up version history file layout	2015-05-18 15:04:37 +01:00
Tom Price	5803421fec	Merge branch 'master' into revision-view	2015-05-18 14:36:23 +01:00
David Taylor	f19995bae7	Added save button to bottom of rig edit. Issue #95	2015-04-30 22:59:51 +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
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
Nathan Penney	29a722f9b8	Merged in hotfixes (pull request #25) ... Hotfix for #83	2015-04-26 19:11:31 +01:00
Tom Price	0dcbd002db	EVent Item changelog rendering	2015-04-25 22:30:40 +01:00
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
David Taylor	824a5d2f07	Fixed UI issues by making tables responsive	2015-04-24 16:59:28 +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
David Taylor	143f4ea454	Fixed midnight issues in ical, web calendar & event_table	2015-04-24 14:22:08 +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
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	a464c210dd	Better help info	2015-04-22 15:57:00 +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	45317efc3a	Added button labels	2015-04-22 14:01:24 +01:00
David Taylor	178cae409f	Fixed GIT merge issues #76	2015-04-22 13:40:20 +01:00
David Taylor	66236df979	Made a nice new UI for autocompleting	2015-04-22 13:27:56 +01:00
David Taylor	2ec73825c2	initial attempt	2015-04-21 23:55:55 +01:00
Tom Price	0618684de8	Merged in indent-item (pull request #12) ... Indented item-description by 1em - issue #56	2015-04-21 22:41:29 +01:00
Tom Price	4d1d649bbc	Merged in paperwork (pull request #16) ... New paperwork - See issue #17	2015-04-21 22:20:41 +01:00
Tom Price	c0c076e74c	Merged in invoice-rig-link (pull request #10) ... Rig numbers for all invoice lists now link to event_detail page - issue #65	2015-04-21 21:26:18 +01:00
Tom Price	3b1137c2d6	Merge conflict from master	2015-04-21 19:57:45 +01:00
David Taylor	954c5b9119	Rig links open in _blank	2015-04-21 19:43:32 +01:00
Tom Price	98f0005d67	Add checking URL is secure before using HTTPS for ical requests. In practice, this will always be yes.	2015-04-21 19:31:33 +01:00
David Taylor	643e874c12	New paperwork design	2015-04-21 19:24:49 +01:00
Tom Price	ef1e4bc9a5	Merged in web-calendar (pull request #7) ... Added Web Calendar View	2015-04-21 18:14:39 +01:00