94 Commits

Author	SHA1	Message	Date
David Taylor	c77d7d30b3	Merge branch 'master' into revision-view	2015-04-22 21:08:15 +01:00
David Taylor	efc1eb2f61	Added button labels	2015-04-22 14:01:24 +01:00
David Taylor	17cf6745e0	Fixed GIT merge issues #76	2015-04-22 13:40:20 +01:00
David Taylor	b7d99774b1	initial attempt	2015-04-21 23:55:55 +01:00
Tom Price	04368f1b63	Merged in indent-item (pull request #12) ... Indented item-description by 1em - issue #56	2015-04-21 22:41:29 +01:00
Tom Price	f32c0683b2	Merged in paperwork (pull request #16) ... New paperwork - See issue #17	2015-04-21 22:20:41 +01:00
Tom Price	b0a6cc2e96	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	3aaba4633c	Merge conflict from master	2015-04-21 19:57:45 +01:00
David Taylor	7e285f6d80	Rig links open in _blank	2015-04-21 19:43:32 +01:00
Tom Price	b5d95bc67f	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	4d31f445be	New paperwork design	2015-04-21 19:24:49 +01:00
Tom Price	dd335c7d02	Merged in web-calendar (pull request #7) ... Added Web Calendar View	2015-04-21 18:14:39 +01:00
Tom Price	f03ff47062	Merge from master	2015-04-21 18:13:07 +01:00
Tom Price	00e285cfd0	Merged in password-change (pull request #8) ... Added templates for password_change_form and password_change_done. Added button to profile_detail.	2015-04-21 17:33:24 +01:00
Tom Price	78dbe38aac	Merged in print-new-tab (pull request #13) ... Set target of print buttons to _blank - issue #59	2015-04-21 17:05:11 +01:00
Tom Price	cda7385eaa	Merged in sum-total (pull request #14) ... Changed item_table to use "Total (ex. VAT)" instead of "Sum Total" - issue #63	2015-04-21 17:04:52 +01:00
David Taylor	329c54c24f	In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system	2015-04-21 12:04:44 +01:00
David Taylor	66fb87a95e	Changed item_table to use "Total (ex. VAT)" instead of "Sum Total"	2015-04-21 11:57:49 +01:00
David Taylor	11271898db	Set target of print buttons to _blank	2015-04-21 11:44:02 +01:00
David Taylor	11517d7178	Indented item-description by 1em - issue #56	2015-04-21 11:39:55 +01:00
David Taylor	3884519bb1	Changed top to match headed paper	2015-04-21 11:03:58 +01:00
David Taylor	1213971f1f	Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into web-calendar	2015-04-20 15:20:29 +01:00
David Taylor	57b2fd5a69	Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface	2015-04-20 15:19:25 +01:00
David Taylor	c224866a50	Actual fix for #57 (Django templates don't like parenthesis in logic)	2015-04-20 00:59:00 +01:00
David Taylor	3ce3a4ba67	Fix for issue #57	2015-04-20 00:15:10 +01:00
David Taylor	e3145ef986	Rig numbers for all invoice lists now link to event_detail page - issue #65	2015-04-20 00:03:40 +01:00
David Taylor	30210fe85a	Added templates for password_change_form and password_change_done. Added button to profile_detail.	2015-04-19 23:32:05 +01:00
David Taylor	df1a285089	Added calendar view	2015-04-19 22:25:59 +01:00
David Taylor	f40cfa7490	Made it work for users that already exist in database	2015-04-19 17:28:22 +01:00
David Taylor	29f873c640	Add interface to view API key	2015-04-19 17:06:52 +01:00
Tom Price	93af55ccbb	Fix for loosing data when there is a form validation error. Issue #42. ... Added info message when there is an validation error and items are not shown.	2015-03-31 10:33:57 +01:00
Tom Price	6e5c6fbb31	Add conditionals to related models links. Bugfix for #41	2015-03-31 10:29:48 +01:00
Tom Price	4b04716273	Add non rig status changing #37	2015-03-30 19:49:58 +01:00
Tom Price	eefc469946	Add Dry Hire label #38	2015-03-30 19:45:02 +01:00
Tom Price	1de29e2234	Add status label and muting for cancelled events issue #36	2015-03-30 19:37:42 +01:00
Tom Price	ac8bda85e2	Change table classes to show non rigs issue #37	2015-03-30 19:15:41 +01:00
tomtom5152	2a3588e148	Bug fix for #35	2015-03-29 22:54:29 +01:00
tomtom5152	1b221e6933	Add many links to event detail. Potential fix for #34	2015-03-29 21:43:12 +01:00
tomtom5152	7a4c70ab99	Add edit autocomplete buttons to edit rig page. ... Issue #22	2015-03-29 14:22:58 +01:00
tomtom5152	6c1ba912b8	Add edit urls to API results. ... Change mic API lookup to profile	2015-03-29 13:40:52 +01:00
tomtom5152	9ca9a0f38d	Fix mouseover text. Tidy up non rig detail	2015-03-28 17:32:47 +00:00
tomtom5152	ff0d703af5	Add rig collected by information issue #25	2015-03-28 17:12:37 +00:00
tomtom5152	83ae129d72	Change save icon to floppy #24 ... Add bugfix for flow on small screens	2015-03-28 16:54:51 +00:00
tomtom5152	422b7b063b	Improve UI on event screen for dealing with long email addresses.	2015-03-28 16:34:06 +00:00
tomtom5152	8d79bb706d	Unkown bug fix, this appears to work.	2015-03-27 16:00:18 +00:00
tomtom5152	5f53925730	Add missing profile_form.html template	2015-03-25 21:10:45 +00:00
tomtom5152	d699a596f5	Add user editing	2015-03-25 20:21:54 +00:00
tomtom5152	c805379a7f	Added viewing user profiles	2015-03-25 18:56:29 +00:00
tomtom5152	20264f570a	Added the ability to invoice an event	2015-01-30 00:27:02 +00:00
tomtom5152	b1b5906038	Basic working invoice system. Need to add a way to create invoices.	2015-01-29 23:18:04 +00:00