245 Commits

Author	SHA1	Message	Date
Tom Price	f4ea410900	Merge branch 'master' into timezone-fixes	2015-05-18 20:22:56 +01:00
Tom Price	ee0ffb9169	Major bugfix with new modal. Minified CSS.	2015-05-18 18:34:18 +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	59fa1b2908	Merge branch 'master' into timezone-fixes	2015-05-18 14:22:15 +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
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
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
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	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	fa16e7e1a1	Merged in heroku (pull request #27) ... Update master brance to Heroku	2015-04-25 16:16:51 +01:00
Tom Price	82e8a0e121	Added login requirement to view the rigboard.	2015-04-24 23:07:11 +01:00
Tom Price	830ac42fcb	Add missing migration	2015-04-24 22:07:21 +01:00
David Taylor	8d92a5490f	Fixed UI issues by making tables responsive	2015-04-24 16:59:28 +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
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
Tom Price	3efed59522	Merged in js-datepicker (pull request #22) ... JS Datepicker - issue #79	2015-04-24 00:42:36 +01:00
David Taylor	011cadf9d0	Corrected comment	2015-04-24 00:10:14 +01:00
David Taylor	2b79b17fbf	Added PO field to event form	2015-04-23 23:58:54 +01:00
David Taylor	c87944d79a	Merge branch 'master' into autocomplete-ui	2015-04-22 18:38:07 +01:00
David Taylor	c7766abc79	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	a4829e8890	Working date picker fallback. This breaks item modals because... no idea	2015-04-22 18:14:21 +01:00
David Taylor	093b216518	Requested additions to invoice_detail	2015-04-22 17:18:13 +01:00
David Taylor	559634e452	Fixed display in firefox	2015-04-22 17:01:10 +01:00
David Taylor	9b53d7ee69	Don't serve cancelled rigs	2015-04-22 16:11:11 +01:00
David Taylor	01b684d08a	Better help info	2015-04-22 15:57:00 +01:00
David Taylor	c060ceff05	Back to 12 month query	2015-04-22 15:31:50 +01:00
David Taylor	c0970fa6f5	Apparently google doesn't work without www.	2015-04-22 15:29:17 +01:00
David Taylor	f712e8f375	Added more help	2015-04-22 14:54:42 +01:00
David Taylor	b5d8984c5b	Added google calendar instructions	2015-04-22 14:41:06 +01:00